1 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
2 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
4 gpio-ranges = <&qcom_pinmux 0 0 69>;
7 + #address-cells = <0>;
8 #interrupt-cells = <2>;
9 interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
12 function = "pcie3_rst";
13 drive-strength = <12>;
22 nand_pins: nand_pins {
25 pins = "gpio34", "gpio35", "gpio36",
26 - "gpio37", "gpio38", "gpio39",
27 - "gpio40", "gpio41", "gpio42",
28 - "gpio43", "gpio44", "gpio45",
32 drive-strength = <10>;
39 + drive-strength = <10>;
44 pins = "gpio40", "gpio41", "gpio42",
45 "gpio43", "gpio44", "gpio45",
48 + drive-strength = <10>;
53 intc: interrupt-controller@2000000 {
54 compatible = "qcom,msm-qgic2";
56 + #address-cells = <0>;
57 #interrupt-cells = <3>;
58 reg = <0x02000000 0x1000>,
61 acc0: clock-controller@2088000 {
62 compatible = "qcom,kpss-acc-v1";
63 reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
64 + clock-output-names = "acpu0_aux";
67 acc1: clock-controller@2098000 {
68 compatible = "qcom,kpss-acc-v1";
69 reg = <0x02098000 0x1000>, <0x02008000 0x1000>;
70 + clock-output-names = "acpu1_aux";
73 adm_dma: dma-controller@18300000 {
77 saw0: regulator@2089000 {
78 - compatible = "qcom,saw2";
79 + compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
80 reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
84 saw1: regulator@2099000 {
85 - compatible = "qcom,saw2";
86 + compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
87 reg = <0x02099000 0x1000>, <0x02009000 0x1000>;
95 + gsbi2_i2c: i2c@124a0000 {
96 compatible = "qcom,i2c-qup-v1.1.1";
97 reg = <0x124a0000 0x1000>;
98 interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>;
100 compatible = "qcom,ipq806x-nand";
101 reg = <0x1ac00000 0x800>;
103 - pinctrl-0 = <&nand_pins>;
104 - pinctrl-names = "default";
106 clocks = <&gcc EBI2_CLK>,
108 clock-names = "core", "aon";
109 @@ -733,10 +736,13 @@
110 tsens_calib_backup: calib_backup@410 {
113 + speedbin_efuse: speedbin@0c0 {
118 gcc: clock-controller@900000 {
119 - compatible = "qcom,gcc-ipq8064";
120 + compatible = "qcom,gcc-ipq8064", "syscon";
121 reg = <0x00900000 0x4000>;
124 @@ -768,10 +774,45 @@
125 clocks = <&gcc RPM_MSG_RAM_H_CLK>;
128 + #address-cells = <1>;
131 rpmcc: clock-controller {
132 compatible = "qcom,rpmcc-ipq806x", "qcom,rpmcc";
137 + compatible = "qcom,rpm-smb208-regulators";
140 + regulator-min-microvolt = <1050000>;
141 + regulator-max-microvolt = <1150000>;
143 + qcom,switch-mode-frequency = <1200000>;
147 + regulator-min-microvolt = <1050000>;
148 + regulator-max-microvolt = <1150000>;
150 + qcom,switch-mode-frequency = <1200000>;
154 + regulator-min-microvolt = < 800000>;
155 + regulator-max-microvolt = <1250000>;
157 + qcom,switch-mode-frequency = <1200000>;
161 + regulator-min-microvolt = < 800000>;
162 + regulator-max-microvolt = <1250000>;
164 + qcom,switch-mode-frequency = <1200000>;
169 tcsr: syscon@1a400000 {
172 gmac0: ethernet@37000000 {
173 device_type = "network";
174 - compatible = "qcom,ipq806x-gmac";
175 + compatible = "qcom,ipq806x-gmac", "snps,dwmac";
176 reg = <0x37000000 0x200000>;
177 interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;
178 interrupt-names = "macirq";
181 gmac1: ethernet@37200000 {
182 device_type = "network";
183 - compatible = "qcom,ipq806x-gmac";
184 + compatible = "qcom,ipq806x-gmac", "snps,dwmac";
185 reg = <0x37200000 0x200000>;
186 interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
187 interrupt-names = "macirq";
188 @@ -1013,7 +1054,7 @@
190 gmac2: ethernet@37400000 {
191 device_type = "network";
192 - compatible = "qcom,ipq806x-gmac";
193 + compatible = "qcom,ipq806x-gmac", "snps,dwmac";
194 reg = <0x37400000 0x200000>;
195 interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
196 interrupt-names = "macirq";
197 @@ -1037,7 +1078,7 @@
199 gmac3: ethernet@37600000 {
200 device_type = "network";
201 - compatible = "qcom,ipq806x-gmac";
202 + compatible = "qcom,ipq806x-gmac", "snps,dwmac";
203 reg = <0x37600000 0x200000>;
204 interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
205 interrupt-names = "macirq";
206 @@ -1050,8 +1050,6 @@
207 clocks = <&gcc USB30_0_UTMI_CLK>;
211 - status = "disabled";
214 ss_phy_0: usb3phy@100f8830 {
215 @@ -1055,8 +1055,6 @@
216 clocks = <&gcc USB30_0_MASTER_CLK>;
220 - status = "disabled";
223 usb3_0: usb3@100f8800 {
224 @@ -1176,7 +1217,7 @@
228 - compatible = "simple-bus";
229 + compatible = "arm,amba-bus";
230 #address-cells = <1>;
233 @@ -1195,7 +1236,6 @@
238 vmmc-supply = <&vsdcc_fixed>;
239 dmas = <&sdcc1bam 2>, <&sdcc1bam 1>;
240 dma-names = "tx", "rx";