forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87 
 kernel/arch/arm/boot/dts/imx6sx.dtsi
....@@ -87,16 +87,9 @@
8787 				      "pll1_sw", "pll1_sys";
8888 			arm-supply = <&reg_arm>;
8989 			soc-supply = <&reg_soc>;
90
+			nvmem-cells = <&cpu_speed_grade>;
91
+			nvmem-cell-names = "speed_grade";
9092 		};
91
-	};
92
-
93
-	intc: interrupt-controller@a01000 {
94
-		compatible = "arm,cortex-a9-gic";
95
-		#interrupt-cells = <3>;
96
-		interrupt-controller;
97
-		reg = <0x00a01000 0x1000>,
98
-		      <0x00a00100 0x100>;
99
-		interrupt-parent = <&intc>;
10093 	};
10194 
10295 	ckil: clock-ckil {
....@@ -141,20 +134,21 @@
141134 		clock-output-names = "anaclk2";
142135 	};
143136 
144
-	tempmon: tempmon {
145
-		compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
146
-		interrupt-parent = <&gpc>;
147
-		interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
148
-		fsl,tempmon = <&anatop>;
149
-		nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
150
-		nvmem-cell-names = "calib", "temp_grade";
151
-		clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
137
+	mqs: mqs {
138
+		compatible = "fsl,imx6sx-mqs";
139
+		gpr = <&gpr>;
140
+		status = "disabled";
152141 	};
153142 
154143 	pmu {
155144 		compatible = "arm,cortex-a9-pmu";
156145 		interrupt-parent = <&gpc>;
157146 		interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
147
+	};
148
+
149
+	usbphynop1: usbphynop1 {
150
+		compatible = "usb-nop-xceiv";
151
+		#phy-cells = <0>;
158152 	};
159153 
160154 	soc {
....@@ -167,16 +161,31 @@
167161 		ocram_s: sram@8f8000 {
168162 			compatible = "mmio-sram";
169163 			reg = <0x008f8000 0x4000>;
164
+			ranges = <0 0x008f8000 0x4000>;
165
+			#address-cells = <1>;
166
+			#size-cells = <1>;
170167 			clocks = <&clks IMX6SX_CLK_OCRAM_S>;
171168 		};
172169 
173170 		ocram: sram@900000 {
174171 			compatible = "mmio-sram";
175172 			reg = <0x00900000 0x20000>;
173
+			ranges = <0 0x00900000 0x20000>;
174
+			#address-cells = <1>;
175
+			#size-cells = <1>;
176176 			clocks = <&clks IMX6SX_CLK_OCRAM>;
177177 		};
178178 
179
-		L2: l2-cache@a02000 {
179
+		intc: interrupt-controller@a01000 {
180
+			compatible = "arm,cortex-a9-gic";
181
+			#interrupt-cells = <3>;
182
+			interrupt-controller;
183
+			reg = <0x00a01000 0x1000>,
184
+			      <0x00a00100 0x100>;
185
+			interrupt-parent = <&intc>;
186
+		};
187
+
188
+		L2: cache-controller@a02000 {
180189 			compatible = "arm,pl310-cache";
181190 			reg = <0x00a02000 0x1000>;
182191 			interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
....@@ -210,7 +219,7 @@
210219 			clocks = <&clks IMX6SX_CLK_APBH_DMA>;
211220 		};
212221 
213
-		gpmi: gpmi-nand@1806000{
222
+		gpmi: nand-controller@1806000{
214223 			compatible = "fsl,imx6sx-gpmi-nand";
215224 			#address-cells = <1>;
216225 			#size-cells = <1>;
....@@ -230,7 +239,7 @@
230239 			status = "disabled";
231240 		};
232241 
233
-		aips1: aips-bus@2000000 {
242
+		aips1: bus@2000000 {
234243 			compatible = "fsl,aips-bus", "simple-bus";
235244 			#address-cells = <1>;
236245 			#size-cells = <1>;
....@@ -266,7 +275,7 @@
266275 					status = "disabled";
267276 				};
268277 
269
-				ecspi1: ecspi@2008000 {
278
+				ecspi1: spi@2008000 {
270279 					#address-cells = <1>;
271280 					#size-cells = <0>;
272281 					compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
....@@ -278,7 +287,7 @@
278287 					status = "disabled";
279288 				};
280289 
281
-				ecspi2: ecspi@200c000 {
290
+				ecspi2: spi@200c000 {
282291 					#address-cells = <1>;
283292 					#size-cells = <0>;
284293 					compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
....@@ -290,7 +299,7 @@
290299 					status = "disabled";
291300 				};
292301 
293
-				ecspi3: ecspi@2010000 {
302
+				ecspi3: spi@2010000 {
294303 					#address-cells = <1>;
295304 					#size-cells = <0>;
296305 					compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
....@@ -302,7 +311,7 @@
302311 					status = "disabled";
303312 				};
304313 
305
-				ecspi4: ecspi@2014000 {
314
+				ecspi4: spi@2014000 {
306315 					#address-cells = <1>;
307316 					#size-cells = <0>;
308317 					compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
....@@ -328,6 +337,7 @@
328337 				};
329338 
330339 				esai: esai@2024000 {
340
+					compatible = "fsl,imx6sx-esai", "fsl,imx35-esai";
331341 					reg = <0x02024000 0x4000>;
332342 					interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
333343 					clocks = <&clks IMX6SX_CLK_ESAI_IPG>,
....@@ -337,6 +347,9 @@
337347 						 <&clks IMX6SX_CLK_SPBA>;
338348 					clock-names = "core", "mem", "extal",
339349 						      "fsys", "spba";
350
+					dmas = <&sdma 23 21 0>,
351
+					       <&sdma 24 21 0>;
352
+					dma-names = "rx", "tx";
340353 					status = "disabled";
341354 				};
342355 
....@@ -383,18 +396,28 @@
383396 				};
384397 
385398 				asrc: asrc@2034000 {
399
+					compatible = "fsl,imx6sx-asrc", "fsl,imx53-asrc";
386400 					reg = <0x02034000 0x4000>;
387401 					interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
388
-					clocks = <&clks IMX6SX_CLK_ASRC_MEM>,
389
-						 <&clks IMX6SX_CLK_ASRC_IPG>,
390
-						 <&clks IMX6SX_CLK_SPDIF>,
391
-						 <&clks IMX6SX_CLK_SPBA>;
392
-					clock-names = "mem", "ipg", "asrck", "spba";
393
-					dmas = <&sdma 17 20 1>, <&sdma 18 20 1>,
394
-					       <&sdma 19 20 1>, <&sdma 20 20 1>,
395
-					       <&sdma 21 20 1>, <&sdma 22 20 1>;
402
+					clocks = <&clks IMX6SX_CLK_ASRC_IPG>,
403
+						<&clks IMX6SX_CLK_ASRC_MEM>, <&clks 0>,
404
+						<&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>,
405
+						<&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>,
406
+						<&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>,
407
+						<&clks IMX6SX_CLK_SPDIF>, <&clks 0>, <&clks 0>,
408
+						<&clks IMX6SX_CLK_SPBA>;
409
+					clock-names = "mem", "ipg", "asrck_0",
410
+						"asrck_1", "asrck_2", "asrck_3", "asrck_4",
411
+						"asrck_5", "asrck_6", "asrck_7", "asrck_8",
412
+						"asrck_9", "asrck_a", "asrck_b", "asrck_c",
413
+						"asrck_d", "asrck_e", "asrck_f", "spba";
414
+					dmas = <&sdma 17 23 1>, <&sdma 18 23 1>,
415
+					       <&sdma 19 23 1>, <&sdma 20 23 1>,
416
+					       <&sdma 21 23 1>, <&sdma 22 23 1>;
396417 					dma-names = "rxa", "rxb", "rxc",
397418 						    "txa", "txb", "txc";
419
+					fsl,asrc-rate  = <48000>;
420
+					fsl,asrc-width = <16>;
398421 					status = "okay";
399422 				};
400423 			};
....@@ -406,7 +429,7 @@
406429 				clocks = <&clks IMX6SX_CLK_PWM1>,
407430 					 <&clks IMX6SX_CLK_PWM1>;
408431 				clock-names = "ipg", "per";
409
-				#pwm-cells = <2>;
432
+				#pwm-cells = <3>;
410433 			};
411434 
412435 			pwm2: pwm@2084000 {
....@@ -416,7 +439,7 @@
416439 				clocks = <&clks IMX6SX_CLK_PWM2>,
417440 					 <&clks IMX6SX_CLK_PWM2>;
418441 				clock-names = "ipg", "per";
419
-				#pwm-cells = <2>;
442
+				#pwm-cells = <3>;
420443 			};
421444 
422445 			pwm3: pwm@2088000 {
....@@ -426,7 +449,7 @@
426449 				clocks = <&clks IMX6SX_CLK_PWM3>,
427450 					 <&clks IMX6SX_CLK_PWM3>;
428451 				clock-names = "ipg", "per";
429
-				#pwm-cells = <2>;
452
+				#pwm-cells = <3>;
430453 			};
431454 
432455 			pwm4: pwm@208c000 {
....@@ -436,7 +459,7 @@
436459 				clocks = <&clks IMX6SX_CLK_PWM4>,
437460 					 <&clks IMX6SX_CLK_PWM4>;
438461 				clock-names = "ipg", "per";
439
-				#pwm-cells = <2>;
462
+				#pwm-cells = <3>;
440463 			};
441464 
442465 			flexcan1: can@2090000 {
....@@ -446,6 +469,7 @@
446469 				clocks = <&clks IMX6SX_CLK_CAN1_IPG>,
447470 					 <&clks IMX6SX_CLK_CAN1_SERIAL>;
448471 				clock-names = "ipg", "per";
472
+				fsl,stop-mode = <&gpr 0x10 1 0x10 17>;
449473 				status = "disabled";
450474 			};
451475 
....@@ -456,10 +480,11 @@
456480 				clocks = <&clks IMX6SX_CLK_CAN2_IPG>,
457481 					 <&clks IMX6SX_CLK_CAN2_SERIAL>;
458482 				clock-names = "ipg", "per";
483
+				fsl,stop-mode = <&gpr 0x10 2 0x10 18>;
459484 				status = "disabled";
460485 			};
461486 
462
-			gpt: gpt@2098000 {
487
+			gpt: timer@2098000 {
463488 				compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";
464489 				reg = <0x02098000 0x4000>;
465490 				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
....@@ -552,30 +577,30 @@
552577 				gpio-ranges = <&iomuxc 0 148 10>, <&iomuxc 10 169 2>;
553578 			};
554579 
555
-			kpp: kpp@20b8000 {
580
+			kpp: keypad@20b8000 {
556581 				compatible = "fsl,imx6sx-kpp", "fsl,imx21-kpp";
557582 				reg = <0x020b8000 0x4000>;
558583 				interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
559
-				clocks = <&clks IMX6SX_CLK_DUMMY>;
584
+				clocks = <&clks IMX6SX_CLK_IPG>;
560585 				status = "disabled";
561586 			};
562587 
563
-			wdog1: wdog@20bc000 {
588
+			wdog1: watchdog@20bc000 {
564589 				compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
565590 				reg = <0x020bc000 0x4000>;
566591 				interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
567
-				clocks = <&clks IMX6SX_CLK_DUMMY>;
592
+				clocks = <&clks IMX6SX_CLK_IPG>;
568593 			};
569594 
570
-			wdog2: wdog@20c0000 {
595
+			wdog2: watchdog@20c0000 {
571596 				compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
572597 				reg = <0x020c0000 0x4000>;
573598 				interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
574
-				clocks = <&clks IMX6SX_CLK_DUMMY>;
599
+				clocks = <&clks IMX6SX_CLK_IPG>;
575600 				status = "disabled";
576601 			};
577602 
578
-			clks: ccm@20c4000 {
603
+			clks: clock-controller@20c4000 {
579604 				compatible = "fsl,imx6sx-ccm";
580605 				reg = <0x020c4000 0x4000>;
581606 				interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
....@@ -587,13 +612,13 @@
587612 
588613 			anatop: anatop@20c8000 {
589614 				compatible = "fsl,imx6sx-anatop", "fsl,imx6q-anatop",
590
-					     "syscon", "simple-bus";
615
+					     "syscon", "simple-mfd";
591616 				reg = <0x020c8000 0x1000>;
592617 				interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
593618 					     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
594619 					     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
595620 
596
-				regulator-1p1 {
621
+				reg_vdd1p1: regulator-1p1 {
597622 					compatible = "fsl,anatop-regulator";
598623 					regulator-name = "vdd1p1";
599624 					regulator-min-microvolt = <1000000>;
....@@ -608,7 +633,7 @@
608633 					anatop-enable-bit = <0>;
609634 				};
610635 
611
-				regulator-3p0 {
636
+				reg_vdd3p0: regulator-3p0 {
612637 					compatible = "fsl,anatop-regulator";
613638 					regulator-name = "vdd3p0";
614639 					regulator-min-microvolt = <2800000>;
....@@ -623,7 +648,7 @@
623648 					anatop-enable-bit = <0>;
624649 				};
625650 
626
-				regulator-2p5 {
651
+				reg_vdd2p5: regulator-2p5 {
627652 					compatible = "fsl,anatop-regulator";
628653 					regulator-name = "vdd2p5";
629654 					regulator-min-microvolt = <2250000>;
....@@ -687,6 +712,16 @@
687712 					anatop-min-voltage = <725000>;
688713 					anatop-max-voltage = <1450000>;
689714 				};
715
+
716
+				tempmon: tempmon {
717
+					compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
718
+					interrupt-parent = <&gpc>;
719
+					interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
720
+					fsl,tempmon = <&anatop>;
721
+					nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
722
+					nvmem-cell-names = "calib", "temp_grade";
723
+					clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
724
+				};
690725 			};
691726 
692727 			usbphy1: usbphy@20c9000 {
....@@ -731,6 +766,7 @@
731766 					interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
732767 					linux,keycode = <KEY_POWER>;
733768 					wakeup-source;
769
+					status = "disabled";
734770 				};
735771 			};
736772 
....@@ -744,7 +780,7 @@
744780 				interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
745781 			};
746782 
747
-			src: src@20d8000 {
783
+			src: reset-controller@20d8000 {
748784 				compatible = "fsl,imx6sx-src", "fsl,imx51-src";
749785 				reg = <0x020d8000 0x4000>;
750786 				interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>,
....@@ -778,6 +814,18 @@
778814 						clocks = <&clks IMX6SX_CLK_GPU>;
779815 					};
780816 
817
+					pd_disp: power-domain@2 {
818
+						reg = <2>;
819
+						#power-domain-cells = <0>;
820
+						clocks = <&clks IMX6SX_CLK_PXP_AXI>,
821
+							 <&clks IMX6SX_CLK_DISPLAY_AXI>,
822
+							 <&clks IMX6SX_CLK_LCDIF1_PIX>,
823
+							 <&clks IMX6SX_CLK_LCDIF_APB>,
824
+							 <&clks IMX6SX_CLK_LCDIF2_PIX>,
825
+							 <&clks IMX6SX_CLK_CSI>,
826
+							 <&clks IMX6SX_CLK_VADC>;
827
+					};
828
+
781829 					pd_pci: power-domain@3 {
782830 						reg = <3>;
783831 						#power-domain-cells = <0>;
....@@ -786,7 +834,7 @@
786834 				};
787835 			};
788836 
789
-			iomuxc: iomuxc@20e0000 {
837
+			iomuxc: pinctrl@20e0000 {
790838 				compatible = "fsl,imx6sx-iomuxc";
791839 				reg = <0x020e0000 0x4000>;
792840 			};
....@@ -810,14 +858,14 @@
810858 			};
811859 		};
812860 
813
-		aips2: aips-bus@2100000 {
861
+		aips2: bus@2100000 {
814862 			compatible = "fsl,aips-bus", "simple-bus";
815863 			#address-cells = <1>;
816864 			#size-cells = <1>;
817865 			reg = <0x02100000 0x100000>;
818866 			ranges;
819867 
820
-			crypto: caam@2100000 {
868
+			crypto: crypto@2100000 {
821869 				compatible = "fsl,sec-v4.0";
822870 				#address-cells = <1>;
823871 				#size-cells = <1>;
....@@ -830,13 +878,13 @@
830878 					 <&clks IMX6SX_CLK_EIM_SLOW>;
831879 				clock-names = "mem", "aclk", "ipg", "emi_slow";
832880 
833
-				sec_jr0: jr0@1000 {
881
+				sec_jr0: jr@1000 {
834882 					compatible = "fsl,sec-v4.0-job-ring";
835883 					reg = <0x1000 0x1000>;
836884 					interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
837885 				};
838886 
839
-				sec_jr1: jr1@2000 {
887
+				sec_jr1: jr@2000 {
840888 					compatible = "fsl,sec-v4.0-job-ring";
841889 					reg = <0x2000 0x1000>;
842890 					interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
....@@ -875,6 +923,7 @@
875923 				reg = <0x02184400 0x200>;
876924 				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
877925 				clocks = <&clks IMX6SX_CLK_USBOH3>;
926
+				fsl,usbphy = <&usbphynop1>;
878927 				fsl,usbmisc = <&usbmisc 2>;
879928 				phy_type = "hsic";
880929 				fsl,anatop = <&anatop>;
....@@ -905,8 +954,9 @@
905954 					 <&clks IMX6SX_CLK_ENET_PTP>;
906955 				clock-names = "ipg", "ahb", "ptp",
907956 					      "enet_clk_ref", "enet_out";
908
-				fsl,num-tx-queues=<3>;
909
-				fsl,num-rx-queues=<3>;
957
+				fsl,num-tx-queues = <3>;
958
+				fsl,num-rx-queues = <3>;
959
+				fsl,stop-mode = <&gpr 0x10 3>;
910960 				status = "disabled";
911961 			};
912962 
....@@ -919,7 +969,7 @@
919969 				status = "disabled";
920970 			};
921971 
922
-			usdhc1: usdhc@2190000 {
972
+			usdhc1: mmc@2190000 {
923973 				compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
924974 				reg = <0x02190000 0x4000>;
925975 				interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
....@@ -931,7 +981,7 @@
931981 				status = "disabled";
932982 			};
933983 
934
-			usdhc2: usdhc@2194000 {
984
+			usdhc2: mmc@2194000 {
935985 				compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
936986 				reg = <0x02194000 0x4000>;
937987 				interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
....@@ -943,7 +993,7 @@
943993 				status = "disabled";
944994 			};
945995 
946
-			usdhc3: usdhc@2198000 {
996
+			usdhc3: mmc@2198000 {
947997 				compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
948998 				reg = <0x02198000 0x4000>;
949999 				interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
....@@ -955,7 +1005,7 @@
9551005 				status = "disabled";
9561006 			};
9571007 
958
-			usdhc4: usdhc@219c000 {
1008
+			usdhc4: mmc@219c000 {
9591009 				compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
9601010 				reg = <0x0219c000 0x4000>;
9611011 				interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
....@@ -997,9 +1047,10 @@
9971047 				status = "disabled";
9981048 			};
9991049 
1000
-			mmdc: mmdc@21b0000 {
1050
+			memory-controller@21b0000 {
10011051 				compatible = "fsl,imx6sx-mmdc", "fsl,imx6q-mmdc";
10021052 				reg = <0x021b0000 0x4000>;
1053
+				clocks = <&clks IMX6SX_CLK_MMDC_P0_IPG>;
10031054 			};
10041055 
10051056 			fec2: ethernet@21b4000 {
....@@ -1015,6 +1066,7 @@
10151066 					 <&clks IMX6SX_CLK_ENET_PTP>;
10161067 				clock-names = "ipg", "ahb", "ptp",
10171068 					      "enet_clk_ref", "enet_out";
1069
+				fsl,stop-mode = <&gpr 0x10 4>;
10181070 				status = "disabled";
10191071 			};
10201072 
....@@ -1029,12 +1081,16 @@
10291081 				status = "disabled";
10301082 			};
10311083 
1032
-			ocotp: ocotp@21bc000 {
1084
+			ocotp: efuse@21bc000 {
10331085 				#address-cells = <1>;
10341086 				#size-cells = <1>;
10351087 				compatible = "fsl,imx6sx-ocotp", "syscon";
10361088 				reg = <0x021bc000 0x4000>;
10371089 				clocks = <&clks IMX6SX_CLK_OCOTP>;
1090
+
1091
+				cpu_speed_grade: speed-grade@10 {
1092
+					reg = <0x10 4>;
1093
+				};
10381094 
10391095 				tempmon_calib: calib@38 {
10401096 					reg = <0x38 4>;
....@@ -1077,7 +1133,7 @@
10771133 				status = "disabled";
10781134 			};
10791135 
1080
-			qspi1: qspi@21e0000 {
1136
+			qspi1: spi@21e0000 {
10811137 				#address-cells = <1>;
10821138 				#size-cells = <0>;
10831139 				compatible = "fsl,imx6sx-qspi";
....@@ -1090,7 +1146,7 @@
10901146 				status = "disabled";
10911147 			};
10921148 
1093
-			qspi2: qspi@21e4000 {
1149
+			qspi2: spi@21e4000 {
10941150 				#address-cells = <1>;
10951151 				#size-cells = <0>;
10961152 				compatible = "fsl,imx6sx-qspi";
....@@ -1166,7 +1222,7 @@
11661222 			};
11671223 		};
11681224 
1169
-		aips3: aips-bus@2200000 {
1225
+		aips3: bus@2200000 {
11701226 			compatible = "fsl,aips-bus", "simple-bus";
11711227 			#address-cells = <1>;
11721228 			#size-cells = <1>;
....@@ -1191,11 +1247,12 @@
11911247 				};
11921248 
11931249 				pxp: pxp@2218000 {
1250
+					compatible = "fsl,imx6sx-pxp", "fsl,imx6ull-pxp";
11941251 					reg = <0x02218000 0x4000>;
11951252 					interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
1196
-					clocks = <&clks IMX6SX_CLK_PXP_AXI>,
1197
-						 <&clks IMX6SX_CLK_DISPLAY_AXI>;
1198
-					clock-names = "pxp-axi", "disp-axi";
1253
+					clocks = <&clks IMX6SX_CLK_PXP_AXI>;
1254
+					clock-names = "axi";
1255
+					power-domains = <&pd_disp>;
11991256 					status = "disabled";
12001257 				};
12011258 
....@@ -1217,6 +1274,7 @@
12171274 						 <&clks IMX6SX_CLK_LCDIF_APB>,
12181275 						 <&clks IMX6SX_CLK_DISPLAY_AXI>;
12191276 					clock-names = "pix", "axi", "disp_axi";
1277
+					power-domains = <&pd_disp>;
12201278 					status = "disabled";
12211279 				};
12221280 
....@@ -1228,6 +1286,7 @@
12281286 						 <&clks IMX6SX_CLK_LCDIF_APB>,
12291287 						 <&clks IMX6SX_CLK_DISPLAY_AXI>;
12301288 					clock-names = "pix", "axi", "disp_axi";
1289
+					power-domains = <&pd_disp>;
12311290 					status = "disabled";
12321291 				};
12331292 
....@@ -1237,6 +1296,7 @@
12371296 					clocks = <&clks IMX6SX_CLK_VADC>,
12381297 						 <&clks IMX6SX_CLK_CSI>;
12391298 					clock-names = "vadc", "csi";
1299
+					power-domains = <&pd_disp>;
12401300 					status = "disabled";
12411301 				};
12421302 			};
....@@ -1263,15 +1323,15 @@
12631323 				status = "disabled";
12641324 			};
12651325 
1266
-			wdog3: wdog@2288000 {
1326
+			wdog3: watchdog@2288000 {
12671327 				compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
12681328 				reg = <0x02288000 0x4000>;
12691329 				interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
1270
-				clocks = <&clks IMX6SX_CLK_DUMMY>;
1330
+				clocks = <&clks IMX6SX_CLK_IPG>;
12711331 				status = "disabled";
12721332 			};
12731333 
1274
-			ecspi5: ecspi@228c000 {
1334
+			ecspi5: spi@228c000 {
12751335 				#address-cells = <1>;
12761336 				#size-cells = <0>;
12771337 				compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
....@@ -1303,7 +1363,7 @@
13031363 				clocks = <&clks IMX6SX_CLK_PWM5>,
13041364 					 <&clks IMX6SX_CLK_PWM5>;
13051365 				clock-names = "ipg", "per";
1306
-				#pwm-cells = <2>;
1366
+				#pwm-cells = <3>;
13071367 			};
13081368 
13091369 			pwm6: pwm@22a8000 {
....@@ -1313,7 +1373,7 @@
13131373 				clocks = <&clks IMX6SX_CLK_PWM6>,
13141374 					 <&clks IMX6SX_CLK_PWM6>;
13151375 				clock-names = "ipg", "per";
1316
-				#pwm-cells = <2>;
1376
+				#pwm-cells = <3>;
13171377 			};
13181378 
13191379 			pwm7: pwm@22ac000 {
....@@ -1323,7 +1383,7 @@
13231383 				clocks = <&clks IMX6SX_CLK_PWM7>,
13241384 					 <&clks IMX6SX_CLK_PWM7>;
13251385 				clock-names = "ipg", "per";
1326
-				#pwm-cells = <2>;
1386
+				#pwm-cells = <3>;
13271387 			};
13281388 
13291389 			pwm8: pwm@22b0000 {
....@@ -1333,7 +1393,7 @@
13331393 				clocks = <&clks IMX6SX_CLK_PWM8>,
13341394 					 <&clks IMX6SX_CLK_PWM8>;
13351395 				clock-names = "ipg", "per";
1336
-				#pwm-cells = <2>;
1396
+				#pwm-cells = <3>;
13371397 			};
13381398 		};
13391399 
....@@ -1361,7 +1421,8 @@
13611421 				 <&clks IMX6SX_CLK_PCIE_REF_125M>,
13621422 				 <&clks IMX6SX_CLK_DISPLAY_AXI>;
13631423 			clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_inbound_axi";
1364
-			power-domains = <&pd_pci>;
1424
+			power-domains = <&pd_disp>, <&pd_pci>;
1425
+			power-domain-names = "pcie", "pcie_phy";
13651426 			status = "disabled";
13661427 		};
13671428 	};