ARM: dts: qcom: apq8064-sony-xperia-lagan-yuga: use labels to patch device tree
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Fri, 30 Sep 2022 18:52:24 +0000 (21:52 +0300)
committerBjorn Andersson <andersson@kernel.org>
Mon, 17 Oct 2022 18:20:00 +0000 (13:20 -0500)
Use labels to add device-specific properties to DT nodes rather than
duplicating SoC DT structure in the device DT.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220930185236.867655-12-dmitry.baryshkov@linaro.org
arch/arm/boot/dts/qcom-apq8064-sony-xperia-lagan-yuga.dts

index c07c547..796f47e 100644 (file)
                        linux,code = <KEY_VOLUMEUP>;
                };
        };
+};
+
+&gsbi5 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+};
+
+&gsbi5_serial {
+       pinctrl-names = "default";
+       pinctrl-0 = <&gsbi5_uart_pin_a>;
+       status = "okay";
+};
+
+&pm8921_gpio {
+       gpio_keys_pin_a: gpio-keys-active-state {
+               pins = "gpio3", "gpio4", "gpio29", "gpio35";
+               function = "normal";
+
+               bias-pull-up;
+               drive-push-pull;
+               input-enable;
+               power-source = <2>;
+               qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
+               qcom,pull-up-strength = <0>;
+       };
+};
+
+&riva {
+       pinctrl-names = "default";
+       pinctrl-0 = <&riva_wlan_pin_a>, <&riva_bt_pin_a>, <&riva_fm_pin_a>;
+       status = "okay";
+};
+
+&rpm {
+       regulators {
+               vin_l1_l2_l12_l18-supply = <&pm8921_s4>;
+               vin_lvs_1_3_6-supply = <&pm8921_s4>;
+               vin_lvs_4_5_7-supply = <&pm8921_s4>;
+               vin_ncp-supply = <&pm8921_l6>;
+               vin_lvs2-supply = <&pm8921_s4>;
+               vin_l24-supply = <&pm8921_s1>;
+               vin_l25-supply = <&pm8921_s1>;
+               vin_l27-supply = <&pm8921_s7>;
+               vin_l28-supply = <&pm8921_s7>;
+
+               /* Buck SMPS */
+               s1 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1225000>;
+                       qcom,switch-mode-frequency = <3200000>;
+                       bias-pull-down;
+               };
+
+               s2 {
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+                       qcom,switch-mode-frequency = <1600000>;
+                       bias-pull-down;
+               };
+
+               s3 {
+                       regulator-min-microvolt = <500000>;
+                       regulator-max-microvolt = <1150000>;
+                       qcom,switch-mode-frequency = <4800000>;
+                       bias-pull-down;
+               };
+
+               s4 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       qcom,switch-mode-frequency = <1600000>;
+                       bias-pull-down;
+                       qcom,force-mode = <QCOM_RPM_FORCE_MODE_AUTO>;
+               };
+
+               s7 {
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+                       qcom,switch-mode-frequency = <3200000>;
+               };
+
+               s8 {
+                       regulator-min-microvolt = <2200000>;
+                       regulator-max-microvolt = <2200000>;
+                       qcom,switch-mode-frequency = <1600000>;
+               };
+
+               /* PMOS LDO */
+               l1 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1100000>;
+                       regulator-max-microvolt = <1100000>;
+                       bias-pull-down;
+               };
 
-       soc {
-               pinctrl@800000 {
-                       gsbi5_uart_pin_a: gsbi5-uart-pin-active {
-                               rx {
-                                       pins = "gpio52";
-                                       function = "gsbi5";
-                                       drive-strength = <2>;
-                                       bias-pull-up;
-                               };
-
-                               tx {
-                                       pins = "gpio51";
-                                       function = "gsbi5";
-                                       drive-strength = <4>;
-                                       bias-disable;
-                               };
-                       };
-
-
-                       sdcc3_cd_pin_a: sdcc3-cd-pin-active {
-                               pins = "gpio26";
-                               function = "gpio";
-
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-               };
-
-
-               rpm@108000 {
-                       regulators {
-                               vin_l1_l2_l12_l18-supply = <&pm8921_s4>;
-                               vin_lvs_1_3_6-supply = <&pm8921_s4>;
-                               vin_lvs_4_5_7-supply = <&pm8921_s4>;
-                               vin_ncp-supply = <&pm8921_l6>;
-                               vin_lvs2-supply = <&pm8921_s4>;
-                               vin_l24-supply = <&pm8921_s1>;
-                               vin_l25-supply = <&pm8921_s1>;
-                               vin_l27-supply = <&pm8921_s7>;
-                               vin_l28-supply = <&pm8921_s7>;
-
-                               /* Buck SMPS */
-                               s1 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1225000>;
-                                       regulator-max-microvolt = <1225000>;
-                                       qcom,switch-mode-frequency = <3200000>;
-                                       bias-pull-down;
-                               };
-
-                               s2 {
-                                       regulator-min-microvolt = <1300000>;
-                                       regulator-max-microvolt = <1300000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                                       bias-pull-down;
-                               };
-
-                               s3 {
-                                       regulator-min-microvolt = <500000>;
-                                       regulator-max-microvolt = <1150000>;
-                                       qcom,switch-mode-frequency = <4800000>;
-                                       bias-pull-down;
-                               };
-
-                               s4 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                                       bias-pull-down;
-                                       qcom,force-mode = <QCOM_RPM_FORCE_MODE_AUTO>;
-                               };
-
-                               s7 {
-                                       regulator-min-microvolt = <1300000>;
-                                       regulator-max-microvolt = <1300000>;
-                                       qcom,switch-mode-frequency = <3200000>;
-                               };
-
-                               s8 {
-                                       regulator-min-microvolt = <2200000>;
-                                       regulator-max-microvolt = <2200000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                               };
-
-                               /* PMOS LDO */
-                               l1 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1100000>;
-                                       regulator-max-microvolt = <1100000>;
-                                       bias-pull-down;
-                               };
-
-                               l2 {
-                                       regulator-min-microvolt = <1200000>;
-                                       regulator-max-microvolt = <1200000>;
-                                       bias-pull-down;
-                               };
-
-                               l3 {
-                                       regulator-min-microvolt = <3075000>;
-                                       regulator-max-microvolt = <3075000>;
-                                       bias-pull-down;
-                               };
-
-                               l4 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       bias-pull-down;
-                               };
-
-                               l5 {
-                                       regulator-min-microvolt = <2950000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       bias-pull-down;
-                               };
-
-                               l6 {
-                                       regulator-min-microvolt = <2950000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       bias-pull-down;
-                               };
-
-                               l7 {
-                                       regulator-min-microvolt = <1850000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       bias-pull-down;
-                               };
-
-                               l8 {
-                                       regulator-min-microvolt = <2800000>;
-                                       regulator-max-microvolt = <2800000>;
-                                       bias-pull-down;
-                               };
-
-                               l9 {
-                                       regulator-min-microvolt = <3000000>;
-                                       regulator-max-microvolt = <3000000>;
-                                       bias-pull-down;
-                               };
-
-                               l10 {
-                                       regulator-min-microvolt = <2900000>;
-                                       regulator-max-microvolt = <2900000>;
-                                       bias-pull-down;
-                               };
-
-                               l11 {
-                                       regulator-min-microvolt = <3000000>;
-                                       regulator-max-microvolt = <3000000>;
-                                       bias-pull-down;
-                               };
-
-                               l12 {
-                                       regulator-min-microvolt = <1200000>;
-                                       regulator-max-microvolt = <1200000>;
-                                       bias-pull-down;
-                               };
-
-                               l14 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       bias-pull-down;
-                               };
-
-                               l15 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       bias-pull-down;
-                               };
-
-                               l16 {
-                                       regulator-min-microvolt = <2800000>;
-                                       regulator-max-microvolt = <2800000>;
-                                       bias-pull-down;
-                               };
-
-                               l17 {
-                                       regulator-min-microvolt = <2000000>;
-                                       regulator-max-microvolt = <2000000>;
-                                       bias-pull-down;
-                               };
-
-                               l18 {
-                                       regulator-min-microvolt = <1200000>;
-                                       regulator-max-microvolt = <1200000>;
-                                       bias-pull-down;
-                               };
-
-                               l21 {
-                                       regulator-min-microvolt = <1050000>;
-                                       regulator-max-microvolt = <1050000>;
-                                       bias-pull-down;
-                               };
-
-                               l22 {
-                                       regulator-min-microvolt = <2600000>;
-                                       regulator-max-microvolt = <2600000>;
-                                       bias-pull-down;
-                               };
-
-                               l23 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       bias-pull-down;
-                               };
-
-                               l24 {
-                                       regulator-min-microvolt = <750000>;
-                                       regulator-max-microvolt = <1150000>;
-                                       bias-pull-down;
-                               };
-
-                               l25 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1250000>;
-                                       regulator-max-microvolt = <1250000>;
-                                       bias-pull-down;
-                               };
-
-                               l27 {
-                                       regulator-min-microvolt = <1100000>;
-                                       regulator-max-microvolt = <1100000>;
-                               };
-
-                               l28 {
-                                       regulator-min-microvolt = <1050000>;
-                                       regulator-max-microvolt = <1050000>;
-                                       bias-pull-down;
-                               };
-
-                               l29 {
-                                       regulator-min-microvolt = <2000000>;
-                                       regulator-max-microvolt = <2000000>;
-                                       bias-pull-down;
-                               };
-
-                               /* Low Voltage Switch */
-                               lvs1 {
-                                       bias-pull-down;
-                               };
-
-                               lvs2 {
-                                       bias-pull-down;
-                               };
-
-                               lvs3 {
-                                       bias-pull-down;
-                               };
-
-                               lvs4 {
-                                       bias-pull-down;
-                               };
-
-                               lvs5 {
-                                       bias-pull-down;
-                               };
-
-                               lvs6 {
-                                       bias-pull-down;
-                               };
-
-                               lvs7 {
-                                       bias-pull-down;
-                               };
-
-                               usb-switch {};
-
-                               hdmi-switch {};
-
-                               ncp {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       qcom,switch-mode-frequency = <1600000>;
-                               };
-                       };
-               };
-
-               qcom,ssbi@500000 {
-                       pmic@0 {
-                               gpio@150 {
-                                       gpio_keys_pin_a: gpio-keys-active-state {
-                                               pins = "gpio3", "gpio4", "gpio29", "gpio35";
-                                               function = "normal";
-
-                                               bias-pull-up;
-                                               drive-push-pull;
-                                               input-enable;
-                                               power-source = <2>;
-                                               qcom,drive-strength = <PMIC_GPIO_STRENGTH_NO>;
-                                               qcom,pull-up-strength = <0>;
-                                       };
-                               };
-                       };
-               };
-
-               usb@12500000 {
-                       status = "okay";
-                       dr_mode = "otg";
-                       ulpi {
-                               phy {
-                                       v3p3-supply = <&pm8921_l3>;
-                                       v1p8-supply = <&pm8921_l4>;
-                               };
-                       };
+               l2 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+                       bias-pull-down;
                };
 
-               gsbi@1a200000 {
-                       status = "okay";
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
+               l3 {
+                       regulator-min-microvolt = <3075000>;
+                       regulator-max-microvolt = <3075000>;
+                       bias-pull-down;
+               };
+
+               l4 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       bias-pull-down;
+               };
+
+               l5 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       bias-pull-down;
+               };
+
+               l6 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       bias-pull-down;
+               };
+
+               l7 {
+                       regulator-min-microvolt = <1850000>;
+                       regulator-max-microvolt = <2950000>;
+                       bias-pull-down;
+               };
+
+               l8 {
+                       regulator-min-microvolt = <2800000>;
+                       regulator-max-microvolt = <2800000>;
+                       bias-pull-down;
+               };
+
+               l9 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+                       bias-pull-down;
+               };
+
+               l10 {
+                       regulator-min-microvolt = <2900000>;
+                       regulator-max-microvolt = <2900000>;
+                       bias-pull-down;
+               };
 
-                       serial@1a240000 {
-                               status = "okay";
+               l11 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+                       bias-pull-down;
+               };
+
+               l12 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+                       bias-pull-down;
+               };
 
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&gsbi5_uart_pin_a>;
-                       };
+               l14 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       bias-pull-down;
                };
 
-               amba {
-                       sdcc1: mmc@12400000 {
-                               status = "okay";
+               l15 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2950000>;
+                       bias-pull-down;
+               };
 
-                               vmmc-supply = <&pm8921_l5>;
-                               vqmmc-supply = <&pm8921_s4>;
-                       };
+               l16 {
+                       regulator-min-microvolt = <2800000>;
+                       regulator-max-microvolt = <2800000>;
+                       bias-pull-down;
+               };
 
-                       sdcc3: mmc@12180000 {
-                               status = "okay";
+               l17 {
+                       regulator-min-microvolt = <2000000>;
+                       regulator-max-microvolt = <2000000>;
+                       bias-pull-down;
+               };
 
-                               vmmc-supply = <&pm8921_l6>;
-                               cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
+               l18 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+                       bias-pull-down;
+               };
 
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&sdcc3_pins>, <&sdcc3_cd_pin_a>;
-                       };
+               l21 {
+                       regulator-min-microvolt = <1050000>;
+                       regulator-max-microvolt = <1050000>;
+                       bias-pull-down;
                };
 
-               riva-pil@3204000 {
-                       status = "okay";
+               l22 {
+                       regulator-min-microvolt = <2600000>;
+                       regulator-max-microvolt = <2600000>;
+                       bias-pull-down;
+               };
 
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&riva_wlan_pin_a>, <&riva_bt_pin_a>, <&riva_fm_pin_a>;
+               l23 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       bias-pull-down;
+               };
+
+               l24 {
+                       regulator-min-microvolt = <750000>;
+                       regulator-max-microvolt = <1150000>;
+                       bias-pull-down;
+               };
+
+               l25 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1250000>;
+                       regulator-max-microvolt = <1250000>;
+                       bias-pull-down;
+               };
+
+               l27 {
+                       regulator-min-microvolt = <1100000>;
+                       regulator-max-microvolt = <1100000>;
+               };
+
+               l28 {
+                       regulator-min-microvolt = <1050000>;
+                       regulator-max-microvolt = <1050000>;
+                       bias-pull-down;
+               };
+
+               l29 {
+                       regulator-min-microvolt = <2000000>;
+                       regulator-max-microvolt = <2000000>;
+                       bias-pull-down;
+               };
+
+               /* Low Voltage Switch */
+               lvs1 {
+                       bias-pull-down;
+               };
+
+               lvs2 {
+                       bias-pull-down;
+               };
+
+               lvs3 {
+                       bias-pull-down;
+               };
+
+               lvs4 {
+                       bias-pull-down;
+               };
+
+               lvs5 {
+                       bias-pull-down;
+               };
+
+               lvs6 {
+                       bias-pull-down;
+               };
+
+               lvs7 {
+                       bias-pull-down;
+               };
+
+               usb-switch {};
+
+               hdmi-switch {};
+
+               ncp {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       qcom,switch-mode-frequency = <1600000>;
                };
        };
 };
+
+&sdcc1 {
+       vmmc-supply = <&pm8921_l5>;
+       vqmmc-supply = <&pm8921_s4>;
+       status = "okay";
+};
+
+&sdcc3 {
+       vmmc-supply = <&pm8921_l6>;
+       cd-gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&sdcc3_pins>, <&sdcc3_cd_pin_a>;
+
+       status = "okay";
+};
+
+&tlmm_pinmux {
+       gsbi5_uart_pin_a: gsbi5-uart-pin-active {
+               rx {
+                       pins = "gpio52";
+                       function = "gsbi5";
+                       drive-strength = <2>;
+                       bias-pull-up;
+               };
+
+               tx {
+                       pins = "gpio51";
+                       function = "gsbi5";
+                       drive-strength = <4>;
+                       bias-disable;
+               };
+       };
+
+
+       sdcc3_cd_pin_a: sdcc3-cd-pin-active {
+               pins = "gpio26";
+               function = "gpio";
+
+               drive-strength = <2>;
+               bias-disable;
+       };
+};
+
+&usb_hs1_phy {
+       v3p3-supply = <&pm8921_l3>;
+       v1p8-supply = <&pm8921_l4>;
+};
+
+&usb1 {
+       dr_mode = "otg";
+       status = "okay";
+};