forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353 
 kernel/arch/arm/boot/dts/rv1126.dtsi
....@@ -24,7 +24,6 @@
2424 	interrupt-parent = <&gic>;
2525 
2626 	aliases {
27
-		ethernet0 = &gmac;
2827 		i2c0 = &i2c0;
2928 		i2c1 = &i2c1;
3029 		i2c2 = &i2c2;
....@@ -126,15 +125,16 @@
126125 		clocks = <&cru PLL_APLL>;
127126 		rockchip,bin-scaling-sel = <
128127 			0	5
129
-			1	18
128
+			1	9
130129 		>;
131130 		rockchip,bin-voltage-sel = <
132131 			1	0
133132 		>;
134133 		rockchip,pvtm-voltage-sel = <
135
-			0        106000   1
136
-			106001   112000   2
137
-			112001   999999   3
134
+			0        100500   1
135
+			100501   104500   2
136
+			104501   109500   3
137
+			109501   999999   4
138138 		>;
139139 		rockchip,pvtm-freq = <408000>;
140140 		rockchip,pvtm-volt = <800000>;
....@@ -172,6 +172,7 @@
172172 			opp-microvolt-L1 = <775000 775000 1000000>;
173173 			opp-microvolt-L2 = <775000 775000 1000000>;
174174 			opp-microvolt-L3 = <750000 750000 1000000>;
175
+			opp-microvolt-L4 = <725000 725000 1000000>;
175176 			clock-latency-ns = <40000>;
176177 		};
177178 		opp-1200000000 {
....@@ -181,22 +182,27 @@
181182 			opp-microvolt-L1 = <850000 850000 1000000>;
182183 			opp-microvolt-L2 = <850000 850000 1000000>;
183184 			opp-microvolt-L3 = <825000 825000 1000000>;
185
+			opp-microvolt-L4 = <800000 800000 1000000>;
184186 			clock-latency-ns = <40000>;
185187 		};
186188 		opp-1296000000 {
187189 			opp-hz = /bits/ 64 <1296000000>;
188190 			opp-microvolt = <875000 875000 1000000>;
191
+			opp-microvolt-L0 = <925000 925000 1000000>;
189192 			opp-microvolt-L1 = <875000 875000 1000000>;
190193 			opp-microvolt-L2 = <875000 875000 1000000>;
191194 			opp-microvolt-L3 = <850000 850000 1000000>;
195
+			opp-microvolt-L4 = <825000 825000 1000000>;
192196 			clock-latency-ns = <40000>;
193197 		};
194198 		opp-1416000000 {
195199 			opp-hz = /bits/ 64 <1416000000>;
196200 			opp-microvolt = <925000 925000 1000000>;
201
+			opp-microvolt-L0 = <975000 975000 1000000>;
197202 			opp-microvolt-L1 = <925000 925000 1000000>;
198203 			opp-microvolt-L2 = <925000 925000 1000000>;
199204 			opp-microvolt-L3 = <900000 900000 1000000>;
205
+			opp-microvolt-L4 = <875000 875000 1000000>;
200206 			clock-latency-ns = <40000>;
201207 		};
202208 		opp-1512000000 {
....@@ -205,6 +211,7 @@
205211 			opp-microvolt-L1 = <975000 975000 1000000>;
206212 			opp-microvolt-L2 = <950000 950000 1000000>;
207213 			opp-microvolt-L3 = <925000 925000 1000000>;
214
+			opp-microvolt-L4 = <900000 900000 1000000>;
208215 			clock-latency-ns = <40000>;
209216 		};
210217 	};
....@@ -346,6 +353,12 @@
346353 		};
347354 	};
348355 
356
+	mipi_csi2: mipi-csi2 {
357
+		compatible = "rockchip,rv1126-mipi-csi2";
358
+		rockchip,hw = <&mipi_csi2_hw>;
359
+		status = "disabled";
360
+	};
361
+
349362 	mpp_srv: mpp-srv {
350363 		compatible = "rockchip,mpp-service";
351364 		rockchip,taskqueue-count = <4>;
....@@ -390,8 +403,6 @@
390403 			console-size = <0x40000>;
391404 			ftrace-size = <0x00000>;
392405 			pmsg-size = <0x40000>;
393
-			mcu-log-size = <0x40000>;
394
-			mcu-log-count = <0x1>;
395406 			status = "disabled";
396407 		};
397408 	};
....@@ -946,6 +957,7 @@
946957 	pwm0: pwm@ff430000 {
947958 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
948959 		reg = <0xff430000 0x10>;
960
+		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
949961 		#pwm-cells = <3>;
950962 		pinctrl-names = "active";
951963 		pinctrl-0 = <&pwm0m0_pins>;
....@@ -957,6 +969,7 @@
957969 	pwm1: pwm@ff430010 {
958970 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
959971 		reg = <0xff430010 0x10>;
972
+		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
960973 		#pwm-cells = <3>;
961974 		pinctrl-names = "active";
962975 		pinctrl-0 = <&pwm1m0_pins>;
....@@ -968,6 +981,7 @@
968981 	pwm2: pwm@ff430020 {
969982 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
970983 		reg = <0xff430020 0x10>;
984
+		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
971985 		#pwm-cells = <3>;
972986 		pinctrl-names = "active";
973987 		pinctrl-0 = <&pwm2m0_pins>;
....@@ -979,6 +993,8 @@
979993 	pwm3: pwm@ff430030 {
980994 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
981995 		reg = <0xff430030 0x10>;
996
+		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
997
+			     <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
982998 		#pwm-cells = <3>;
983999 		pinctrl-names = "active";
9841000 		pinctrl-0 = <&pwm3m0_pins>;
....@@ -990,6 +1006,7 @@
9901006 	pwm4: pwm@ff440000 {
9911007 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
9921008 		reg = <0xff440000 0x10>;
1009
+		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
9931010 		#pwm-cells = <3>;
9941011 		pinctrl-names = "active";
9951012 		pinctrl-0 = <&pwm4m0_pins>;
....@@ -1001,6 +1018,7 @@
10011018 	pwm5: pwm@ff440010 {
10021019 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
10031020 		reg = <0xff440010 0x10>;
1021
+		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
10041022 		#pwm-cells = <3>;
10051023 		pinctrl-names = "active";
10061024 		pinctrl-0 = <&pwm5m0_pins>;
....@@ -1012,6 +1030,7 @@
10121030 	pwm6: pwm@ff440020 {
10131031 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
10141032 		reg = <0xff440020 0x10>;
1033
+		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
10151034 		#pwm-cells = <3>;
10161035 		pinctrl-names = "active";
10171036 		pinctrl-0 = <&pwm6m0_pins>;
....@@ -1023,6 +1042,8 @@
10231042 	pwm7: pwm@ff440030 {
10241043 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
10251044 		reg = <0xff440030 0x10>;
1045
+		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
1046
+			     <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
10261047 		#pwm-cells = <3>;
10271048 		pinctrl-names = "active";
10281049 		pinctrl-0 = <&pwm7m0_pins>;
....@@ -1163,13 +1184,14 @@
11631184 	};
11641185 
11651186 	mipi_dphy: mipi-dphy@ff4d0000 {
1166
-		compatible = "rockchip,rv1126-mipi-dphy", "rockchip,rk1808-mipi-dphy";
1167
-		reg = <0xff4d0000 0x500>;
1187
+		compatible = "rockchip,rv1126-mipi-dphy", "rockchip,rk3568-video-phy";
1188
+		reg = <0xff4d0000 0x500>, <0xffb30000 0x500>;
1189
+		reg-names = "phy", "host";
11681190 		assigned-clocks = <&pmucru CLK_MIPIDSIPHY_REF>;
11691191 		assigned-clock-rates = <24000000>;
1170
-		clocks = <&pmucru CLK_MIPIDSIPHY_REF>, <&cru PCLK_DSIPHY>;
1171
-		clock-names = "ref", "pclk";
1172
-		clock-output-names = "mipi_dphy_pll";
1192
+		clocks = <&pmucru CLK_MIPIDSIPHY_REF>,
1193
+			 <&cru PCLK_DSIPHY>, <&cru PCLK_DSIHOST>;
1194
+		clock-names = "ref", "pclk", "pclk_host";
11731195 		#clock-cells = <0>;
11741196 		resets = <&cru SRST_DSIPHY_P>;
11751197 		reset-names = "apb";
....@@ -1257,6 +1279,7 @@
12571279 	pwm8: pwm@ff550000 {
12581280 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
12591281 		reg = <0xff550000 0x10>;
1282
+		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
12601283 		#pwm-cells = <3>;
12611284 		pinctrl-names = "active";
12621285 		pinctrl-0 = <&pwm8m0_pins>;
....@@ -1268,6 +1291,7 @@
12681291 	pwm9: pwm@ff550010 {
12691292 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
12701293 		reg = <0xff550010 0x10>;
1294
+		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
12711295 		#pwm-cells = <3>;
12721296 		pinctrl-names = "active";
12731297 		pinctrl-0 = <&pwm9m0_pins>;
....@@ -1279,6 +1303,7 @@
12791303 	pwm10: pwm@ff550020 {
12801304 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
12811305 		reg = <0xff550020 0x10>;
1306
+		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
12821307 		#pwm-cells = <3>;
12831308 		pinctrl-names = "active";
12841309 		pinctrl-0 = <&pwm10m0_pins>;
....@@ -1290,6 +1315,8 @@
12901315 	pwm11: pwm@ff550030 {
12911316 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
12921317 		reg = <0xff550030 0x10>;
1318
+		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
1319
+			     <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
12931320 		#pwm-cells = <3>;
12941321 		pinctrl-names = "active";
12951322 		pinctrl-0 = <&pwm11m0_pins>;
....@@ -1625,7 +1652,7 @@
16251652 	};
16261653 
16271654 	pdm: pdm@ff830000 {
1628
-		compatible = "rockchip,rv1126-pdm";
1655
+		compatible = "rockchip,rv1126-pdm", "rockchip,pdm";
16291656 		reg = <0xff830000 0x1000>;
16301657 		clocks = <&cru MCLK_PDM>, <&cru HCLK_PDM>;
16311658 		clock-names = "pdm_clk", "pdm_hclk";
....@@ -1855,8 +1882,8 @@
18551882 		status = "disabled";
18561883 	};
18571884 
1858
-	mipi_csi2: mipi-csi2@ffb10000 {
1859
-		compatible = "rockchip,rv1126-mipi-csi2";
1885
+	mipi_csi2_hw: mipi-csi2-hw@ffb10000 {
1886
+		compatible = "rockchip,rv1126-mipi-csi2-hw";
18601887 		reg = <0xffb10000 0x10000>;
18611888 		reg-names = "csihost_regs";
18621889 		interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
....@@ -1904,12 +1931,12 @@
19041931 		compatible = "rockchip,rv1126-mipi-dsi";
19051932 		reg = <0xffb30000 0x500>;
19061933 		interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;
1907
-		clocks = <&cru PCLK_DSIHOST>, <&mipi_dphy>;
1908
-		clock-names = "pclk", "hs_clk";
1934
+		clocks = <&cru PCLK_DSIHOST>, <&cru HCLK_PDVO>;
1935
+		clock-names = "pclk", "hclk";
19091936 		resets = <&cru SRST_DSIHOST_P>;
19101937 		reset-names = "apb";
19111938 		phys = <&mipi_dphy>;
1912
-		phy-names = "mipi_dphy";
1939
+		phy-names = "dphy";
19131940 		rockchip,grf = <&grf>;
19141941 		#address-cells = <1>;
19151942 		#size-cells = <0>;
....@@ -2107,7 +2134,7 @@
21072134 	};
21082135 
21092136 	rkvdec: rkvdec@ffb80000 {
2110
-		compatible = "rockchip,rkv-decoder-rv1126", "rockchip,rkv-decoder-v1";
2137
+		compatible = "rockchip,rkv-decoder-v1";
21112138 		reg = <0xffb80000 0x400>;
21122139 		interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
21132140 		interrupt-names = "irq_dec";
....@@ -2231,7 +2258,7 @@
22312258 		clocks = <&pmucru PLL_GPLL>;
22322259 		rockchip,bin-scaling-sel = <
22332260 			0	37
2234
-			1	43
2261
+			1	40
22352262 		>;
22362263 		rockchip,bin-voltage-sel = <
22372264 			1	0
....@@ -2253,6 +2280,7 @@
22532280 		opp-500000000 {
22542281 			opp-hz = /bits/ 64 <500000000>;
22552282 			opp-microvolt = <750000 750000 1000000>;
2283
+			opp-microvolt-L0 = <800000 800000 1000000>;
22562284 		};
22572285 		opp-594000000 {
22582286 			opp-hz = /bits/ 64 <594000000>;
....@@ -2364,8 +2392,9 @@
23642392 		clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
23652393 		fifo-depth = <0x100>;
23662394 		max-frequency = <200000000>;
2367
-		pinctrl-names = "default";
2395
+		pinctrl-names = "normal", "idle";
23682396 		pinctrl-0 = <&sdmmc0_clk &sdmmc0_cmd &sdmmc0_det &sdmmc0_bus4>;
2397
+		pinctrl-1 = <&sdmmc0_idle_pins &sdmmc0_det>;
23692398 		status = "disabled";
23702399 	};
23712400 
....@@ -2397,7 +2426,7 @@
23972426 		status = "disabled";
23982427 	};
23992428 
2400
-	sfc: sfc@ffc90000  {
2429
+	sfc: spi@ffc90000  {
24012430 		compatible = "rockchip,sfc";
24022431 		reg = <0xffc90000 0x4000>;
24032432 		interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
....@@ -2408,6 +2437,8 @@
24082437 		assigned-clocks = <&cru SCLK_SFC>;
24092438 		assigned-clock-rates = <80000000>;
24102439 		power-domains = <&power RV1126_PD_NVM>;
2440
+		#address-cells = <1>;
2441
+		#size-cells = <0>;
24112442 		status = "disabled";
24122443 	};
24132444 
....@@ -2448,9 +2479,9 @@
24482479 			2	0
24492480 		>;
24502481 		rockchip,pvtm-voltage-sel = <
2451
-			0        112500   1
2452
-			112501   117500   2
2453
-			117501   999999   3
2482
+			0        108500   1
2483
+			108501   113500   2
2484
+			113501   999999   3
24542485 		>;
24552486 		rockchip,pvtm-freq = <396000>;
24562487 		rockchip,pvtm-volt = <800000>;
....@@ -2465,27 +2496,27 @@
24652496 		opp-200000000 {
24662497 			opp-hz = /bits/ 64 <200000000>;
24672498 			opp-microvolt = <750000 750000 1000000>;
2468
-			opp-microvolt-L0 = <800000 800000 1000000>;
2499
+			opp-microvolt-L0 = <775000 775000 1000000>;
24692500 		};
24702501 		opp-300000000 {
24712502 			opp-hz = /bits/ 64 <300000000>;
24722503 			opp-microvolt = <750000 750000 1000000>;
2473
-			opp-microvolt-L0 = <800000 800000 1000000>;
2504
+			opp-microvolt-L0 = <775000 775000 1000000>;
24742505 		};
24752506 		opp-396000000 {
24762507 			opp-hz = /bits/ 64 <396000000>;
24772508 			opp-microvolt = <750000 750000 1000000>;
2478
-			opp-microvolt-L0 = <800000 800000 1000000>;
2509
+			opp-microvolt-L0 = <775000 775000 1000000>;
24792510 		};
24802511 		opp-500000000 {
24812512 			opp-hz = /bits/ 64 <500000000>;
24822513 			opp-microvolt = <750000 750000 1000000>;
2483
-			opp-microvolt-L0 = <800000 800000 1000000>;
2514
+			opp-microvolt-L0 = <775000 775000 1000000>;
24842515 		};
24852516 		opp-600000000 {
24862517 			opp-hz = /bits/ 64 <600000000>;
24872518 			opp-microvolt = <750000 750000 1000000>;
2488
-			opp-microvolt-L0 = <800000 800000 1000000>;
2519
+			opp-microvolt-L0 = <775000 775000 1000000>;
24892520 		};
24902521 		opp-700000000 {
24912522 			opp-hz = /bits/ 64 <700000000>;
....@@ -2538,7 +2569,8 @@
25382569 			snps,dis-del-phy-power-chg-quirk;
25392570 			snps,tx-ipgap-linecheck-dis-quirk;
25402571 			snps,tx-fifo-resize;
2541
-			snps,xhci-trb-ent-quirk;
2572
+			snps,usb2-lpm-disable;
2573
+			snps,parkmode-disable-hs-quirk;
25422574 			status = "disabled";
25432575 		};
25442576 	};