| Message ID | 20220928123816.104641-1-linmengbo0689@protonmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: qcom: msm8916-samsung-j5: Use common device tree | expand |
On 28/09/2022 14:39, Lin, Meng-Bo wrote: > The smartphones below are using the MSM8916 SoC, > which are released in 2015-2016: > > Samsung Galaxy J5 2015 (SM-J500*) > Samsung Galaxy J5 2016 (SM-J510*) > Samsung Galaxy J3 2016 > - SM-J3109/SM-J320Y/SM-J320YZ > - SM-J320N0/SM-J320ZN > - SM-J320P/SM-J320R4/SM-J320V/SM-S320VL No need to repeat it in every commit. > > Add a common device tree for with initial support for: > > - GPIO keys > - SDHCI (internal and external storage) > - USB Device Mode > - UART (on USB connector via the SM5703 MUIC) > - WCNSS (WiFi/BT) > - Regulators > > The three devices (some varints of J3, all other variants of J5 released > in 2015 and J5X released in 2016) are very similar, with some differences > in display and GPIO pins. The common parts are shared in > msm8916-samsung-j5-common.dtsi to reduce duplication. The same. > > Signed-off-by: Lin, Meng-Bo <linmengbo0689@protonmail.com> > --- > ...6-samsung-j5.dts => msm8916-samsung-j5-common.dtsi} | 10 ++-------- Thanks for using proper format options. However your patch is not bisectable - kernel is broken here. Best regards, Krzysztof
On Wed, Sep 28, 2022 at 12:39:46PM +0000, Lin, Meng-Bo wrote: > The smartphones below are using the MSM8916 SoC, > which are released in 2015-2016: > > Samsung Galaxy J5 2015 (SM-J500*) > Samsung Galaxy J5 2016 (SM-J510*) > Samsung Galaxy J3 2016 > - SM-J3109/SM-J320Y/SM-J320YZ > - SM-J320N0/SM-J320ZN > - SM-J320P/SM-J320R4/SM-J320V/SM-S320VL > > Add a common device tree for with initial support for: > I'm afraid I don't think this, or the $subject, reflects what you're actually doing in this change. This should say something about moving the J5 device definition to a common file, so that it could be reused in other related devices. > - GPIO keys > - SDHCI (internal and external storage) > - USB Device Mode > - UART (on USB connector via the SM5703 MUIC) > - WCNSS (WiFi/BT) > - Regulators > > The three devices (some varints of J3, all other variants of J5 released > in 2015 and J5X released in 2016) are very similar, with some differences > in display and GPIO pins. The common parts are shared in > msm8916-samsung-j5-common.dtsi to reduce duplication. > > Signed-off-by: Lin, Meng-Bo <linmengbo0689@protonmail.com> > --- > ...6-samsung-j5.dts => msm8916-samsung-j5-common.dtsi} | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > rename arch/arm64/boot/dts/qcom/{msm8916-samsung-j5.dts => msm8916-samsung-j5-common.dtsi} (94%) > > diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi > similarity index 94% > rename from arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts > rename to arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi > index eabeed18cfaa..4f71609bf6f8 100644 > --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts > +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi With this movewe have the Makefile referencing a file that doesn't exist. Please introduce msm8916-samsung-j5.dts in the same commit. > @@ -1,15 +1,10 @@ > // SPDX-License-Identifier: GPL-2.0-only > > > -/dts-v1/; > - > #include "msm8916-pm8916.dtsi" > + > #include <dt-bindings/gpio/gpio.h> > > > / { > - model = "Samsung Galaxy J5 (2015)"; > - compatible = "samsung,j5", "qcom,msm8916"; > - chassis-type = "handset"; > - > aliases { > serial0 = &blsp1_uart2; > }; > @@ -92,7 +87,6 @@ &usb { > > > &usb_hs_phy { > extcon = <&pm8916_usbin>; > - qcom,init-seq = /bits/ 8 <0x1 0x19 0x2 0x0b>; > }; > > > &smd_rpm_regulators { > @@ -199,7 +193,7 @@ l18 { > }; > > > &msmgpio { > - gpio_keys_default: gpio-keys-default { > + gpio_keys_default: gpio-keys-default-state { This is a good, but unrelated change. Thanks, Bjorn > pins = "gpio107", "gpio109"; > function = "gpio"; > > > -- > > 2.30.2 >
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi similarity index 94% rename from arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts rename to arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi index eabeed18cfaa..4f71609bf6f8 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi @@ -1,15 +1,10 @@ // SPDX-License-Identifier: GPL-2.0-only -/dts-v1/; - #include "msm8916-pm8916.dtsi" + #include <dt-bindings/gpio/gpio.h> / { - model = "Samsung Galaxy J5 (2015)"; - compatible = "samsung,j5", "qcom,msm8916"; - chassis-type = "handset"; - aliases { serial0 = &blsp1_uart2; }; @@ -92,7 +87,6 @@ &usb { &usb_hs_phy { extcon = <&pm8916_usbin>; - qcom,init-seq = /bits/ 8 <0x1 0x19 0x2 0x0b>; }; &smd_rpm_regulators { @@ -199,7 +193,7 @@ l18 { }; &msmgpio { - gpio_keys_default: gpio-keys-default { + gpio_keys_default: gpio-keys-default-state { pins = "gpio107", "gpio109"; function = "gpio";
The smartphones below are using the MSM8916 SoC, which are released in 2015-2016: Samsung Galaxy J5 2015 (SM-J500*) Samsung Galaxy J5 2016 (SM-J510*) Samsung Galaxy J3 2016 - SM-J3109/SM-J320Y/SM-J320YZ - SM-J320N0/SM-J320ZN - SM-J320P/SM-J320R4/SM-J320V/SM-S320VL Add a common device tree for with initial support for: - GPIO keys - SDHCI (internal and external storage) - USB Device Mode - UART (on USB connector via the SM5703 MUIC) - WCNSS (WiFi/BT) - Regulators The three devices (some varints of J3, all other variants of J5 released in 2015 and J5X released in 2016) are very similar, with some differences in display and GPIO pins. The common parts are shared in msm8916-samsung-j5-common.dtsi to reduce duplication. Signed-off-by: Lin, Meng-Bo <linmengbo0689@protonmail.com> --- ...6-samsung-j5.dts => msm8916-samsung-j5-common.dtsi} | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) rename arch/arm64/boot/dts/qcom/{msm8916-samsung-j5.dts => msm8916-samsung-j5-common.dtsi} (94%)