ARM: dts: qcom: msm8226: Sort and clean up nodes
authorMatti Lehtimäki <matti.lehtimaki@gmail.com>
Sat, 10 Feb 2024 16:28:53 +0000 (17:28 +0100)
committerBjorn Andersson <andersson@kernel.org>
Wed, 14 Feb 2024 06:14:49 +0000 (00:14 -0600)
Quite a few nodes haven't been sorted correctly by reg, so let's do this
now so that future nodes can be added at the correct place.

Also at the same time, move the status property last.

No functional change intended.

Signed-off-by: Matti Lehtimäki <matti.lehtimaki@gmail.com>
[luca: add more text to commit message]
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Link: https://lore.kernel.org/r/20240210-msm8226-cpu-v2-2-5d9cb4c35204@z3ntu.xyz
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
arch/arm/boot/dts/qcom/qcom-msm8226.dtsi

index b492c95e5d301d25d6e9446081940bcb52a94569..6896318e6612abac45db857c4f5643a2505bf00a 100644 (file)
 
        chosen { };
 
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x0>;
-       };
-
        clocks {
                xo_board: xo_board {
                        compatible = "fixed-clock";
                };
        };
 
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x0>;
+       };
+
        pmu {
                compatible = "arm,cortex-a7-pmu";
                interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
                        reg = <0xf9011000 0x1000>;
                };
 
+               timer@f9020000 {
+                       compatible = "arm,armv7-timer-mem";
+                       reg = <0xf9020000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges;
+
+                       frame@f9021000 {
+                               frame-number = <0>;
+                               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
+                                            <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0xf9021000 0x1000>,
+                                     <0xf9022000 0x1000>;
+                       };
+
+                       frame@f9023000 {
+                               frame-number = <1>;
+                               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0xf9023000 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@f9024000 {
+                               frame-number = <2>;
+                               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0xf9024000 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@f9025000 {
+                               frame-number = <3>;
+                               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0xf9025000 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@f9026000 {
+                               frame-number = <4>;
+                               interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0xf9026000 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@f9027000 {
+                               frame-number = <5>;
+                               interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0xf9027000 0x1000>;
+                               status = "disabled";
+                       };
+
+                       frame@f9028000 {
+                               frame-number = <6>;
+                               interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
+                               reg = <0xf9028000 0x1000>;
+                               status = "disabled";
+                       };
+               };
+
                sdhc_1: mmc@f9824900 {
                        compatible = "qcom,msm8226-sdhci", "qcom,sdhci-msm-v4";
                        reg = <0xf9824900 0x11c>, <0xf9824000 0x800>;
                        status = "disabled";
                };
 
-               sdhc_2: mmc@f98a4900 {
+               sdhc_3: mmc@f9864900 {
                        compatible = "qcom,msm8226-sdhci", "qcom,sdhci-msm-v4";
-                       reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
+                       reg = <0xf9864900 0x11c>, <0xf9864000 0x800>;
                        reg-names = "hc", "core";
-                       interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "hc_irq", "pwr_irq";
-                       clocks = <&gcc GCC_SDCC2_AHB_CLK>,
-                                <&gcc GCC_SDCC2_APPS_CLK>,
+                       clocks = <&gcc GCC_SDCC3_AHB_CLK>,
+                                <&gcc GCC_SDCC3_APPS_CLK>,
                                 <&rpmcc RPM_SMD_XO_CLK_SRC>;
                        clock-names = "iface", "core", "xo";
                        pinctrl-names = "default";
-                       pinctrl-0 = <&sdhc2_default_state>;
+                       pinctrl-0 = <&sdhc3_default_state>;
                        status = "disabled";
                };
 
-               sdhc_3: mmc@f9864900 {
+               sdhc_2: mmc@f98a4900 {
                        compatible = "qcom,msm8226-sdhci", "qcom,sdhci-msm-v4";
-                       reg = <0xf9864900 0x11c>, <0xf9864000 0x800>;
+                       reg = <0xf98a4900 0x11c>, <0xf98a4000 0x800>;
                        reg-names = "hc", "core";
-                       interrupts = <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "hc_irq", "pwr_irq";
-                       clocks = <&gcc GCC_SDCC3_AHB_CLK>,
-                                <&gcc GCC_SDCC3_APPS_CLK>,
+                       clocks = <&gcc GCC_SDCC2_AHB_CLK>,
+                                <&gcc GCC_SDCC2_APPS_CLK>,
                                 <&rpmcc RPM_SMD_XO_CLK_SRC>;
                        clock-names = "iface", "core", "xo";
                        pinctrl-names = "default";
-                       pinctrl-0 = <&sdhc3_default_state>;
+                       pinctrl-0 = <&sdhc2_default_state>;
                        status = "disabled";
                };
 
                };
 
                blsp1_i2c1: i2c@f9923000 {
-                       status = "disabled";
                        compatible = "qcom,i2c-qup-v2.1.1";
                        reg = <0xf9923000 0x1000>;
                        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-0 = <&blsp1_i2c1_pins>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       status = "disabled";
                };
 
                blsp1_i2c2: i2c@f9924000 {
-                       status = "disabled";
                        compatible = "qcom,i2c-qup-v2.1.1";
                        reg = <0xf9924000 0x1000>;
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-0 = <&blsp1_i2c2_pins>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       status = "disabled";
                };
 
                blsp1_i2c3: i2c@f9925000 {
-                       status = "disabled";
                        compatible = "qcom,i2c-qup-v2.1.1";
                        reg = <0xf9925000 0x1000>;
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-0 = <&blsp1_i2c3_pins>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       status = "disabled";
                };
 
                blsp1_i2c4: i2c@f9926000 {
-                       status = "disabled";
                        compatible = "qcom,i2c-qup-v2.1.1";
                        reg = <0xf9926000 0x1000>;
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-0 = <&blsp1_i2c4_pins>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       status = "disabled";
                };
 
                blsp1_i2c5: i2c@f9927000 {
-                       status = "disabled";
                        compatible = "qcom,i2c-qup-v2.1.1";
                        reg = <0xf9927000 0x1000>;
                        interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
                        pinctrl-0 = <&blsp1_i2c5_pins>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       status = "disabled";
                };
 
                blsp1_i2c6: i2c@f9928000 {
                        status = "disabled";
                };
 
-               cci: cci@fda0c000 {
-                       compatible = "qcom,msm8226-cci";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0xfda0c000 0x1000>;
-                       interrupts = <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
-                       clocks = <&mmcc CAMSS_TOP_AHB_CLK>,
-                                <&mmcc CAMSS_CCI_CCI_AHB_CLK>,
-                                <&mmcc CAMSS_CCI_CCI_CLK>;
-                       clock-names = "camss_top_ahb",
-                                     "cci_ahb",
-                                     "cci";
-
-                       pinctrl-names = "default", "sleep";
-                       pinctrl-0 = <&cci_default>;
-                       pinctrl-1 = <&cci_sleep>;
-
-                       status = "disabled";
-
-                       cci_i2c0: i2c-bus@0 {
-                               reg = <0>;
-                               clock-frequency = <400000>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                       };
-               };
-
                usb: usb@f9a55000 {
                        compatible = "qcom,ci-hdrc";
                        reg = <0xf9a55000 0x200>,
                        };
                };
 
+               rng@f9bff000 {
+                       compatible = "qcom,prng";
+                       reg = <0xf9bff000 0x200>;
+                       clocks = <&gcc GCC_PRNG_AHB_CLK>;
+                       clock-names = "core";
+               };
+
+               sram@fc190000 {
+                       compatible = "qcom,msm8226-rpm-stats";
+                       reg = <0xfc190000 0x10000>;
+               };
+
                gcc: clock-controller@fc400000 {
                        compatible = "qcom,gcc-msm8226";
                        reg = <0xfc400000 0x4000>;
                                      "sleep_clk";
                };
 
-               mmcc: clock-controller@fd8c0000 {
-                       compatible = "qcom,mmcc-msm8226";
-                       reg = <0xfd8c0000 0x6000>;
-                       #clock-cells = <1>;
-                       #reset-cells = <1>;
-                       #power-domain-cells = <1>;
-
-                       clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
-                                <&gcc GCC_MMSS_GPLL0_CLK_SRC>,
-                                <&gcc GPLL0_VOTE>,
-                                <&gcc GPLL1_VOTE>,
-                                <&rpmcc RPM_SMD_GFX3D_CLK_SRC>,
-                                <&mdss_dsi0_phy 1>,
-                                <&mdss_dsi0_phy 0>;
-                       clock-names = "xo",
-                                     "mmss_gpll0_vote",
-                                     "gpll0_vote",
-                                     "gpll1_vote",
-                                     "gfx3d_clk_src",
-                                     "dsi0pll",
-                                     "dsi0pllbyte";
-               };
+               rpm_msg_ram: sram@fc428000 {
+                       compatible = "qcom,rpm-msg-ram";
+                       reg = <0xfc428000 0x4000>;
 
-               tlmm: pinctrl@fd510000 {
-                       compatible = "qcom,msm8226-pinctrl";
-                       reg = <0xfd510000 0x4000>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       gpio-ranges = <&tlmm 0 0 117>;
-                       interrupt-controller;
-                       #interrupt-cells = <2>;
-                       interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0 0xfc428000 0x4000>;
 
-                       blsp1_i2c1_pins: blsp1-i2c1-state {
-                               pins = "gpio2", "gpio3";
-                               function = "blsp_i2c1";
-                               drive-strength = <2>;
-                               bias-disable;
+                       apss_master_stats: sram@150 {
+                               reg = <0x150 0x14>;
                        };
 
-                       blsp1_i2c2_pins: blsp1-i2c2-state {
-                               pins = "gpio6", "gpio7";
-                               function = "blsp_i2c2";
-                               drive-strength = <2>;
-                               bias-disable;
+                       mpss_master_stats: sram@b50 {
+                               reg = <0xb50 0x14>;
                        };
 
-                       blsp1_i2c3_pins: blsp1-i2c3-state {
-                               pins = "gpio10", "gpio11";
-                               function = "blsp_i2c3";
-                               drive-strength = <2>;
-                               bias-disable;
+                       lpss_master_stats: sram@1550 {
+                               reg = <0x1550 0x14>;
                        };
 
-                       blsp1_i2c4_pins: blsp1-i2c4-state {
-                               pins = "gpio14", "gpio15";
-                               function = "blsp_i2c4";
-                               drive-strength = <2>;
-                               bias-disable;
+                       pronto_master_stats: sram@1f50 {
+                               reg = <0x1f50 0x14>;
                        };
+               };
 
-                       blsp1_i2c5_pins: blsp1-i2c5-state {
-                               pins = "gpio18", "gpio19";
-                               function = "blsp_i2c5";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
+               tsens: thermal-sensor@fc4a9000 {
+                       compatible = "qcom,msm8226-tsens", "qcom,tsens-v0_1";
+                       reg = <0xfc4a9000 0x1000>, /* TM */
+                             <0xfc4a8000 0x1000>; /* SROT */
+                       nvmem-cells = <&tsens_mode>,
+                                     <&tsens_base1>, <&tsens_base2>,
+                                     <&tsens_s0_p1>, <&tsens_s0_p2>,
+                                     <&tsens_s1_p1>, <&tsens_s1_p2>,
+                                     <&tsens_s2_p1>, <&tsens_s2_p2>,
+                                     <&tsens_s3_p1>, <&tsens_s3_p2>,
+                                     <&tsens_s4_p1>, <&tsens_s4_p2>,
+                                     <&tsens_s5_p1>, <&tsens_s5_p2>,
+                                     <&tsens_s6_p1>, <&tsens_s6_p2>;
+                       nvmem-cell-names = "mode",
+                                          "base1", "base2",
+                                          "s0_p1", "s0_p2",
+                                          "s1_p1", "s1_p2",
+                                          "s2_p1", "s2_p2",
+                                          "s3_p1", "s3_p2",
+                                          "s4_p1", "s4_p2",
+                                          "s5_p1", "s5_p2",
+                                          "s6_p1", "s6_p2";
+                       #qcom,sensors = <6>;
+                       interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "uplow";
+                       #thermal-sensor-cells = <1>;
+               };
 
-                       blsp1_i2c6_pins: blsp1-i2c6-state {
-                               pins = "gpio22", "gpio23";
-                               function = "blsp_i2c6";
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       cci_default: cci-default-state {
-                               pins = "gpio29", "gpio30";
-                               function = "cci_i2c0";
-
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       cci_sleep: cci-sleep-state {
-                               pins = "gpio29", "gpio30";
-                               function = "gpio";
-
-                               drive-strength = <2>;
-                               bias-disable;
-                       };
-
-                       sdhc1_default_state: sdhc1-default-state {
-                               clk-pins {
-                                       pins = "sdc1_clk";
-                                       drive-strength = <10>;
-                                       bias-disable;
-                               };
-
-                               cmd-data-pins {
-                                       pins = "sdc1_cmd", "sdc1_data";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       sdhc2_default_state: sdhc2-default-state {
-                               clk-pins {
-                                       pins = "sdc2_clk";
-                                       drive-strength = <10>;
-                                       bias-disable;
-                               };
-
-                               cmd-data-pins {
-                                       pins = "sdc2_cmd", "sdc2_data";
-                                       drive-strength = <10>;
-                                       bias-pull-up;
-                               };
-                       };
-
-                       sdhc3_default_state: sdhc3-default-state {
-                               clk-pins {
-                                       pins = "gpio44";
-                                       function = "sdc3";
-                                       drive-strength = <8>;
-                                       bias-disable;
-                               };
-
-                               cmd-pins {
-                                       pins = "gpio43";
-                                       function = "sdc3";
-                                       drive-strength = <8>;
-                                       bias-pull-up;
-                               };
-
-                               data-pins {
-                                       pins = "gpio39", "gpio40", "gpio41", "gpio42";
-                                       function = "sdc3";
-                                       drive-strength = <8>;
-                                       bias-pull-up;
-                               };
-                       };
-               };
-
-               tsens: thermal-sensor@fc4a9000 {
-                       compatible = "qcom,msm8226-tsens", "qcom,tsens-v0_1";
-                       reg = <0xfc4a9000 0x1000>, /* TM */
-                             <0xfc4a8000 0x1000>; /* SROT */
-                       nvmem-cells = <&tsens_mode>,
-                                     <&tsens_base1>, <&tsens_base2>,
-                                     <&tsens_s0_p1>, <&tsens_s0_p2>,
-                                     <&tsens_s1_p1>, <&tsens_s1_p2>,
-                                     <&tsens_s2_p1>, <&tsens_s2_p2>,
-                                     <&tsens_s3_p1>, <&tsens_s3_p2>,
-                                     <&tsens_s4_p1>, <&tsens_s4_p2>,
-                                     <&tsens_s5_p1>, <&tsens_s5_p2>,
-                                     <&tsens_s6_p1>, <&tsens_s6_p2>;
-                       nvmem-cell-names = "mode",
-                                          "base1", "base2",
-                                          "s0_p1", "s0_p2",
-                                          "s1_p1", "s1_p2",
-                                          "s2_p1", "s2_p2",
-                                          "s3_p1", "s3_p2",
-                                          "s4_p1", "s4_p2",
-                                          "s5_p1", "s5_p2",
-                                          "s6_p1", "s6_p2";
-                       #qcom,sensors = <6>;
-                       interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "uplow";
-                       #thermal-sensor-cells = <1>;
-               };
-
-               restart@fc4ab000 {
-                       compatible = "qcom,pshold";
-                       reg = <0xfc4ab000 0x4>;
-               };
+               restart@fc4ab000 {
+                       compatible = "qcom,pshold";
+                       reg = <0xfc4ab000 0x4>;
+               };
 
                qfprom: qfprom@fc4bc000 {
                        compatible = "qcom,msm8226-qfprom", "qcom,qfprom";
                        #interrupt-cells = <4>;
                };
 
-               rng@f9bff000 {
-                       compatible = "qcom,prng";
-                       reg = <0xf9bff000 0x200>;
-                       clocks = <&gcc GCC_PRNG_AHB_CLK>;
-                       clock-names = "core";
+               tcsr_mutex: hwlock@fd484000 {
+                       compatible = "qcom,msm8226-tcsr-mutex", "qcom,tcsr-mutex";
+                       reg = <0xfd484000 0x1000>;
+                       #hwlock-cells = <1>;
                };
 
-               timer@f9020000 {
-                       compatible = "arm,armv7-timer-mem";
-                       reg = <0xf9020000 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-
-                       frame@f9021000 {
-                               frame-number = <0>;
-                               interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
-                                            <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xf9021000 0x1000>,
-                                     <0xf9022000 0x1000>;
-                       };
+               tlmm: pinctrl@fd510000 {
+                       compatible = "qcom,msm8226-pinctrl";
+                       reg = <0xfd510000 0x4000>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       gpio-ranges = <&tlmm 0 0 117>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
 
-                       frame@f9023000 {
-                               frame-number = <1>;
-                               interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xf9023000 0x1000>;
-                               status = "disabled";
+                       blsp1_i2c1_pins: blsp1-i2c1-state {
+                               pins = "gpio2", "gpio3";
+                               function = "blsp_i2c1";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       frame@f9024000 {
-                               frame-number = <2>;
-                               interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xf9024000 0x1000>;
-                               status = "disabled";
+                       blsp1_i2c2_pins: blsp1-i2c2-state {
+                               pins = "gpio6", "gpio7";
+                               function = "blsp_i2c2";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       frame@f9025000 {
-                               frame-number = <3>;
-                               interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xf9025000 0x1000>;
-                               status = "disabled";
+                       blsp1_i2c3_pins: blsp1-i2c3-state {
+                               pins = "gpio10", "gpio11";
+                               function = "blsp_i2c3";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       frame@f9026000 {
-                               frame-number = <4>;
-                               interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xf9026000 0x1000>;
-                               status = "disabled";
+                       blsp1_i2c4_pins: blsp1-i2c4-state {
+                               pins = "gpio14", "gpio15";
+                               function = "blsp_i2c4";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       frame@f9027000 {
-                               frame-number = <5>;
-                               interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xf9027000 0x1000>;
-                               status = "disabled";
+                       blsp1_i2c5_pins: blsp1-i2c5-state {
+                               pins = "gpio18", "gpio19";
+                               function = "blsp_i2c5";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       frame@f9028000 {
-                               frame-number = <6>;
-                               interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
-                               reg = <0xf9028000 0x1000>;
-                               status = "disabled";
+                       blsp1_i2c6_pins: blsp1-i2c6-state {
+                               pins = "gpio22", "gpio23";
+                               function = "blsp_i2c6";
+                               drive-strength = <2>;
+                               bias-disable;
                        };
-               };
 
-               sram@fc190000 {
-                       compatible = "qcom,msm8226-rpm-stats";
-                       reg = <0xfc190000 0x10000>;
-               };
-
-               rpm_msg_ram: sram@fc428000 {
-                       compatible = "qcom,rpm-msg-ram";
-                       reg = <0xfc428000 0x4000>;
-
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges = <0 0xfc428000 0x4000>;
-
-                       apss_master_stats: sram@150 {
-                               reg = <0x150 0x14>;
-                       };
+                       cci_default: cci-default-state {
+                               pins = "gpio29", "gpio30";
+                               function = "cci_i2c0";
 
-                       mpss_master_stats: sram@b50 {
-                               reg = <0xb50 0x14>;
+                               drive-strength = <2>;
+                               bias-disable;
                        };
 
-                       lpss_master_stats: sram@1550 {
-                               reg = <0x1550 0x14>;
-                       };
+                       cci_sleep: cci-sleep-state {
+                               pins = "gpio29", "gpio30";
+                               function = "gpio";
 
-                       pronto_master_stats: sram@1f50 {
-                               reg = <0x1f50 0x14>;
+                               drive-strength = <2>;
+                               bias-disable;
                        };
-               };
-
-               tcsr_mutex: hwlock@fd484000 {
-                       compatible = "qcom,msm8226-tcsr-mutex", "qcom,tcsr-mutex";
-                       reg = <0xfd484000 0x1000>;
-                       #hwlock-cells = <1>;
-               };
-
-               adsp: remoteproc@fe200000 {
-                       compatible = "qcom,msm8226-adsp-pil";
-                       reg = <0xfe200000 0x100>;
-
-                       interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>,
-                                             <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
-                                             <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
-                                             <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
-                                             <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
 
-                       power-domains = <&rpmpd MSM8226_VDDCX>;
-                       power-domain-names = "cx";
-
-                       clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>;
-                       clock-names = "xo";
-
-                       memory-region = <&adsp_region>;
-
-                       qcom,smem-states = <&adsp_smp2p_out 0>;
-                       qcom,smem-state-names = "stop";
-
-                       status = "disabled";
+                       sdhc1_default_state: sdhc1-default-state {
+                               clk-pins {
+                                       pins = "sdc1_clk";
+                                       drive-strength = <10>;
+                                       bias-disable;
+                               };
 
-                       smd-edge {
-                               interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
+                               cmd-data-pins {
+                                       pins = "sdc1_cmd", "sdc1_data";
+                                       drive-strength = <10>;
+                                       bias-pull-up;
+                               };
+                       };
 
-                               qcom,ipc = <&apcs 8 8>;
-                               qcom,smd-edge = <1>;
+                       sdhc2_default_state: sdhc2-default-state {
+                               clk-pins {
+                                       pins = "sdc2_clk";
+                                       drive-strength = <10>;
+                                       bias-disable;
+                               };
 
-                               label = "lpass";
+                               cmd-data-pins {
+                                       pins = "sdc2_cmd", "sdc2_data";
+                                       drive-strength = <10>;
+                                       bias-pull-up;
+                               };
                        };
-               };
 
-               sram@fdd00000 {
-                       compatible = "qcom,msm8226-ocmem";
-                       reg = <0xfdd00000 0x2000>,
-                             <0xfec00000 0x20000>;
-                       reg-names = "ctrl", "mem";
-                       ranges = <0 0xfec00000 0x20000>;
-                       clocks = <&rpmcc RPM_SMD_OCMEMGX_CLK>;
-                       clock-names = "core";
+                       sdhc3_default_state: sdhc3-default-state {
+                               clk-pins {
+                                       pins = "gpio44";
+                                       function = "sdc3";
+                                       drive-strength = <8>;
+                                       bias-disable;
+                               };
 
-                       #address-cells = <1>;
-                       #size-cells = <1>;
+                               cmd-pins {
+                                       pins = "gpio43";
+                                       function = "sdc3";
+                                       drive-strength = <8>;
+                                       bias-pull-up;
+                               };
 
-                       gmu_sram: gmu-sram@0 {
-                               reg = <0x0 0x20000>;
+                               data-pins {
+                                       pins = "gpio39", "gpio40", "gpio41", "gpio42";
+                                       function = "sdc3";
+                                       drive-strength = <8>;
+                                       bias-pull-up;
+                               };
                        };
                };
 
-               sram@fe805000 {
-                       compatible = "qcom,msm8226-imem", "syscon", "simple-mfd";
-                       reg = <0xfe805000 0x1000>;
-
-                       reboot-mode {
-                               compatible = "syscon-reboot-mode";
-                               offset = <0x65c>;
+               mmcc: clock-controller@fd8c0000 {
+                       compatible = "qcom,mmcc-msm8226";
+                       reg = <0xfd8c0000 0x6000>;
+                       #clock-cells = <1>;
+                       #reset-cells = <1>;
+                       #power-domain-cells = <1>;
 
-                               mode-bootloader = <0x77665500>;
-                               mode-normal = <0x77665501>;
-                               mode-recovery = <0x77665502>;
-                       };
+                       clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
+                                <&gcc GCC_MMSS_GPLL0_CLK_SRC>,
+                                <&gcc GPLL0_VOTE>,
+                                <&gcc GPLL1_VOTE>,
+                                <&rpmcc RPM_SMD_GFX3D_CLK_SRC>,
+                                <&mdss_dsi0_phy 1>,
+                                <&mdss_dsi0_phy 0>;
+                       clock-names = "xo",
+                                     "mmss_gpll0_vote",
+                                     "gpll0_vote",
+                                     "gpll1_vote",
+                                     "gfx3d_clk_src",
+                                     "dsi0pll",
+                                     "dsi0pllbyte";
                };
 
                mdss: display-subsystem@fd900000 {
                        };
                };
 
+               cci: cci@fda0c000 {
+                       compatible = "qcom,msm8226-cci";
+                       reg = <0xfda0c000 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       interrupts = <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
+                       clocks = <&mmcc CAMSS_TOP_AHB_CLK>,
+                                <&mmcc CAMSS_CCI_CCI_AHB_CLK>,
+                                <&mmcc CAMSS_CCI_CCI_CLK>;
+                       clock-names = "camss_top_ahb",
+                                     "cci_ahb",
+                                     "cci";
+
+                       pinctrl-names = "default", "sleep";
+                       pinctrl-0 = <&cci_default>;
+                       pinctrl-1 = <&cci_sleep>;
+
+                       status = "disabled";
+
+                       cci_i2c0: i2c-bus@0 {
+                               reg = <0>;
+                               clock-frequency = <400000>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                       };
+               };
+
                gpu: adreno@fdb00000 {
                        compatible = "qcom,adreno-305.18", "qcom,adreno";
                        reg = <0xfdb00000 0x10000>;
                                };
                        };
                };
+
+               sram@fdd00000 {
+                       compatible = "qcom,msm8226-ocmem";
+                       reg = <0xfdd00000 0x2000>,
+                             <0xfec00000 0x20000>;
+                       reg-names = "ctrl", "mem";
+                       ranges = <0 0xfec00000 0x20000>;
+                       clocks = <&rpmcc RPM_SMD_OCMEMGX_CLK>;
+                       clock-names = "core";
+
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       gmu_sram: gmu-sram@0 {
+                               reg = <0x0 0x20000>;
+                       };
+               };
+
+               adsp: remoteproc@fe200000 {
+                       compatible = "qcom,msm8226-adsp-pil";
+                       reg = <0xfe200000 0x100>;
+
+                       interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>,
+                                             <&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&adsp_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
+
+                       power-domains = <&rpmpd MSM8226_VDDCX>;
+                       power-domain-names = "cx";
+
+                       clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>;
+                       clock-names = "xo";
+
+                       memory-region = <&adsp_region>;
+
+                       qcom,smem-states = <&adsp_smp2p_out 0>;
+                       qcom,smem-state-names = "stop";
+
+                       status = "disabled";
+
+                       smd-edge {
+                               interrupts = <GIC_SPI 156 IRQ_TYPE_EDGE_RISING>;
+
+                               qcom,ipc = <&apcs 8 8>;
+                               qcom,smd-edge = <1>;
+
+                               label = "lpass";
+                       };
+               };
+
+               sram@fe805000 {
+                       compatible = "qcom,msm8226-imem", "syscon", "simple-mfd";
+                       reg = <0xfe805000 0x1000>;
+
+                       reboot-mode {
+                               compatible = "syscon-reboot-mode";
+                               offset = <0x65c>;
+
+                               mode-bootloader = <0x77665500>;
+                               mode-normal = <0x77665501>;
+                               mode-recovery = <0x77665502>;
+                       };
+               };
        };
 
        thermal-zones {