forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-16 50a212ec906f7524620675f0c57357691c26c81f 
 kernel/arch/arm/boot/dts/imx6sx.dtsi
....@@ -49,6 +49,9 @@
4949 		spi2 = &ecspi3;
5050 		spi3 = &ecspi4;
5151 		spi4 = &ecspi5;
52
+		usb0 = &usbotg1;
53
+		usb1 = &usbotg2;
54
+		usb2 = &usbh;
5255 		usbphy0 = &usbphy1;
5356 		usbphy1 = &usbphy2;
5457 	};
....@@ -87,16 +90,9 @@
8790 				      "pll1_sw", "pll1_sys";
8891 			arm-supply = <&reg_arm>;
8992 			soc-supply = <&reg_soc>;
93
+			nvmem-cells = <&cpu_speed_grade>;
94
+			nvmem-cell-names = "speed_grade";
9095 		};
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>;
10096 	};
10197 
10298 	ckil: clock-ckil {
....@@ -141,20 +137,21 @@
141137 		clock-output-names = "anaclk2";
142138 	};
143139 
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>;
140
+	mqs: mqs {
141
+		compatible = "fsl,imx6sx-mqs";
142
+		gpr = <&gpr>;
143
+		status = "disabled";
152144 	};
153145 
154146 	pmu {
155147 		compatible = "arm,cortex-a9-pmu";
156148 		interrupt-parent = <&gpc>;
157149 		interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
150
+	};
151
+
152
+	usbphynop1: usbphynop1 {
153
+		compatible = "usb-nop-xceiv";
154
+		#phy-cells = <0>;
158155 	};
159156 
160157 	soc {
....@@ -167,16 +164,31 @@
167164 		ocram_s: sram@8f8000 {
168165 			compatible = "mmio-sram";
169166 			reg = <0x008f8000 0x4000>;
167
+			ranges = <0 0x008f8000 0x4000>;
168
+			#address-cells = <1>;
169
+			#size-cells = <1>;
170170 			clocks = <&clks IMX6SX_CLK_OCRAM_S>;
171171 		};
172172 
173173 		ocram: sram@900000 {
174174 			compatible = "mmio-sram";
175175 			reg = <0x00900000 0x20000>;
176
+			ranges = <0 0x00900000 0x20000>;
177
+			#address-cells = <1>;
178
+			#size-cells = <1>;
176179 			clocks = <&clks IMX6SX_CLK_OCRAM>;
177180 		};
178181 
179
-		L2: l2-cache@a02000 {
182
+		intc: interrupt-controller@a01000 {
183
+			compatible = "arm,cortex-a9-gic";
184
+			#interrupt-cells = <3>;
185
+			interrupt-controller;
186
+			reg = <0x00a01000 0x1000>,
187
+			      <0x00a00100 0x100>;
188
+			interrupt-parent = <&intc>;
189
+		};
190
+
191
+		L2: cache-controller@a02000 {
180192 			compatible = "arm,pl310-cache";
181193 			reg = <0x00a02000 0x1000>;
182194 			interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
....@@ -197,7 +209,7 @@
197209 			power-domains = <&pd_pu>;
198210 		};
199211 
200
-		dma_apbh: dma-apbh@1804000 {
212
+		dma_apbh: dma-controller@1804000 {
201213 			compatible = "fsl,imx6sx-dma-apbh", "fsl,imx28-dma-apbh";
202214 			reg = <0x01804000 0x2000>;
203215 			interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
....@@ -210,7 +222,7 @@
210222 			clocks = <&clks IMX6SX_CLK_APBH_DMA>;
211223 		};
212224 
213
-		gpmi: gpmi-nand@1806000{
225
+		gpmi: nand-controller@1806000{
214226 			compatible = "fsl,imx6sx-gpmi-nand";
215227 			#address-cells = <1>;
216228 			#size-cells = <1>;
....@@ -230,7 +242,7 @@
230242 			status = "disabled";
231243 		};
232244 
233
-		aips1: aips-bus@2000000 {
245
+		aips1: bus@2000000 {
234246 			compatible = "fsl,aips-bus", "simple-bus";
235247 			#address-cells = <1>;
236248 			#size-cells = <1>;
....@@ -266,7 +278,7 @@
266278 					status = "disabled";
267279 				};
268280 
269
-				ecspi1: ecspi@2008000 {
281
+				ecspi1: spi@2008000 {
270282 					#address-cells = <1>;
271283 					#size-cells = <0>;
272284 					compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
....@@ -278,7 +290,7 @@
278290 					status = "disabled";
279291 				};
280292 
281
-				ecspi2: ecspi@200c000 {
293
+				ecspi2: spi@200c000 {
282294 					#address-cells = <1>;
283295 					#size-cells = <0>;
284296 					compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
....@@ -290,7 +302,7 @@
290302 					status = "disabled";
291303 				};
292304 
293
-				ecspi3: ecspi@2010000 {
305
+				ecspi3: spi@2010000 {
294306 					#address-cells = <1>;
295307 					#size-cells = <0>;
296308 					compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
....@@ -302,7 +314,7 @@
302314 					status = "disabled";
303315 				};
304316 
305
-				ecspi4: ecspi@2014000 {
317
+				ecspi4: spi@2014000 {
306318 					#address-cells = <1>;
307319 					#size-cells = <0>;
308320 					compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
....@@ -328,6 +340,7 @@
328340 				};
329341 
330342 				esai: esai@2024000 {
343
+					compatible = "fsl,imx6sx-esai", "fsl,imx35-esai";
331344 					reg = <0x02024000 0x4000>;
332345 					interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
333346 					clocks = <&clks IMX6SX_CLK_ESAI_IPG>,
....@@ -337,6 +350,9 @@
337350 						 <&clks IMX6SX_CLK_SPBA>;
338351 					clock-names = "core", "mem", "extal",
339352 						      "fsys", "spba";
353
+					dmas = <&sdma 23 21 0>,
354
+					       <&sdma 24 21 0>;
355
+					dma-names = "rx", "tx";
340356 					status = "disabled";
341357 				};
342358 
....@@ -383,18 +399,28 @@
383399 				};
384400 
385401 				asrc: asrc@2034000 {
402
+					compatible = "fsl,imx6sx-asrc", "fsl,imx53-asrc";
386403 					reg = <0x02034000 0x4000>;
387404 					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>;
405
+					clocks = <&clks IMX6SX_CLK_ASRC_IPG>,
406
+						<&clks IMX6SX_CLK_ASRC_MEM>, <&clks 0>,
407
+						<&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>,
408
+						<&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>,
409
+						<&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>,
410
+						<&clks IMX6SX_CLK_SPDIF>, <&clks 0>, <&clks 0>,
411
+						<&clks IMX6SX_CLK_SPBA>;
412
+					clock-names = "mem", "ipg", "asrck_0",
413
+						"asrck_1", "asrck_2", "asrck_3", "asrck_4",
414
+						"asrck_5", "asrck_6", "asrck_7", "asrck_8",
415
+						"asrck_9", "asrck_a", "asrck_b", "asrck_c",
416
+						"asrck_d", "asrck_e", "asrck_f", "spba";
417
+					dmas = <&sdma 17 23 1>, <&sdma 18 23 1>,
418
+					       <&sdma 19 23 1>, <&sdma 20 23 1>,
419
+					       <&sdma 21 23 1>, <&sdma 22 23 1>;
396420 					dma-names = "rxa", "rxb", "rxc",
397421 						    "txa", "txb", "txc";
422
+					fsl,asrc-rate  = <48000>;
423
+					fsl,asrc-width = <16>;
398424 					status = "okay";
399425 				};
400426 			};
....@@ -406,7 +432,7 @@
406432 				clocks = <&clks IMX6SX_CLK_PWM1>,
407433 					 <&clks IMX6SX_CLK_PWM1>;
408434 				clock-names = "ipg", "per";
409
-				#pwm-cells = <2>;
435
+				#pwm-cells = <3>;
410436 			};
411437 
412438 			pwm2: pwm@2084000 {
....@@ -416,7 +442,7 @@
416442 				clocks = <&clks IMX6SX_CLK_PWM2>,
417443 					 <&clks IMX6SX_CLK_PWM2>;
418444 				clock-names = "ipg", "per";
419
-				#pwm-cells = <2>;
445
+				#pwm-cells = <3>;
420446 			};
421447 
422448 			pwm3: pwm@2088000 {
....@@ -426,7 +452,7 @@
426452 				clocks = <&clks IMX6SX_CLK_PWM3>,
427453 					 <&clks IMX6SX_CLK_PWM3>;
428454 				clock-names = "ipg", "per";
429
-				#pwm-cells = <2>;
455
+				#pwm-cells = <3>;
430456 			};
431457 
432458 			pwm4: pwm@208c000 {
....@@ -436,7 +462,7 @@
436462 				clocks = <&clks IMX6SX_CLK_PWM4>,
437463 					 <&clks IMX6SX_CLK_PWM4>;
438464 				clock-names = "ipg", "per";
439
-				#pwm-cells = <2>;
465
+				#pwm-cells = <3>;
440466 			};
441467 
442468 			flexcan1: can@2090000 {
....@@ -446,6 +472,7 @@
446472 				clocks = <&clks IMX6SX_CLK_CAN1_IPG>,
447473 					 <&clks IMX6SX_CLK_CAN1_SERIAL>;
448474 				clock-names = "ipg", "per";
475
+				fsl,stop-mode = <&gpr 0x10 1 0x10 17>;
449476 				status = "disabled";
450477 			};
451478 
....@@ -456,10 +483,11 @@
456483 				clocks = <&clks IMX6SX_CLK_CAN2_IPG>,
457484 					 <&clks IMX6SX_CLK_CAN2_SERIAL>;
458485 				clock-names = "ipg", "per";
486
+				fsl,stop-mode = <&gpr 0x10 2 0x10 18>;
459487 				status = "disabled";
460488 			};
461489 
462
-			gpt: gpt@2098000 {
490
+			gpt: timer@2098000 {
463491 				compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";
464492 				reg = <0x02098000 0x4000>;
465493 				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
....@@ -552,30 +580,30 @@
552580 				gpio-ranges = <&iomuxc 0 148 10>, <&iomuxc 10 169 2>;
553581 			};
554582 
555
-			kpp: kpp@20b8000 {
583
+			kpp: keypad@20b8000 {
556584 				compatible = "fsl,imx6sx-kpp", "fsl,imx21-kpp";
557585 				reg = <0x020b8000 0x4000>;
558586 				interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
559
-				clocks = <&clks IMX6SX_CLK_DUMMY>;
587
+				clocks = <&clks IMX6SX_CLK_IPG>;
560588 				status = "disabled";
561589 			};
562590 
563
-			wdog1: wdog@20bc000 {
591
+			wdog1: watchdog@20bc000 {
564592 				compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
565593 				reg = <0x020bc000 0x4000>;
566594 				interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
567
-				clocks = <&clks IMX6SX_CLK_DUMMY>;
595
+				clocks = <&clks IMX6SX_CLK_IPG>;
568596 			};
569597 
570
-			wdog2: wdog@20c0000 {
598
+			wdog2: watchdog@20c0000 {
571599 				compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
572600 				reg = <0x020c0000 0x4000>;
573601 				interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
574
-				clocks = <&clks IMX6SX_CLK_DUMMY>;
602
+				clocks = <&clks IMX6SX_CLK_IPG>;
575603 				status = "disabled";
576604 			};
577605 
578
-			clks: ccm@20c4000 {
606
+			clks: clock-controller@20c4000 {
579607 				compatible = "fsl,imx6sx-ccm";
580608 				reg = <0x020c4000 0x4000>;
581609 				interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
....@@ -587,13 +615,13 @@
587615 
588616 			anatop: anatop@20c8000 {
589617 				compatible = "fsl,imx6sx-anatop", "fsl,imx6q-anatop",
590
-					     "syscon", "simple-bus";
618
+					     "syscon", "simple-mfd";
591619 				reg = <0x020c8000 0x1000>;
592620 				interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
593621 					     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
594622 					     <GIC_SPI 127 IRQ_TYPE_LEVEL_HIGH>;
595623 
596
-				regulator-1p1 {
624
+				reg_vdd1p1: regulator-1p1 {
597625 					compatible = "fsl,anatop-regulator";
598626 					regulator-name = "vdd1p1";
599627 					regulator-min-microvolt = <1000000>;
....@@ -608,7 +636,7 @@
608636 					anatop-enable-bit = <0>;
609637 				};
610638 
611
-				regulator-3p0 {
639
+				reg_vdd3p0: regulator-3p0 {
612640 					compatible = "fsl,anatop-regulator";
613641 					regulator-name = "vdd3p0";
614642 					regulator-min-microvolt = <2800000>;
....@@ -623,7 +651,7 @@
623651 					anatop-enable-bit = <0>;
624652 				};
625653 
626
-				regulator-2p5 {
654
+				reg_vdd2p5: regulator-2p5 {
627655 					compatible = "fsl,anatop-regulator";
628656 					regulator-name = "vdd2p5";
629657 					regulator-min-microvolt = <2250000>;
....@@ -687,6 +715,16 @@
687715 					anatop-min-voltage = <725000>;
688716 					anatop-max-voltage = <1450000>;
689717 				};
718
+
719
+				tempmon: tempmon {
720
+					compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
721
+					interrupt-parent = <&gpc>;
722
+					interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
723
+					fsl,tempmon = <&anatop>;
724
+					nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
725
+					nvmem-cell-names = "calib", "temp_grade";
726
+					clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
727
+				};
690728 			};
691729 
692730 			usbphy1: usbphy@20c9000 {
....@@ -731,6 +769,7 @@
731769 					interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
732770 					linux,keycode = <KEY_POWER>;
733771 					wakeup-source;
772
+					status = "disabled";
734773 				};
735774 			};
736775 
....@@ -744,7 +783,7 @@
744783 				interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
745784 			};
746785 
747
-			src: src@20d8000 {
786
+			src: reset-controller@20d8000 {
748787 				compatible = "fsl,imx6sx-src", "fsl,imx51-src";
749788 				reg = <0x020d8000 0x4000>;
750789 				interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>,
....@@ -778,6 +817,18 @@
778817 						clocks = <&clks IMX6SX_CLK_GPU>;
779818 					};
780819 
820
+					pd_disp: power-domain@2 {
821
+						reg = <2>;
822
+						#power-domain-cells = <0>;
823
+						clocks = <&clks IMX6SX_CLK_PXP_AXI>,
824
+							 <&clks IMX6SX_CLK_DISPLAY_AXI>,
825
+							 <&clks IMX6SX_CLK_LCDIF1_PIX>,
826
+							 <&clks IMX6SX_CLK_LCDIF_APB>,
827
+							 <&clks IMX6SX_CLK_LCDIF2_PIX>,
828
+							 <&clks IMX6SX_CLK_CSI>,
829
+							 <&clks IMX6SX_CLK_VADC>;
830
+					};
831
+
781832 					pd_pci: power-domain@3 {
782833 						reg = <3>;
783834 						#power-domain-cells = <0>;
....@@ -786,7 +837,7 @@
786837 				};
787838 			};
788839 
789
-			iomuxc: iomuxc@20e0000 {
840
+			iomuxc: pinctrl@20e0000 {
790841 				compatible = "fsl,imx6sx-iomuxc";
791842 				reg = <0x020e0000 0x4000>;
792843 			};
....@@ -797,7 +848,7 @@
797848 				reg = <0x020e4000 0x4000>;
798849 			};
799850 
800
-			sdma: sdma@20ec000 {
851
+			sdma: dma-controller@20ec000 {
801852 				compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma";
802853 				reg = <0x020ec000 0x4000>;
803854 				interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
....@@ -810,14 +861,14 @@
810861 			};
811862 		};
812863 
813
-		aips2: aips-bus@2100000 {
864
+		aips2: bus@2100000 {
814865 			compatible = "fsl,aips-bus", "simple-bus";
815866 			#address-cells = <1>;
816867 			#size-cells = <1>;
817868 			reg = <0x02100000 0x100000>;
818869 			ranges;
819870 
820
-			crypto: caam@2100000 {
871
+			crypto: crypto@2100000 {
821872 				compatible = "fsl,sec-v4.0";
822873 				#address-cells = <1>;
823874 				#size-cells = <1>;
....@@ -830,13 +881,13 @@
830881 					 <&clks IMX6SX_CLK_EIM_SLOW>;
831882 				clock-names = "mem", "aclk", "ipg", "emi_slow";
832883 
833
-				sec_jr0: jr0@1000 {
884
+				sec_jr0: jr@1000 {
834885 					compatible = "fsl,sec-v4.0-job-ring";
835886 					reg = <0x1000 0x1000>;
836887 					interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
837888 				};
838889 
839
-				sec_jr1: jr1@2000 {
890
+				sec_jr1: jr@2000 {
840891 					compatible = "fsl,sec-v4.0-job-ring";
841892 					reg = <0x2000 0x1000>;
842893 					interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
....@@ -875,6 +926,7 @@
875926 				reg = <0x02184400 0x200>;
876927 				interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
877928 				clocks = <&clks IMX6SX_CLK_USBOH3>;
929
+				fsl,usbphy = <&usbphynop1>;
878930 				fsl,usbmisc = <&usbmisc 2>;
879931 				phy_type = "hsic";
880932 				fsl,anatop = <&anatop>;
....@@ -905,8 +957,9 @@
905957 					 <&clks IMX6SX_CLK_ENET_PTP>;
906958 				clock-names = "ipg", "ahb", "ptp",
907959 					      "enet_clk_ref", "enet_out";
908
-				fsl,num-tx-queues=<3>;
909
-				fsl,num-rx-queues=<3>;
960
+				fsl,num-tx-queues = <3>;
961
+				fsl,num-rx-queues = <3>;
962
+				fsl,stop-mode = <&gpr 0x10 3>;
910963 				status = "disabled";
911964 			};
912965 
....@@ -919,7 +972,7 @@
919972 				status = "disabled";
920973 			};
921974 
922
-			usdhc1: usdhc@2190000 {
975
+			usdhc1: mmc@2190000 {
923976 				compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
924977 				reg = <0x02190000 0x4000>;
925978 				interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
....@@ -931,7 +984,7 @@
931984 				status = "disabled";
932985 			};
933986 
934
-			usdhc2: usdhc@2194000 {
987
+			usdhc2: mmc@2194000 {
935988 				compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
936989 				reg = <0x02194000 0x4000>;
937990 				interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
....@@ -943,7 +996,7 @@
943996 				status = "disabled";
944997 			};
945998 
946
-			usdhc3: usdhc@2198000 {
999
+			usdhc3: mmc@2198000 {
9471000 				compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
9481001 				reg = <0x02198000 0x4000>;
9491002 				interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
....@@ -955,7 +1008,7 @@
9551008 				status = "disabled";
9561009 			};
9571010 
958
-			usdhc4: usdhc@219c000 {
1011
+			usdhc4: mmc@219c000 {
9591012 				compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
9601013 				reg = <0x0219c000 0x4000>;
9611014 				interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
....@@ -997,9 +1050,10 @@
9971050 				status = "disabled";
9981051 			};
9991052 
1000
-			mmdc: mmdc@21b0000 {
1053
+			memory-controller@21b0000 {
10011054 				compatible = "fsl,imx6sx-mmdc", "fsl,imx6q-mmdc";
10021055 				reg = <0x021b0000 0x4000>;
1056
+				clocks = <&clks IMX6SX_CLK_MMDC_P0_IPG>;
10031057 			};
10041058 
10051059 			fec2: ethernet@21b4000 {
....@@ -1015,6 +1069,7 @@
10151069 					 <&clks IMX6SX_CLK_ENET_PTP>;
10161070 				clock-names = "ipg", "ahb", "ptp",
10171071 					      "enet_clk_ref", "enet_out";
1072
+				fsl,stop-mode = <&gpr 0x10 4>;
10181073 				status = "disabled";
10191074 			};
10201075 
....@@ -1029,12 +1084,16 @@
10291084 				status = "disabled";
10301085 			};
10311086 
1032
-			ocotp: ocotp@21bc000 {
1087
+			ocotp: efuse@21bc000 {
10331088 				#address-cells = <1>;
10341089 				#size-cells = <1>;
10351090 				compatible = "fsl,imx6sx-ocotp", "syscon";
10361091 				reg = <0x021bc000 0x4000>;
10371092 				clocks = <&clks IMX6SX_CLK_OCOTP>;
1093
+
1094
+				cpu_speed_grade: speed-grade@10 {
1095
+					reg = <0x10 4>;
1096
+				};
10381097 
10391098 				tempmon_calib: calib@38 {
10401099 					reg = <0x38 4>;
....@@ -1077,7 +1136,7 @@
10771136 				status = "disabled";
10781137 			};
10791138 
1080
-			qspi1: qspi@21e0000 {
1139
+			qspi1: spi@21e0000 {
10811140 				#address-cells = <1>;
10821141 				#size-cells = <0>;
10831142 				compatible = "fsl,imx6sx-qspi";
....@@ -1090,7 +1149,7 @@
10901149 				status = "disabled";
10911150 			};
10921151 
1093
-			qspi2: qspi@21e4000 {
1152
+			qspi2: spi@21e4000 {
10941153 				#address-cells = <1>;
10951154 				#size-cells = <0>;
10961155 				compatible = "fsl,imx6sx-qspi";
....@@ -1166,7 +1225,7 @@
11661225 			};
11671226 		};
11681227 
1169
-		aips3: aips-bus@2200000 {
1228
+		aips3: bus@2200000 {
11701229 			compatible = "fsl,aips-bus", "simple-bus";
11711230 			#address-cells = <1>;
11721231 			#size-cells = <1>;
....@@ -1191,11 +1250,12 @@
11911250 				};
11921251 
11931252 				pxp: pxp@2218000 {
1253
+					compatible = "fsl,imx6sx-pxp", "fsl,imx6ull-pxp";
11941254 					reg = <0x02218000 0x4000>;
11951255 					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";
1256
+					clocks = <&clks IMX6SX_CLK_PXP_AXI>;
1257
+					clock-names = "axi";
1258
+					power-domains = <&pd_disp>;
11991259 					status = "disabled";
12001260 				};
12011261 
....@@ -1217,6 +1277,7 @@
12171277 						 <&clks IMX6SX_CLK_LCDIF_APB>,
12181278 						 <&clks IMX6SX_CLK_DISPLAY_AXI>;
12191279 					clock-names = "pix", "axi", "disp_axi";
1280
+					power-domains = <&pd_disp>;
12201281 					status = "disabled";
12211282 				};
12221283 
....@@ -1228,6 +1289,7 @@
12281289 						 <&clks IMX6SX_CLK_LCDIF_APB>,
12291290 						 <&clks IMX6SX_CLK_DISPLAY_AXI>;
12301291 					clock-names = "pix", "axi", "disp_axi";
1292
+					power-domains = <&pd_disp>;
12311293 					status = "disabled";
12321294 				};
12331295 
....@@ -1237,6 +1299,7 @@
12371299 					clocks = <&clks IMX6SX_CLK_VADC>,
12381300 						 <&clks IMX6SX_CLK_CSI>;
12391301 					clock-names = "vadc", "csi";
1302
+					power-domains = <&pd_disp>;
12401303 					status = "disabled";
12411304 				};
12421305 			};
....@@ -1263,15 +1326,15 @@
12631326 				status = "disabled";
12641327 			};
12651328 
1266
-			wdog3: wdog@2288000 {
1329
+			wdog3: watchdog@2288000 {
12671330 				compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
12681331 				reg = <0x02288000 0x4000>;
12691332 				interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
1270
-				clocks = <&clks IMX6SX_CLK_DUMMY>;
1333
+				clocks = <&clks IMX6SX_CLK_IPG>;
12711334 				status = "disabled";
12721335 			};
12731336 
1274
-			ecspi5: ecspi@228c000 {
1337
+			ecspi5: spi@228c000 {
12751338 				#address-cells = <1>;
12761339 				#size-cells = <0>;
12771340 				compatible = "fsl,imx6sx-ecspi", "fsl,imx51-ecspi";
....@@ -1303,7 +1366,7 @@
13031366 				clocks = <&clks IMX6SX_CLK_PWM5>,
13041367 					 <&clks IMX6SX_CLK_PWM5>;
13051368 				clock-names = "ipg", "per";
1306
-				#pwm-cells = <2>;
1369
+				#pwm-cells = <3>;
13071370 			};
13081371 
13091372 			pwm6: pwm@22a8000 {
....@@ -1313,7 +1376,7 @@
13131376 				clocks = <&clks IMX6SX_CLK_PWM6>,
13141377 					 <&clks IMX6SX_CLK_PWM6>;
13151378 				clock-names = "ipg", "per";
1316
-				#pwm-cells = <2>;
1379
+				#pwm-cells = <3>;
13171380 			};
13181381 
13191382 			pwm7: pwm@22ac000 {
....@@ -1323,7 +1386,7 @@
13231386 				clocks = <&clks IMX6SX_CLK_PWM7>,
13241387 					 <&clks IMX6SX_CLK_PWM7>;
13251388 				clock-names = "ipg", "per";
1326
-				#pwm-cells = <2>;
1389
+				#pwm-cells = <3>;
13271390 			};
13281391 
13291392 			pwm8: pwm@22b0000 {
....@@ -1333,7 +1396,7 @@
13331396 				clocks = <&clks IMX6SX_CLK_PWM8>,
13341397 					 <&clks IMX6SX_CLK_PWM8>;
13351398 				clock-names = "ipg", "per";
1336
-				#pwm-cells = <2>;
1399
+				#pwm-cells = <3>;
13371400 			};
13381401 		};
13391402 
....@@ -1361,7 +1424,8 @@
13611424 				 <&clks IMX6SX_CLK_PCIE_REF_125M>,
13621425 				 <&clks IMX6SX_CLK_DISPLAY_AXI>;
13631426 			clock-names = "pcie", "pcie_bus", "pcie_phy", "pcie_inbound_axi";
1364
-			power-domains = <&pd_pci>;
1427
+			power-domains = <&pd_disp>, <&pd_pci>;
1428
+			power-domain-names = "pcie", "pcie_phy";
13651429 			status = "disabled";
13661430 		};
13671431 	};