On 28/09/2022 20:44, 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:
>
> - 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@xxxxxxxxxxxxxx>
> ---
> ...-j5.dts => msm8916-samsung-j5-common.dtsi} | 9 +-
> .../boot/dts/qcom/msm8916-samsung-j5.dts | 224 ++----------------
> 2 files changed, 16 insertions(+), 217 deletions(-)
> copy arch/arm64/boot/dts/qcom/{msm8916-samsung-j5.dts => msm8916-samsung-j5-common.dtsi} (94%)
> rewrite arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts (93%)
>
> 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%
> copy from arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts
> copy to arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
> index eabeed18cfaa..502b38d4a61e 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,9 @@
> // 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 +86,6 @@ &usb {
>
> &usb_hs_phy {
> extcon = <&pm8916_usbin>;
> - qcom,init-seq = /bits/ 8 <0x1 0x19 0x2 0x0b>;
> };
>
> &smd_rpm_regulators {
> @@ -199,7 +192,7 @@ l18 {
> };
>
> &msmgpio {
> - gpio_keys_default: gpio-keys-default {
> + gpio_keys_default: gpio-keys-default-state {
> pins = "gpio107", "gpio109";
This change looks unrelated, so probably should be a separate patch. I
requested name change on your previous version when you were duplicating
diff hunks, so it was not clear that it is a copy.
The truth is that msm8916 bindings were not yet converted to schema and
other nodes were not aligned with common Qualcomm pinctrl schema, thus
this is not actually necessary if you simply copy files.
Anyway, fine by me:
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Best regards,
Krzysztof
