projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9f440d1)
ARM: dts: qcom-msm8974-fp2: Use &labels
authorKonrad Dybcio <konrad.dybcio@somainline.org>
Fri, 15 Apr 2022 11:56:19 +0000 (13:56 +0200)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Wed, 20 Apr 2022 01:59:38 +0000 (20:59 -0500)
Use &labels to align with the style used in new DTS and apply tiny
style fixes.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
[bjorn: Rebased on top of Krzysztof underscore fixes]
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220415115633.575010-10-konrad.dybcio@somainline.org
arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts patch | blob | history
arch/arm/boot/dts/qcom-msm8974.dtsi patch | blob | history

diff --git a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
index 1e947bab06b65a451064a92b8000a3678791f299..38e48ea021d973d0fd3cc0c2485affe272cda561 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts
@@ -5,7 +5,6 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
 
-
 / {
        model = "Fairphone 2";
        compatible = "fairphone,fp2", "qcom,msm8974";
@@ -54,356 +53,330 @@
                enable-gpios = <&tlmm 86 GPIO_ACTIVE_HIGH>;
                vcc-supply = <&pm8941_l18>;
        };
+};
+
+&blsp1_uart2 {
+       status = "okay";
+};
+
+&imem {
+       status = "okay";
+
+       reboot-mode {
+               mode-normal     = <0x77665501>;
+               mode-bootloader = <0x77665500>;
+               mode-recovery   = <0x77665502>;
+       };
+};
+
+&otg {
+       status = "okay";
+
+       phys = <&usb_hs1_phy>;
+       phy-select = <&tcsr 0xb000 0>;
+       extcon = <&smbb>, <&usb_id>;
+       vbus-supply = <&chg_otg>;
 
-       smd {
-               rpm {
-                       rpm-requests {
-                               pm8841-regulators {
-                                       s1 {
-                                               regulator-min-microvolt = <675000>;
-                                               regulator-max-microvolt = <1050000>;
-                                       };
-
-                                       s2 {
-                                               regulator-min-microvolt = <500000>;
-                                               regulator-max-microvolt = <1050000>;
-                                       };
-
-                                       s3 {
-                                               regulator-min-microvolt = <1050000>;
-                                               regulator-max-microvolt = <1050000>;
-                                       };
-                               };
-
-                               pm8941-regulators {
-                                       vdd_l1_l3-supply = <&pm8941_s1>;
-                                       vdd_l2_lvs1_2_3-supply = <&pm8941_s3>;
-                                       vdd_l4_l11-supply = <&pm8941_s1>;
-                                       vdd_l5_l7-supply = <&pm8941_s2>;
-                                       vdd_l6_l12_l14_l15-supply = <&pm8941_s2>;
-                                       vdd_l9_l10_l17_l22-supply = <&vreg_boost>;
-                                       vdd_l13_l20_l23_l24-supply = <&vreg_boost>;
-                                       vdd_l21-supply = <&vreg_boost>;
-
-                                       s1 {
-                                               regulator-min-microvolt = <1300000>;
-                                               regulator-max-microvolt = <1300000>;
-
-                                               regulator-always-on;
-                                               regulator-boot-on;
-                                       };
-
-                                       s2 {
-                                               regulator-min-microvolt = <2150000>;
-                                               regulator-max-microvolt = <2150000>;
-
-                                               regulator-boot-on;
-                                       };
-
-                                       s3 {
-                                               regulator-min-microvolt = <1800000>;
-                                               regulator-max-microvolt = <1800000>;
-
-                                               regulator-always-on;
-                                               regulator-boot-on;
-                                       };
-
-                                       l1 {
-                                               regulator-min-microvolt = <1225000>;
-                                               regulator-max-microvolt = <1225000>;
-
-                                               regulator-always-on;
-                                               regulator-boot-on;
-                                       };
-
-                                       l2 {
-                                               regulator-min-microvolt = <1200000>;
-                                               regulator-max-microvolt = <1200000>;
-                                       };
-
-                                       l3 {
-                                               regulator-min-microvolt = <1225000>;
-                                               regulator-max-microvolt = <1225000>;
-                                       };
-
-                                       l4 {
-                                               regulator-min-microvolt = <1225000>;
-                                               regulator-max-microvolt = <1225000>;
-                                       };
-
-                                       l5 {
-                                               regulator-min-microvolt = <1800000>;
-                                               regulator-max-microvolt = <1800000>;
-                                       };
-
-                                       l6 {
-                                               regulator-min-microvolt = <1800000>;
-                                               regulator-max-microvolt = <1800000>;
-
-                                               regulator-boot-on;
-                                       };
-
-                                       l7 {
-                                               regulator-min-microvolt = <1800000>;
-                                               regulator-max-microvolt = <1800000>;
-
-                                               regulator-boot-on;
-                                       };
-
-                                       l8 {
-                                               regulator-min-microvolt = <1800000>;
-                                               regulator-max-microvolt = <1800000>;
-                                       };
-
-                                       l9 {
-                                               regulator-min-microvolt = <1800000>;
-                                               regulator-max-microvolt = <2950000>;
-                                       };
-
-                                       l10 {
-                                               regulator-min-microvolt = <1800000>;
-                                               regulator-max-microvolt = <2950000>;
-                                       };
-
-                                       l11 {
-                                               regulator-min-microvolt = <1225000>;
-                                               regulator-max-microvolt = <1350000>;
-                                       };
-
-                                       l12 {
-                                               regulator-min-microvolt = <1800000>;
-                                               regulator-max-microvolt = <1800000>;
-
-                                               regulator-always-on;
-                                               regulator-boot-on;
-                                       };
-
-                                       l13 {
-                                               regulator-min-microvolt = <1800000>;
-                                               regulator-max-microvolt = <2950000>;
-
-                                               regulator-boot-on;
-                                       };
-
-                                       l14 {
-                                               regulator-min-microvolt = <1800000>;
-                                               regulator-max-microvolt = <1800000>;
-                                       };
-
-                                       l15 {
-                                               regulator-min-microvolt = <2050000>;
-                                               regulator-max-microvolt = <2050000>;
-                                       };
-
-                                       l16 {
-                                               regulator-min-microvolt = <2700000>;
-                                               regulator-max-microvolt = <2700000>;
-                                       };
-
-                                       l17 {
-                                               regulator-min-microvolt = <2850000>;
-                                               regulator-max-microvolt = <2850000>;
-                                       };
-
-                                       l18 {
-                                               regulator-min-microvolt = <2850000>;
-                                               regulator-max-microvolt = <2850000>;
-                                       };
-
-                                       l19 {
-                                               regulator-min-microvolt = <2900000>;
-                                               regulator-max-microvolt = <3350000>;
-                                       };
-
-                                       l20 {
-                                               regulator-min-microvolt = <2950000>;
-                                               regulator-max-microvolt = <2950000>;
-
-                                               regulator-boot-on;
-                                               regulator-system-load = <200000>;
-                                               regulator-allow-set-load;
-                                       };
-
-                                       l21 {
-                                               regulator-min-microvolt = <2950000>;
-                                               regulator-max-microvolt = <2950000>;
-
-                                               regulator-boot-on;
-                                       };
-
-                                       l22 {
-                                               regulator-min-microvolt = <3000000>;
-                                               regulator-max-microvolt = <3300000>;
-                                       };
-
-                                       l23 {
-                                               regulator-min-microvolt = <3000000>;
-                                               regulator-max-microvolt = <3000000>;
-                                       };
-
-                                       l24 {
-                                               regulator-min-microvolt = <3075000>;
-                                               regulator-max-microvolt = <3075000>;
-
-                                               regulator-boot-on;
-                                       };
-                               };
-                       };
+       hnp-disable;
+       srp-disable;
+       adp-disable;
+
+       ulpi {
+               phy@a {
+                       status = "okay";
+
+                       v1p8-supply = <&pm8941_l6>;
+                       v3p3-supply = <&pm8941_l24>;
+
+                       extcon = <&smbb>;
+                       qcom,init-seq = /bits/ 8 <0x1 0x64>;
                };
        };
 };
 
-&soc {
-       serial@f991e000 {
-               status = "okay";
+&pm8941_gpios {
+       gpio_keys_pin_a: gpio-keys-active {
+               pins = "gpio1", "gpio2", "gpio5";
+               function = "normal";
+
+               bias-pull-up;
+               power-source = <PM8941_GPIO_S3>;
        };
+};
 
-       remoteproc@fb21b000 {
-               status = "okay";
+&pronto {
+       status = "okay";
 
-               vddmx-supply = <&pm8841_s1>;
-               vddcx-supply = <&pm8841_s2>;
+       vddmx-supply = <&pm8841_s1>;
+       vddcx-supply = <&pm8841_s2>;
 
-               pinctrl-names = "default";
-               pinctrl-0 = <&wcnss_pin_a>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&wcnss_pin_a>;
 
-               smd-edge {
-                       qcom,remote-pid = <4>;
-                       label = "pronto";
+       smd-edge {
+               qcom,remote-pid = <4>;
+               label = "pronto";
 
-                       wcnss {
-                               status = "okay";
-                       };
+               wcnss {
+                       status = "okay";
                };
        };
+};
+
+&rpm_requests {
+       pm8841-regulators {
+               pm8841_s1: s1 {
+                       regulator-min-microvolt = <675000>;
+                       regulator-max-microvolt = <1050000>;
+               };
 
-       pinctrl@fd510000 {
-               sdhc1_pin_a: sdhc1-pin-active {
-                       clk {
-                               pins = "sdc1_clk";
-                               drive-strength = <16>;
-                               bias-disable;
-                       };
+               pm8841_s2: s2 {
+                       regulator-min-microvolt = <500000>;
+                       regulator-max-microvolt = <1050000>;
+               };
 
-                       cmd-data {
-                               pins = "sdc1_cmd", "sdc1_data";
-                               drive-strength = <10>;
-                               bias-pull-up;
-                       };
+               pm8841_s3: s3 {
+                       regulator-min-microvolt = <1050000>;
+                       regulator-max-microvolt = <1050000>;
                };
+       };
 
-               sdhc2_pin_a: sdhc2-pin-active {
-                       clk {
-                               pins = "sdc2_clk";
-                               drive-strength = <10>;
-                               bias-disable;
-                       };
+       pm8941-regulators {
+               vdd_l1_l3-supply = <&pm8941_s1>;
+               vdd_l2_lvs1_2_3-supply = <&pm8941_s3>;
+               vdd_l4_l11-supply = <&pm8941_s1>;
+               vdd_l5_l7-supply = <&pm8941_s2>;
+               vdd_l6_l12_l14_l15-supply = <&pm8941_s2>;
+               vdd_l9_l10_l17_l22-supply = <&vreg_boost>;
+               vdd_l13_l20_l23_l24-supply = <&vreg_boost>;
+               vdd_l21-supply = <&vreg_boost>;
+
+               pm8941_s1: s1 {
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
 
-                       cmd-data {
-                               pins = "sdc2_cmd", "sdc2_data";
-                               drive-strength = <6>;
-                               bias-pull-up;
-                       };
+               pm8941_s2: s2 {
+                       regulator-min-microvolt = <2150000>;
+                       regulator-max-microvolt = <2150000>;
+                       regulator-boot-on;
                };
 
-               wcnss_pin_a: wcnss-pin-active {
-                       wlan {
-                               pins =  "gpio36", "gpio37", "gpio38", "gpio39", "gpio40";
-                               function = "wlan";
+               pm8941_s3: s3 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
 
-                               drive-strength = <6>;
-                               bias-pull-down;
-                       };
+               pm8941_l1: l1 {
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1225000>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
 
-                       bt {
-                               pins = "gpio35", "gpio43", "gpio44";
-                               function = "bt";
+               pm8941_l2: l2 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+               };
 
-                               drive-strength = <2>;
-                               bias-pull-down;
-                       };
+               pm8941_l3: l3 {
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1225000>;
+               };
 
-                       fm {
-                               pins = "gpio41", "gpio42";
-                               function = "fm";
+               pm8941_l4: l4 {
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1225000>;
+               };
 
-                               drive-strength = <2>;
-                               bias-pull-down;
-                       };
+               pm8941_l5: l5 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
                };
-       };
 
-       sdhci@f9824900 {
-               status = "okay";
+               pm8941_l6: l6 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-boot-on;
+               };
 
-               vmmc-supply = <&pm8941_l20>;
-               vqmmc-supply = <&pm8941_s3>;
+               pm8941_l7: l7 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-boot-on;
+               };
 
-               bus-width = <8>;
-               non-removable;
+               pm8941_l8: l8 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
 
-               pinctrl-names = "default";
-               pinctrl-0 = <&sdhc1_pin_a>;
-       };
+               pm8941_l9: l9 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2950000>;
+               };
 
-       sdhci@f98a4900 {
-               status = "okay";
+               pm8941_l10: l10 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2950000>;
+               };
 
-               vmmc-supply = <&pm8941_l21>;
-               vqmmc-supply = <&pm8941_l13>;
+               pm8941_l11: l11 {
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1350000>;
+               };
 
-               bus-width = <4>;
+               pm8941_l12: l12 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
 
-               pinctrl-names = "default";
-               pinctrl-0 = <&sdhc2_pin_a>;
+               pm8941_l13: l13 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-boot-on;
+               };
+
+               pm8941_l14: l14 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               pm8941_l15: l15 {
+                       regulator-min-microvolt = <2050000>;
+                       regulator-max-microvolt = <2050000>;
+               };
+
+               pm8941_l16: l16 {
+                       regulator-min-microvolt = <2700000>;
+                       regulator-max-microvolt = <2700000>;
+               };
+
+               pm8941_l17: l17 {
+                       regulator-min-microvolt = <2850000>;
+                       regulator-max-microvolt = <2850000>;
+               };
+
+               pm8941_l18: l18 {
+                       regulator-min-microvolt = <2850000>;
+                       regulator-max-microvolt = <2850000>;
+               };
+
+               pm8941_l19: l19 {
+                       regulator-min-microvolt = <2900000>;
+                       regulator-max-microvolt = <3350000>;
+               };
+
+               pm8941_l20: l20 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-system-load = <200000>;
+                       regulator-allow-set-load;
+                       regulator-boot-on;
+               };
+
+               pm8941_l21: l21 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-boot-on;
+               };
+
+               pm8941_l22: l22 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3300000>;
+               };
+
+               pm8941_l23: l23 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+               };
+
+               pm8941_l24: l24 {
+                       regulator-min-microvolt = <3075000>;
+                       regulator-max-microvolt = <3075000>;
+                       regulator-boot-on;
+               };
        };
+};
 
-       usb@f9a55000 {
-               status = "okay";
+&sdhc_1 {
+       status = "okay";
 
-               phys = <&usb_hs1_phy>;
-               phy-select = <&tcsr 0xb000 0>;
-               extcon = <&smbb>, <&usb_id>;
-               vbus-supply = <&chg_otg>;
+       vmmc-supply = <&pm8941_l20>;
+       vqmmc-supply = <&pm8941_s3>;
 
-               hnp-disable;
-               srp-disable;
-               adp-disable;
+       pinctrl-names = "default";
+       pinctrl-0 = <&sdhc1_pin_a>;
+};
+
+&sdhc_2 {
+       status = "okay";
 
-               ulpi {
-                       phy@a {
-                               status = "okay";
+       vmmc-supply = <&pm8941_l21>;
+       vqmmc-supply = <&pm8941_l13>;
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&sdhc2_pin_a>;
+};
 
-                               v1p8-supply = <&pm8941_l6>;
-                               v3p3-supply = <&pm8941_l24>;
+&tlmm {
+       sdhc1_pin_a: sdhc1-pin-active {
+               clk {
+                       pins = "sdc1_clk";
+                       drive-strength = <16>;
+                       bias-disable;
+               };
 
-                               extcon = <&smbb>;
-                               qcom,init-seq = /bits/ 8 <0x1 0x64>;
-                       };
+               cmd-data {
+                       pins = "sdc1_cmd", "sdc1_data";
+                       drive-strength = <10>;
+                       bias-pull-up;
                };
        };
 
-       imem@fe805000 {
-               status = "okay";
+       sdhc2_pin_a: sdhc2-pin-active {
+               clk {
+                       pins = "sdc2_clk";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
 
-               reboot-mode {
-                       mode-normal     = <0x77665501>;
-                       mode-bootloader = <0x77665500>;
-                       mode-recovery   = <0x77665502>;
+               cmd-data {
+                       pins = "sdc2_cmd", "sdc2_data";
+                       drive-strength = <6>;
+                       bias-pull-up;
                };
        };
-};
 
-&spmi_bus {
-       pm8941@0 {
-               gpios@c000 {
-                       gpio_keys_pin_a: gpio-keys-active {
-                               pins = "gpio1", "gpio2", "gpio5";
-                               function = "normal";
+       wcnss_pin_a: wcnss-pin-active {
+               wlan {
+                       pins =  "gpio36", "gpio37", "gpio38", "gpio39", "gpio40";
+                       function = "wlan";
+
+                       drive-strength = <6>;
+                       bias-pull-down;
+               };
+
+               bt {
+                       pins = "gpio35", "gpio43", "gpio44";
+                       function = "bt";
+
+                       drive-strength = <2>;
+                       bias-pull-down;
+               };
+
+               fm {
+                       pins = "gpio41", "gpio42";
+                       function = "fm";
 
-                               bias-pull-up;
-                               power-source = <PM8941_GPIO_S3>;
-                       };
+                       drive-strength = <2>;
+                       bias-pull-down;
                };
        };
 };
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index e14c15789e872e824c3519b8a48b3371b7a1f919..2f50d7692b50fb104b8024297a0fb0ae1d81602e 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1590,7 +1590,7 @@
                        };
                };
 
-               imem@fe805000 {
+               imem: imem@fe805000 {
                        status = "disabled";
                        compatible = "syscon", "simple-mfd";
                        reg = <0xfe805000 0x1000>;
ep93xx device tree rework repo: git://git.maquefel.me/linux.git