On 28/09/2022 13:06, 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.
>
> [Add j5x device tree]
> Co-developed-by: Josef W Menad <JosefWMenad@xxxxxxxxxxxxx>
> Signed-off-by: Josef W Menad <JosefWMenad@xxxxxxxxxxxxx>
> [Use &pm8916_usbin as USB extcon and add chassis-type for j5x]
> Co-developed-by: Stephan Gerhold <stephan@xxxxxxxxxxx>
> Signed-off-by: Stephan Gerhold <stephan@xxxxxxxxxxx>
> [Use common init device tree and add j3 device tree]
> Signed-off-by: Lin, Meng-Bo <linmengbo0689@xxxxxxxxxxxxxx>
Yet you did not Cc them... Use standard tools and CC everyone from
maintainers and other developers.
> ---
> arch/arm64/boot/dts/qcom/Makefile | 2 +
> .../boot/dts/qcom/msm8916-samsung-j3.dts | 21 ++
> .../dts/qcom/msm8916-samsung-j5-common.dtsi | 203 ++++++++++++++++++
> .../boot/dts/qcom/msm8916-samsung-j5.dts | 196 +----------------
You need to create patch which will properly detect rename/copy. See
-M/-B/-C arguments,.
In current format it is too difficult to review, so no.
> .../boot/dts/qcom/msm8916-samsung-j5x.dts | 11 +
> 5 files changed, 238 insertions(+), 195 deletions(-)
> create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j3.dts
> create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
> create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j5x.dts
>
> diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
> index 1d86a33de528..357a2529fe74 100644
> --- a/arch/arm64/boot/dts/qcom/Makefile
> +++ b/arch/arm64/boot/dts/qcom/Makefile
> @@ -15,7 +15,9 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8910.dtb
> dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb
> dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a3u-eur.dtb
> dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5u-eur.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j3.dtb
> dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5.dtb
> +dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5x.dtb
> dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-serranove.dtb
> dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb
> dtb-$(CONFIG_ARCH_QCOM) += msm8992-lg-bullhead-rev-10.dtb
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j3.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-j3.dts
> new file mode 100644
> index 000000000000..24e77c61ca9b
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j3.dts
> @@ -0,0 +1,21 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +
> +/dts-v1/;
> +
> +#include "msm8916-samsung-j5-common.dtsi"
> +
> +/ {
> + model = "Samsung Galaxy J3 (2016)";
> + compatible = "samsung,j3", "qcom,msm8916";
> + chassis-type = "handset";
> +
> + reserved-memory {
> + /delete-node/ tz-apps@85500000;
> +
> + /* Additional memory used by Samsung firmware modifications */
> + tz-apps@85a00000 {
> + reg = <0x0 0x85800000 0x0 0x800000>;
> + no-map;
> + };
> + };
> +};
> diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
> new file mode 100644
> index 000000000000..ea2e165c2aa4
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
> @@ -0,0 +1,203 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +
> +#include "msm8916-pm8916.dtsi"
> +
> +#include <dt-bindings/gpio/gpio.h>
> +
> +/ {
> + aliases {
> + serial0 = &blsp1_uart2;
> + };
> +
> + chosen {
> + stdout-path = "serial0";
> + };
> +
> + reserved-memory {
> + /* Additional memory used by Samsung firmware modifications */
> + tz-apps@85500000 {
> + reg = <0x0 0x85500000 0x0 0xb00000>;
> + no-map;
> + };
> + };
> +
> + gpio-keys {
> + compatible = "gpio-keys";
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&gpio_keys_default>;
> +
> + label = "GPIO Buttons";
> +
> + button-volume-up {
> + label = "Volume Up";
> + gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
> + linux,code = <KEY_VOLUMEUP>;
> + };
> +
> + button-home {
> + label = "Home Key";
> + gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>;
> + linux,code = <KEY_HOMEPAGE>;
> + };
> + };
> +};
> +
> +&blsp1_uart2 {
> + status = "okay";
> +};
> +
> +&pm8916_resin {
> + status = "okay";
> + linux,code = <KEY_VOLUMEDOWN>;
> +};
> +
> +/* FIXME: Replace with SM5703 MUIC when driver is available */
> +&pm8916_usbin {
> + status = "okay";
> +};
> +
> +&pronto {
> + status = "okay";
> +};
> +
> +&sdhc_1 {
> + status = "okay";
> +
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;
> + pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;
> +};
> +
> +&sdhc_2 {
> + status = "okay";
> +
> + pinctrl-names = "default", "sleep";
> + pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on &sdc2_cd_on>;
> + pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;
> +
> + cd-gpios = <&msmgpio 38 GPIO_ACTIVE_LOW>;
> +};
> +
> +&usb {
> + status = "okay";
> + dr_mode = "peripheral";
> + extcon = <&pm8916_usbin>;
> +};
> +
> +&usb_hs_phy {
> + extcon = <&pm8916_usbin>;
> +};
> +
> +&smd_rpm_regulators {
> + vdd_l1_l2_l3-supply = <&pm8916_s3>;
> + vdd_l4_l5_l6-supply = <&pm8916_s4>;
> + vdd_l7-supply = <&pm8916_s4>;
> +
> + s3 {
> + regulator-min-microvolt = <1200000>;
> + regulator-max-microvolt = <1300000>;
> + };
> +
> + s4 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <2100000>;
> + };
> +
> + l1 {
> + regulator-min-microvolt = <1225000>;
> + regulator-max-microvolt = <1225000>;
> + };
> +
> + l2 {
> + regulator-min-microvolt = <1200000>;
> + regulator-max-microvolt = <1200000>;
> + };
> +
> + l4 {
> + regulator-min-microvolt = <2050000>;
> + regulator-max-microvolt = <2050000>;
> + };
> +
> + l5 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + };
> +
> + l6 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + };
> +
> + l7 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + };
> +
> + l8 {
> + regulator-min-microvolt = <2850000>;
> + regulator-max-microvolt = <2900000>;
> + };
> +
> + l9 {
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + };
> +
> + l10 {
> + regulator-min-microvolt = <2700000>;
> + regulator-max-microvolt = <2800000>;
> + };
> +
> + l11 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <2950000>;
> + regulator-allow-set-load;
> + regulator-system-load = <200000>;
> + };
> +
> + l12 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <2950000>;
> + };
> +
> + l13 {
> + regulator-min-microvolt = <3075000>;
> + regulator-max-microvolt = <3075000>;
> + };
> +
> + l14 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + };
> +
> + l15 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + };
> +
> + l16 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + };
> +
> + l17 {
> + regulator-min-microvolt = <3000000>;
> + regulator-max-microvolt = <3000000>;
> + };
> +
> + l18 {
> + regulator-min-microvolt = <2700000>;
> + regulator-max-microvolt = <2700000>;
> + };
> +};
> +
> +&msmgpio {
> + gpio_keys_default: gpio-keys-default {
missing suffix "state"
> + pins = "gpio107", "gpio109";
> + function = "gpio";
> +
> + drive-strength = <2>;
> + bias-pull-up;
> + };
Best regards,
Krzysztof
