forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-16 50a212ec906f7524620675f0c57357691c26c81f 
 kernel/arch/arm/boot/dts/imx6qdl.dtsi
....@@ -4,6 +4,7 @@
44 // Copyright 2011 Linaro Ltd.
55 
66 #include <dt-bindings/clock/imx6qdl-clock.h>
7
+#include <dt-bindings/input/input.h>
78 #include <dt-bindings/interrupt-controller/arm-gic.h>
89 
910 / {
....@@ -13,10 +14,8 @@
1314 	 * The decompressor and also some bootloaders rely on a
1415 	 * pre-existing /chosen node to be available to insert the
1516 	 * command line and merge other ATAGS info.
16
-	 * Also for U-Boot there must be a pre-existing /memory node.
1717 	 */
1818 	chosen {};
19
-	memory { device_type = "memory"; };
2019 
2120 	aliases {
2221 		ethernet0 = &fec;
....@@ -46,6 +45,10 @@
4645 		spi1 = &ecspi2;
4746 		spi2 = &ecspi3;
4847 		spi3 = &ecspi4;
48
+		usb0 = &usbotg;
49
+		usb1 = &usbh1;
50
+		usb2 = &usbh2;
51
+		usb3 = &usbh3;
4952 		usbphy0 = &usbphy1;
5053 		usbphy1 = &usbphy2;
5154 	};
....@@ -68,15 +71,6 @@
6871 			#clock-cells = <0>;
6972 			clock-frequency = <24000000>;
7073 		};
71
-	};
72
-
73
-	tempmon: tempmon {
74
-		compatible = "fsl,imx6q-tempmon";
75
-		interrupt-parent = <&gpc>;
76
-		interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>;
77
-		fsl,tempmon = <&anatop>;
78
-		fsl,tempmon-data = <&ocotp>;
79
-		clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
8074 	};
8175 
8276 	ldb: ldb {
....@@ -139,6 +133,16 @@
139133 		interrupts = <0 94 IRQ_TYPE_LEVEL_HIGH>;
140134 	};
141135 
136
+	usbphynop1: usbphynop1 {
137
+		compatible = "usb-nop-xceiv";
138
+		#phy-cells = <0>;
139
+	};
140
+
141
+	usbphynop2: usbphynop2 {
142
+		compatible = "usb-nop-xceiv";
143
+		#phy-cells = <0>;
144
+	};
145
+
142146 	soc {
143147 		#address-cells = <1>;
144148 		#size-cells = <1>;
....@@ -146,7 +150,7 @@
146150 		interrupt-parent = <&gpc>;
147151 		ranges;
148152 
149
-		dma_apbh: dma-apbh@110000 {
153
+		dma_apbh: dma-controller@110000 {
150154 			compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
151155 			reg = <0x00110000 0x2000>;
152156 			interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,
....@@ -159,10 +163,8 @@
159163 			clocks = <&clks IMX6QDL_CLK_APBH_DMA>;
160164 		};
161165 
162
-		gpmi: gpmi-nand@112000 {
166
+		gpmi: nand-controller@112000 {
163167 			compatible = "fsl,imx6q-gpmi-nand";
164
-			#address-cells = <1>;
165
-			#size-cells = <1>;
166168 			reg = <0x00112000 0x2000>, <0x00114000 0x2000>;
167169 			reg-names = "gpmi-nand", "bch";
168170 			interrupts = <0 15 IRQ_TYPE_LEVEL_HIGH>;
....@@ -216,6 +218,7 @@
216218 				 <&clks IMX6QDL_CLK_GPU3D_SHADER>;
217219 			clock-names = "bus", "core", "shader";
218220 			power-domains = <&pd_pu>;
221
+			#cooling-cells = <2>;
219222 		};
220223 
221224 		gpu_2d: gpu@134000 {
....@@ -226,6 +229,7 @@
226229 				 <&clks IMX6QDL_CLK_GPU2D_CORE>;
227230 			clock-names = "bus", "core";
228231 			power-domains = <&pd_pu>;
232
+			#cooling-cells = <2>;
229233 		};
230234 
231235 		timer@a00600 {
....@@ -245,7 +249,7 @@
245249 			interrupt-parent = <&intc>;
246250 		};
247251 
248
-		L2: l2-cache@a02000 {
252
+		L2: cache-controller@a02000 {
249253 			compatible = "arm,pl310-cache";
250254 			reg = <0x00a02000 0x1000>;
251255 			interrupts = <0 92 IRQ_TYPE_LEVEL_HIGH>;
....@@ -268,6 +272,7 @@
268272 			ranges = <0x81000000 0 0          0x01f80000 0 0x00010000 /* downstream I/O */
269273 				  0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */
270274 			num-lanes = <1>;
275
+			num-viewport = <4>;
271276 			interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
272277 			interrupt-names = "msi";
273278 			#interrupt-cells = <1>;
....@@ -283,7 +288,7 @@
283288 			status = "disabled";
284289 		};
285290 
286
-		aips-bus@2000000 { /* AIPS1 */
291
+		bus@2000000 { /* AIPS1 */
287292 			compatible = "fsl,aips-bus", "simple-bus";
288293 			#address-cells = <1>;
289294 			#size-cells = <1>;
....@@ -317,7 +322,7 @@
317322 					status = "disabled";
318323 				};
319324 
320
-				ecspi1: ecspi@2008000 {
325
+				ecspi1: spi@2008000 {
321326 					#address-cells = <1>;
322327 					#size-cells = <0>;
323328 					compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
....@@ -331,7 +336,7 @@
331336 					status = "disabled";
332337 				};
333338 
334
-				ecspi2: ecspi@200c000 {
339
+				ecspi2: spi@200c000 {
335340 					#address-cells = <1>;
336341 					#size-cells = <0>;
337342 					compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
....@@ -345,7 +350,7 @@
345350 					status = "disabled";
346351 				};
347352 
348
-				ecspi3: ecspi@2010000 {
353
+				ecspi3: spi@2010000 {
349354 					#address-cells = <1>;
350355 					#size-cells = <0>;
351356 					compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
....@@ -359,7 +364,7 @@
359364 					status = "disabled";
360365 				};
361366 
362
-				ecspi4: ecspi@2014000 {
367
+				ecspi4: spi@2014000 {
363368 					#address-cells = <1>;
364369 					#size-cells = <0>;
365370 					compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi";
....@@ -498,7 +503,7 @@
498503 			};
499504 
500505 			pwm1: pwm@2080000 {
501
-				#pwm-cells = <2>;
506
+				#pwm-cells = <3>;
502507 				compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
503508 				reg = <0x02080000 0x4000>;
504509 				interrupts = <0 83 IRQ_TYPE_LEVEL_HIGH>;
....@@ -509,7 +514,7 @@
509514 			};
510515 
511516 			pwm2: pwm@2084000 {
512
-				#pwm-cells = <2>;
517
+				#pwm-cells = <3>;
513518 				compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
514519 				reg = <0x02084000 0x4000>;
515520 				interrupts = <0 84 IRQ_TYPE_LEVEL_HIGH>;
....@@ -520,7 +525,7 @@
520525 			};
521526 
522527 			pwm3: pwm@2088000 {
523
-				#pwm-cells = <2>;
528
+				#pwm-cells = <3>;
524529 				compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
525530 				reg = <0x02088000 0x4000>;
526531 				interrupts = <0 85 IRQ_TYPE_LEVEL_HIGH>;
....@@ -531,7 +536,7 @@
531536 			};
532537 
533538 			pwm4: pwm@208c000 {
534
-				#pwm-cells = <2>;
539
+				#pwm-cells = <3>;
535540 				compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm";
536541 				reg = <0x0208c000 0x4000>;
537542 				interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
....@@ -548,6 +553,7 @@
548553 				clocks = <&clks IMX6QDL_CLK_CAN1_IPG>,
549554 					 <&clks IMX6QDL_CLK_CAN1_SERIAL>;
550555 				clock-names = "ipg", "per";
556
+				fsl,stop-mode = <&gpr 0x34 28 0x10 17>;
551557 				status = "disabled";
552558 			};
553559 
....@@ -558,10 +564,11 @@
558564 				clocks = <&clks IMX6QDL_CLK_CAN2_IPG>,
559565 					 <&clks IMX6QDL_CLK_CAN2_SERIAL>;
560566 				clock-names = "ipg", "per";
567
+				fsl,stop-mode = <&gpr 0x34 29 0x10 18>;
561568 				status = "disabled";
562569 			};
563570 
564
-			gpt: gpt@2098000 {
571
+			gpt: timer@2098000 {
565572 				compatible = "fsl,imx6q-gpt", "fsl,imx31-gpt";
566573 				reg = <0x02098000 0x4000>;
567574 				interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
....@@ -648,7 +655,7 @@
648655 				#interrupt-cells = <2>;
649656 			};
650657 
651
-			kpp: kpp@20b8000 {
658
+			kpp: keypad@20b8000 {
652659 				compatible = "fsl,imx6q-kpp", "fsl,imx21-kpp";
653660 				reg = <0x020b8000 0x4000>;
654661 				interrupts = <0 82 IRQ_TYPE_LEVEL_HIGH>;
....@@ -656,22 +663,22 @@
656663 				status = "disabled";
657664 			};
658665 
659
-			wdog1: wdog@20bc000 {
666
+			wdog1: watchdog@20bc000 {
660667 				compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt";
661668 				reg = <0x020bc000 0x4000>;
662669 				interrupts = <0 80 IRQ_TYPE_LEVEL_HIGH>;
663
-				clocks = <&clks IMX6QDL_CLK_DUMMY>;
670
+				clocks = <&clks IMX6QDL_CLK_IPG>;
664671 			};
665672 
666
-			wdog2: wdog@20c0000 {
673
+			wdog2: watchdog@20c0000 {
667674 				compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt";
668675 				reg = <0x020c0000 0x4000>;
669676 				interrupts = <0 81 IRQ_TYPE_LEVEL_HIGH>;
670
-				clocks = <&clks IMX6QDL_CLK_DUMMY>;
677
+				clocks = <&clks IMX6QDL_CLK_IPG>;
671678 				status = "disabled";
672679 			};
673680 
674
-			clks: ccm@20c4000 {
681
+			clks: clock-controller@20c4000 {
675682 				compatible = "fsl,imx6q-ccm";
676683 				reg = <0x020c4000 0x4000>;
677684 				interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>,
....@@ -680,7 +687,7 @@
680687 			};
681688 
682689 			anatop: anatop@20c8000 {
683
-				compatible = "fsl,imx6q-anatop", "syscon", "simple-bus";
690
+				compatible = "fsl,imx6q-anatop", "syscon", "simple-mfd";
684691 				reg = <0x020c8000 0x1000>;
685692 				interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>,
686693 					     <0 54 IRQ_TYPE_LEVEL_HIGH>,
....@@ -753,7 +760,7 @@
753760 					regulator-name = "vddpu";
754761 					regulator-min-microvolt = <725000>;
755762 					regulator-max-microvolt = <1450000>;
756
-					regulator-enable-ramp-delay = <150>;
763
+					regulator-enable-ramp-delay = <380>;
757764 					anatop-reg-offset = <0x140>;
758765 					anatop-vol-bit-shift = <9>;
759766 					anatop-vol-bit-width = <5>;
....@@ -780,6 +787,17 @@
780787 					anatop-min-bit-val = <1>;
781788 					anatop-min-voltage = <725000>;
782789 					anatop-max-voltage = <1450000>;
790
+				};
791
+
792
+				tempmon: tempmon {
793
+					compatible = "fsl,imx6q-tempmon";
794
+					interrupt-parent = <&gpc>;
795
+					interrupts = <0 49 IRQ_TYPE_LEVEL_HIGH>;
796
+					fsl,tempmon = <&anatop>;
797
+					nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
798
+					nvmem-cell-names = "calib", "temp_grade";
799
+					clocks = <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
800
+					#thermal-sensor-cells = <0>;
783801 				};
784802 			};
785803 
....@@ -820,6 +838,15 @@
820838 					status = "disabled";
821839 				};
822840 
841
+				snvs_pwrkey: snvs-powerkey {
842
+					compatible = "fsl,sec-v4.0-pwrkey";
843
+					regmap = <&snvs>;
844
+					interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>;
845
+					linux,keycode = <KEY_POWER>;
846
+					wakeup-source;
847
+					status = "disabled";
848
+				};
849
+
823850 				snvs_lpgpr: snvs-lpgpr {
824851 					compatible = "fsl,imx6q-snvs-lpgpr";
825852 				};
....@@ -835,7 +862,7 @@
835862 				interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>;
836863 			};
837864 
838
-			src: src@20d8000 {
865
+			src: reset-controller@20d8000 {
839866 				compatible = "fsl,imx6q-src", "fsl,imx51-src";
840867 				reg = <0x020d8000 0x4000>;
841868 				interrupts = <0 91 IRQ_TYPE_LEVEL_HIGH>,
....@@ -848,8 +875,7 @@
848875 				reg = <0x020dc000 0x4000>;
849876 				interrupt-controller;
850877 				#interrupt-cells = <3>;
851
-				interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>,
852
-					     <0 90 IRQ_TYPE_LEVEL_HIGH>;
878
+				interrupts = <0 89 IRQ_TYPE_LEVEL_HIGH>;
853879 				interrupt-parent = <&intc>;
854880 				clocks = <&clks IMX6QDL_CLK_IPG>;
855881 				clock-names = "ipg";
....@@ -886,7 +912,7 @@
886912 				};
887913 			};
888914 
889
-			iomuxc: iomuxc@20e0000 {
915
+			iomuxc: pinctrl@20e0000 {
890916 				compatible = "fsl,imx6dl-iomuxc", "fsl,imx6q-iomuxc";
891917 				reg = <0x20e0000 0x4000>;
892918 			};
....@@ -901,7 +927,7 @@
901927 				interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
902928 			};
903929 
904
-			sdma: sdma@20ec000 {
930
+			sdma: dma-controller@20ec000 {
905931 				compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma";
906932 				reg = <0x020ec000 0x4000>;
907933 				interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;
....@@ -913,14 +939,14 @@
913939 			};
914940 		};
915941 
916
-		aips-bus@2100000 { /* AIPS2 */
942
+		bus@2100000 { /* AIPS2 */
917943 			compatible = "fsl,aips-bus", "simple-bus";
918944 			#address-cells = <1>;
919945 			#size-cells = <1>;
920946 			reg = <0x02100000 0x100000>;
921947 			ranges;
922948 
923
-			crypto: caam@2100000 {
949
+			crypto: crypto@2100000 {
924950 				compatible = "fsl,sec-v4.0";
925951 				#address-cells = <1>;
926952 				#size-cells = <1>;
....@@ -932,13 +958,13 @@
932958 					 <&clks IMX6QDL_CLK_EIM_SLOW>;
933959 				clock-names = "mem", "aclk", "ipg", "emi_slow";
934960 
935
-				sec_jr0: jr0@1000 {
961
+				sec_jr0: jr@1000 {
936962 					compatible = "fsl,sec-v4.0-job-ring";
937963 					reg = <0x1000 0x1000>;
938964 					interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
939965 				};
940966 
941
-				sec_jr1: jr1@2000 {
967
+				sec_jr1: jr@2000 {
942968 					compatible = "fsl,sec-v4.0-job-ring";
943969 					reg = <0x2000 0x1000>;
944970 					interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
....@@ -981,6 +1007,8 @@
9811007 				reg = <0x02184400 0x200>;
9821008 				interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>;
9831009 				clocks = <&clks IMX6QDL_CLK_USBOH3>;
1010
+				fsl,usbphy = <&usbphynop1>;
1011
+				phy_type = "hsic";
9841012 				fsl,usbmisc = <&usbmisc 2>;
9851013 				dr_mode = "host";
9861014 				ahb-burst-config = <0x0>;
....@@ -994,6 +1022,8 @@
9941022 				reg = <0x02184600 0x200>;
9951023 				interrupts = <0 42 IRQ_TYPE_LEVEL_HIGH>;
9961024 				clocks = <&clks IMX6QDL_CLK_USBOH3>;
1025
+				fsl,usbphy = <&usbphynop2>;
1026
+				phy_type = "hsic";
9971027 				fsl,usbmisc = <&usbmisc 3>;
9981028 				dr_mode = "host";
9991029 				ahb-burst-config = <0x0>;
....@@ -1017,8 +1047,10 @@
10171047 					     <0 119 IRQ_TYPE_LEVEL_HIGH>;
10181048 				clocks = <&clks IMX6QDL_CLK_ENET>,
10191049 					 <&clks IMX6QDL_CLK_ENET>,
1050
+					 <&clks IMX6QDL_CLK_ENET_REF>,
10201051 					 <&clks IMX6QDL_CLK_ENET_REF>;
1021
-				clock-names = "ipg", "ahb", "ptp";
1052
+				clock-names = "ipg", "ahb", "ptp", "enet_out";
1053
+				fsl,stop-mode = <&gpr 0x34 27>;
10221054 				status = "disabled";
10231055 			};
10241056 
....@@ -1029,7 +1061,7 @@
10291061 					     <0 126 IRQ_TYPE_LEVEL_HIGH>;
10301062 			};
10311063 
1032
-			usdhc1: usdhc@2190000 {
1064
+			usdhc1: mmc@2190000 {
10331065 				compatible = "fsl,imx6q-usdhc";
10341066 				reg = <0x02190000 0x4000>;
10351067 				interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
....@@ -1041,7 +1073,7 @@
10411073 				status = "disabled";
10421074 			};
10431075 
1044
-			usdhc2: usdhc@2194000 {
1076
+			usdhc2: mmc@2194000 {
10451077 				compatible = "fsl,imx6q-usdhc";
10461078 				reg = <0x02194000 0x4000>;
10471079 				interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
....@@ -1053,7 +1085,7 @@
10531085 				status = "disabled";
10541086 			};
10551087 
1056
-			usdhc3: usdhc@2198000 {
1088
+			usdhc3: mmc@2198000 {
10571089 				compatible = "fsl,imx6q-usdhc";
10581090 				reg = <0x02198000 0x4000>;
10591091 				interrupts = <0 24 IRQ_TYPE_LEVEL_HIGH>;
....@@ -1065,7 +1097,7 @@
10651097 				status = "disabled";
10661098 			};
10671099 
1068
-			usdhc4: usdhc@219c000 {
1100
+			usdhc4: mmc@219c000 {
10691101 				compatible = "fsl,imx6q-usdhc";
10701102 				reg = <0x0219c000 0x4000>;
10711103 				interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
....@@ -1111,13 +1143,16 @@
11111143 				reg = <0x021ac000 0x4000>;
11121144 			};
11131145 
1114
-			mmdc0: mmdc@21b0000 { /* MMDC0 */
1146
+			mmdc0: memory-controller@21b0000 { /* MMDC0 */
11151147 				compatible = "fsl,imx6q-mmdc";
11161148 				reg = <0x021b0000 0x4000>;
1149
+				clocks = <&clks IMX6QDL_CLK_MMDC_P0_IPG>;
11171150 			};
11181151 
1119
-			mmdc1: mmdc@21b4000 { /* MMDC1 */
1152
+			mmdc1: memory-controller@21b4000 { /* MMDC1 */
1153
+				compatible = "fsl,imx6q-mmdc";
11201154 				reg = <0x021b4000 0x4000>;
1155
+				status = "disabled";
11211156 			};
11221157 
11231158 			weim: weim@21b8000 {
....@@ -1131,10 +1166,24 @@
11311166 				status = "disabled";
11321167 			};
11331168 
1134
-			ocotp: ocotp@21bc000 {
1169
+			ocotp: efuse@21bc000 {
11351170 				compatible = "fsl,imx6q-ocotp", "syscon";
11361171 				reg = <0x021bc000 0x4000>;
11371172 				clocks = <&clks IMX6QDL_CLK_IIM>;
1173
+				#address-cells = <1>;
1174
+				#size-cells = <1>;
1175
+
1176
+				cpu_speed_grade: speed-grade@10 {
1177
+					reg = <0x10 4>;
1178
+				};
1179
+
1180
+				tempmon_calib: calib@38 {
1181
+					reg = <0x38 4>;
1182
+				};
1183
+
1184
+				tempmon_temp_grade: temp-grade@20 {
1185
+					reg = <0x20 4>;
1186
+				};
11381187 			};
11391188 
11401189 			tzasc@21d0000 { /* TZASC1 */