ARM: dts: qcom: apq8064-flo: use labels to patch device tree
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Fri, 30 Sep 2022 18:52:19 +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-7-dmitry.baryshkov@linaro.org
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts

index fee278e..2c661bc 100644 (file)
        };
 
        soc {
-               rpm@108000 {
-                       regulators {
-                               vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
-                               vin_lvs1_3_6-supply = <&pm8921_s4>;
-                               vin_lvs4_5_7-supply = <&pm8921_s4>;
-
-
-                               vdd_l24-supply = <&pm8921_s1>;
-                               vdd_l25-supply = <&pm8921_s1>;
-                               vin_lvs2-supply = <&pm8921_s1>;
-
-                               vdd_l26-supply = <&pm8921_s7>;
-                               vdd_l27-supply = <&pm8921_s7>;
-                               vdd_l28-supply = <&pm8921_s7>;
-
-                               vdd_ncp-supply = <&pm8921_l6>;
-
-                               /* Buck SMPS */
-                               s1 {
-                                       regulator-always-on;
-                                       regulator-min-microvolt = <1225000>;
-                                       regulator-max-microvolt = <1225000>;
-                                       qcom,switch-mode-frequency = <3200000>;
-                                       bias-pull-down;
-                               };
-
-                               /* msm otg HSUSB_VDDCX */
-                               s3 {
-                                       regulator-min-microvolt = <500000>;
-                                       regulator-max-microvolt = <1150000>;
-                                       qcom,switch-mode-frequency = <4800000>;
-                               };
-
-                               /*
-                                * msm_sdcc.1-sdc-vdd_io
-                                * tabla2x-slim-CDC_VDDA_RX
-                                * tabla2x-slim-CDC_VDDA_TX
-                                * tabla2x-slim-CDC_VDD_CP
-                                * tabla2x-slim-VDDIO_CDC
-                                */
-                               s4 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       qcom,switch-mode-frequency = <3200000>;
-                                       regulator-always-on;
-                               };
-
-                               s7 {
-                                       regulator-min-microvolt = <1300000>;
-                                       regulator-max-microvolt = <1300000>;
-                                       qcom,switch-mode-frequency = <3200000>;
-                               };
-
-                               /* mipi_dsi.1-dsi1_pll_vdda */
-                               l2 {
-                                       regulator-min-microvolt = <1200000>;
-                                       regulator-max-microvolt = <1200000>;
-                                       regulator-always-on;
-                               };
-
-                               /* msm_otg-HSUSB_3p3 */
-                               l3 {
-                                       regulator-min-microvolt = <3075000>;
-                                       regulator-max-microvolt = <3075000>;
-                                       bias-pull-down;
-                               };
-
-                               /* msm_otg-HSUSB_1p8 */
-                               l4 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       bias-pull-down;
-                               };
-
-                               /* msm_sdcc.1-sdc_vdd */
-                               l5 {
-                                       regulator-min-microvolt = <2950000>;
-                                       regulator-max-microvolt = <2950000>;
-                                       regulator-always-on;
-                                       bias-pull-down;
-                               };
-
-                               l6 {
-                                       regulator-min-microvolt = <2950000>;
-                                       regulator-max-microvolt = <2950000>;
-                               };
-
-                               /* mipi_dsi.1-dsi1_avdd */
-                               l11 {
-                                       regulator-min-microvolt = <3000000>;
-                                       regulator-max-microvolt = <3000000>;
-                                       bias-pull-down;
-                                       regulator-always-on;
-                               };
-
-                               /* pwm_power for backlight */
-                               l17 {
-                                       regulator-min-microvolt = <3000000>;
-                                       regulator-max-microvolt = <3000000>;
-                                       regulator-always-on;
-                               };
-
-                               /* camera, qdsp6 */
-                               l23 {
-                                       regulator-min-microvolt = <1800000>;
-                                       regulator-max-microvolt = <1800000>;
-                                       bias-pull-down;
-                               };
-
-                               /*
-                                * tabla2x-slim-CDC_VDDA_A_1P2V
-                                * tabla2x-slim-VDDD_CDC_D
-                                */
-                               l25 {
-                                       regulator-min-microvolt = <1250000>;
-                                       regulator-max-microvolt = <1250000>;
-                                       bias-pull-down;
-                               };
-
-                               lvs1 {
-                                       bias-pull-down;
-                               };
-
-                               lvs4 {
-                                       bias-pull-down;
-                               };
-
-                               lvs5 {
-                                       bias-pull-down;
-                               };
-
-                               lvs6 {
-                                       bias-pull-down;
-                               };
-                               /*
-                                * mipi_dsi.1-dsi1_vddio
-                                * pil_riva-pll_vdd
-                                */
-                               lvs7 {
-                                       bias-pull-down;
-                               };
-                       };
-               };
+               sram@2a03f000 {
+                       compatible = "qcom,apq8064-imem", "syscon", "simple-mfd";
+                       reg = <0x2a03f000 0x1000>;
+
+                       reboot-mode {
+                               compatible = "syscon-reboot-mode";
+                               offset = <0x65c>;
 
-               mdp@5100000 {
-                       status = "okay";
-                       ports {
-                               port@1 {
-                                       mdp_dsi1_out: endpoint {
-                                               remote-endpoint = <&dsi0_in>;
-                                       };
-                               };
+                               mode-normal = <0x77665501>;
+                               mode-bootloader = <0x77665500>;
+                               mode-recovery = <0x77665502>;
                        };
                };
+       };
+};
 
-               dsi0: dsi@4700000 {
-                       status = "okay";
-                       vdda-supply = <&pm8921_l2>;/*VDD_MIPI1 to 4*/
-                       vdd-supply = <&pm8921_l8>;
-                       vddio-supply = <&pm8921_lvs7>;
-                       avdd-supply = <&pm8921_l11>;
-
-                       panel@0 {
-                               reg = <0>;
-                               compatible = "jdi,lt070me05000";
-
-                               vddp-supply = <&pm8921_l17>;
-                               iovcc-supply = <&pm8921_lvs7>;
-
-                               enable-gpios = <&pm8921_gpio 36 GPIO_ACTIVE_HIGH>;
-                               reset-gpios = <&tlmm_pinmux 54 GPIO_ACTIVE_LOW>;
-                               dcdc-en-gpios = <&pm8921_gpio 23 GPIO_ACTIVE_HIGH>;
-
-                               port {
-                                       panel_in: endpoint {
-                                               remote-endpoint = <&dsi0_out>;
-                                       };
-                               };
-                       };
-                       ports {
-                               port@0 {
-                                       dsi0_in: endpoint {
-                                               remote-endpoint = <&mdp_dsi1_out>;
-                                       };
-                               };
-
-                               port@1 {
-                                       dsi0_out: endpoint {
-                                               remote-endpoint = <&panel_in>;
-                                               data-lanes = <0 1 2 3>;
-                                       };
-                               };
+&dsi0 {
+       vdda-supply = <&pm8921_l2>;/*VDD_MIPI1 to 4*/
+       vdd-supply = <&pm8921_l8>;
+       vddio-supply = <&pm8921_lvs7>;
+       avdd-supply = <&pm8921_l11>;
+       status = "okay";
+
+       panel@0 {
+               reg = <0>;
+               compatible = "jdi,lt070me05000";
+
+               vddp-supply = <&pm8921_l17>;
+               iovcc-supply = <&pm8921_lvs7>;
+
+               enable-gpios = <&pm8921_gpio 36 GPIO_ACTIVE_HIGH>;
+               reset-gpios = <&tlmm_pinmux 54 GPIO_ACTIVE_LOW>;
+               dcdc-en-gpios = <&pm8921_gpio 23 GPIO_ACTIVE_HIGH>;
+
+               port {
+                       panel_in: endpoint {
+                               remote-endpoint = <&dsi0_out>;
                        };
                };
+       };
+};
+
+&dsi0_in {
+       remote-endpoint = <&mdp_dsi1_out>;
+};
+
+&dsi0_out {
+       remote-endpoint = <&panel_in>;
+       data-lanes = <0 1 2 3>;
+};
+
+&dsi0_phy {
+       vddio-supply = <&pm8921_lvs7>;/*VDD_PLL2_1 to 7*/
+       status = "okay";
+};
+
+&gsbi1 {
+       qcom,mode = <GSBI_PROT_I2C>;
+       status = "okay";
+};
+
+&gsbi1_i2c {
+       status = "okay";
+       clock-frequency = <200000>;
+       pinctrl-0 = <&i2c1_pins>;
+       pinctrl-names = "default";
+
+       eeprom@52 {
+               compatible = "atmel,24c128";
+               reg = <0x52>;
+               pagesize = <32>;
+       };
+
+       bq27541@55 {
+               compatible = "ti,bq27541";
+               reg = <0x55>;
+       };
+
+};
+
+&gsbi3 {
+       qcom,mode = <GSBI_PROT_I2C>;
+       status = "okay";
+};
+
+&gsbi3_i2c {
+       clock-frequency = <200000>;
+       pinctrl-0 = <&i2c3_pins>;
+       pinctrl-names = "default";
+       status = "okay";
+
+       trackpad@10 {
+               compatible = "elan,ekth3500";
+               reg = <0x10>;
+               interrupt-parent = <&tlmm_pinmux>;
+               interrupts = <6 IRQ_TYPE_EDGE_FALLING>;
+       };
+};
+
+&gsbi6 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+};
+
+&gsbi6_serial {
+       pinctrl-names = "default";
+       pinctrl-0 = <&gsbi6_uart_4pins>;
+       status = "okay";
+};
 
-               dsi-phy@4700200 {
-                       status = "okay";
-                       vddio-supply = <&pm8921_lvs7>;/*VDD_PLL2_1 to 7*/
+&gsbi7 {
+       qcom,mode = <GSBI_PROT_I2C_UART>;
+       status = "okay";
+};
+
+&gsbi7_serial {
+       status = "okay";
+};
+
+&mdp {
+       status = "okay";
+};
+
+/* eMMC */
+&sdcc1 {
+       vmmc-supply = <&pm8921_l5>;
+       vqmmc-supply = <&pm8921_s4>;
+       status = "okay";
+};
+
+&mdp_dsi1_out {
+       remote-endpoint = <&dsi0_in>;
+};
+
+&rpm {
+       regulators {
+               vdd_l1_l2_l12_l18-supply = <&pm8921_s4>;
+               vin_lvs1_3_6-supply = <&pm8921_s4>;
+               vin_lvs4_5_7-supply = <&pm8921_s4>;
+
+
+               vdd_l24-supply = <&pm8921_s1>;
+               vdd_l25-supply = <&pm8921_s1>;
+               vin_lvs2-supply = <&pm8921_s1>;
+
+               vdd_l26-supply = <&pm8921_s7>;
+               vdd_l27-supply = <&pm8921_s7>;
+               vdd_l28-supply = <&pm8921_s7>;
+
+               vdd_ncp-supply = <&pm8921_l6>;
+
+               /* Buck SMPS */
+               s1 {
+                       regulator-always-on;
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1225000>;
+                       qcom,switch-mode-frequency = <3200000>;
+                       bias-pull-down;
                };
 
-               gsbi@16200000 {
-                       status = "okay";
-                       qcom,mode = <GSBI_PROT_I2C>;
-                       i2c@16280000 {
-                               status = "okay";
-                               clock-frequency = <200000>;
-                               pinctrl-0 = <&i2c3_pins>;
-                               pinctrl-names = "default";
-
-                               trackpad@10 {
-                                       compatible = "elan,ekth3500";
-                                       reg = <0x10>;
-                                       interrupt-parent = <&tlmm_pinmux>;
-                                       interrupts = <6 IRQ_TYPE_EDGE_FALLING>;
-                               };
-                       };
+               /* msm otg HSUSB_VDDCX */
+               s3 {
+                       regulator-min-microvolt = <500000>;
+                       regulator-max-microvolt = <1150000>;
+                       qcom,switch-mode-frequency = <4800000>;
                };
 
+               /*
+                * msm_sdcc.1-sdc-vdd_io
+                * tabla2x-slim-CDC_VDDA_RX
+                * tabla2x-slim-CDC_VDDA_TX
+                * tabla2x-slim-CDC_VDD_CP
+                * tabla2x-slim-VDDIO_CDC
+                */
+               s4 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       qcom,switch-mode-frequency = <3200000>;
+                       regulator-always-on;
+               };
 
-               gsbi@12440000 {
-                       status = "okay";
-                       qcom,mode = <GSBI_PROT_I2C>;
+               s7 {
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+                       qcom,switch-mode-frequency = <3200000>;
+               };
 
-                       i2c@12460000 {
-                               status = "okay";
-                               clock-frequency = <200000>;
-                               pinctrl-0 = <&i2c1_pins>;
-                               pinctrl-names = "default";
+               /* mipi_dsi.1-dsi1_pll_vdda */
+               l2 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+                       regulator-always-on;
+               };
 
-                               eeprom@52 {
-                                       compatible = "atmel,24c128";
-                                       reg = <0x52>;
-                                       pagesize = <32>;
-                               };
+               /* msm_otg-HSUSB_3p3 */
+               l3 {
+                       regulator-min-microvolt = <3075000>;
+                       regulator-max-microvolt = <3075000>;
+                       bias-pull-down;
+               };
 
-                               bq27541@55 {
-                                       compatible = "ti,bq27541";
-                                       reg = <0x55>;
-                               };
+               /* msm_otg-HSUSB_1p8 */
+               l4 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       bias-pull-down;
+               };
 
-                       };
+               /* msm_sdcc.1-sdc_vdd */
+               l5 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-always-on;
+                       bias-pull-down;
                };
 
-               gsbi@16500000 {
-                       status = "okay";
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
+               l6 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+               };
 
-                       serial@16540000 {
-                               status = "okay";
+               /* mipi_dsi.1-dsi1_avdd */
+               l11 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+                       bias-pull-down;
+                       regulator-always-on;
+               };
 
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&gsbi6_uart_4pins>;
-                       };
+               /* pwm_power for backlight */
+               l17 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+                       regulator-always-on;
                };
 
-               gsbi@16600000 {
-                       status = "okay";
-                       qcom,mode = <GSBI_PROT_I2C_UART>;
-                       serial@16640000 {
-                               status = "okay";
-                       };
+               /* camera, qdsp6 */
+               l23 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       bias-pull-down;
                };
 
-               /* OTG */
-               usb@12500000 {
-                       status = "okay";
-                       dr_mode = "otg";
-                       ulpi {
-                               phy {
-                                       v3p3-supply = <&pm8921_l3>;
-                                       v1p8-supply = <&pm8921_l4>;
-                               };
-                       };
+               /*
+                * tabla2x-slim-CDC_VDDA_A_1P2V
+                * tabla2x-slim-VDDD_CDC_D
+                */
+               l25 {
+                       regulator-min-microvolt = <1250000>;
+                       regulator-max-microvolt = <1250000>;
+                       bias-pull-down;
                };
 
-               amba {
-                       /* eMMC */
-                       mmc@12400000 {
-                               status = "okay";
-                               vmmc-supply = <&pm8921_l5>;
-                               vqmmc-supply = <&pm8921_s4>;
-                       };
+               lvs1 {
+                       bias-pull-down;
                };
 
-               sram@2a03f000 {
-                       compatible = "qcom,apq8064-imem", "syscon", "simple-mfd";
-                       reg = <0x2a03f000 0x1000>;
+               lvs4 {
+                       bias-pull-down;
+               };
 
-                       reboot-mode {
-                               compatible = "syscon-reboot-mode";
-                               offset = <0x65c>;
+               lvs5 {
+                       bias-pull-down;
+               };
 
-                               mode-normal = <0x77665501>;
-                               mode-bootloader = <0x77665500>;
-                               mode-recovery = <0x77665502>;
-                       };
+               lvs6 {
+                       bias-pull-down;
+               };
+               /*
+                * mipi_dsi.1-dsi1_vddio
+                * pil_riva-pll_vdd
+                */
+               lvs7 {
+                       bias-pull-down;
                };
        };
 };
+
+&usb_hs1_phy {
+       v3p3-supply = <&pm8921_l3>;
+       v1p8-supply = <&pm8921_l4>;
+};
+
+/* OTG */
+&usb1 {
+       dr_mode = "otg";
+       status = "okay";
+};