forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf 
 kernel/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
....@@ -337,6 +337,7 @@
337337 			clock-output-names = "i2s0_mclkout_to_io";
338338 			rockchip,bit-shift = <0>;
339339 			rockchip,bit-set-to-disable;
340
+			rockchip,clk-ignore-unused; /* for OLD SDK */
340341 		};
341342 
342343 		mclkout_i2s1: mclkout-i2s1@fd58c318 {
....@@ -347,6 +348,7 @@
347348 			clock-output-names = "i2s1_mclkout_to_io";
348349 			rockchip,bit-shift = <1>;
349350 			rockchip,bit-set-to-disable;
351
+			rockchip,clk-ignore-unused; /* for OLD SDK */
350352 		};
351353 
352354 		mclkout_i2s1m1: mclkout-i2s1@fd58a000 {
....@@ -356,6 +358,7 @@
356358 			#clock-cells = <0>;
357359 			clock-output-names = "i2s1m1_mclkout_to_io";
358360 			rockchip,bit-shift = <6>;
361
+			rockchip,clk-ignore-unused; /* for OLD SDK */
359362 		};
360363 
361364 		mclkout_i2s2: mclkout-i2s2@fd58c318 {
....@@ -366,6 +369,7 @@
366369 			clock-output-names = "i2s2_mclkout_to_io";
367370 			rockchip,bit-shift = <2>;
368371 			rockchip,bit-set-to-disable;
372
+			rockchip,clk-ignore-unused; /* for OLD SDK */
369373 		};
370374 
371375 		mclkout_i2s3: mclkout-i2s3@fd58c318 {
....@@ -376,6 +380,7 @@
376380 			clock-output-names = "i2s3_mclkout_to_io";
377381 			rockchip,bit-shift = <7>;
378382 			rockchip,bit-set-to-disable;
383
+			rockchip,clk-ignore-unused; /* for OLD SDK */
379384 		};
380385 	};
381386 
....@@ -1744,6 +1749,7 @@
17441749 			SYS_STATUS_PERFORMANCE  DMC_FREQ_LEVEL_HIGH
17451750 			SYS_STATUS_DUALVIEW     DMC_FREQ_LEVEL_HIGH
17461751 			SYS_STATUS_HDMIRX       DMC_FREQ_LEVEL_HIGH
1752
+			SYS_STATUS_DEEP_SUSPEND DMC_FREQ_LEVEL_HIGH
17471753 		>;
17481754 		auto-freq-en = <1>;
17491755 		status = "disabled";
....@@ -2163,6 +2169,11 @@
21632169 		status = "disabled";
21642170 	};
21652171 
2172
+	rkvtunnel: rkvtunnel {
2173
+		compatible = "rockchip,video-tunnel";
2174
+		status = "disabled";
2175
+	};
2176
+
21662177 	rockchip_suspend: rockchip-suspend {
21672178 		compatible = "rockchip,pm-rk3588";
21682179 		status = "disabled";
....@@ -2354,8 +2365,7 @@
23542365 		rockchip,pvtm-temp-prop = <(-135) (-135)>;
23552366 		rockchip,pvtm-thermal-zone = "gpu-thermal";
23562367 
2357
-		clocks = <&cru CLK_GPU>;
2358
-		clock-names = "clk";
2368
+		rockchip,opp-clocks = <&cru CLK_GPU>;
23592369 		rockchip,grf = <&gpu_grf>;
23602370 		volt-mem-read-margin = <
23612371 			855000	1
....@@ -2597,7 +2607,7 @@
25972607 	};
25982608 
25992609 	usb_host0_ohci: usb@fc840000 {
2600
-		compatible = "generic-ohci";
2610
+		compatible = "rockchip,rk3588-ohci", "generic-ohci";
26012611 		reg = <0x0 0xfc840000 0x0 0x40000>;
26022612 		interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
26032613 		clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST_ARB0>, <&u2phy2>, <&aclk_usb>;
....@@ -2622,7 +2632,7 @@
26222632 	};
26232633 
26242634 	usb_host1_ohci: usb@fc8c0000 {
2625
-		compatible = "generic-ohci";
2635
+		compatible = "rockchip,rk3588-ohci", "generic-ohci";
26262636 		reg = <0x0 0xfc8c0000 0x0 0x40000>;
26272637 		interrupts = <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;
26282638 		clocks = <&cru HCLK_HOST1>, <&cru HCLK_HOST_ARB1>, <&u2phy3>, <&aclk_usb>;
....@@ -2706,6 +2716,8 @@
27062716 			mode-panic = <BOOT_PANIC>;
27072717 			mode-watchdog = <BOOT_WATCHDOG>;
27082718 			mode-quiescent = <BOOT_QUIESCENT>;
2719
+			/* add a mode to capture the ramdump through usb */
2720
+			mode-winusb = <BOOT_WINUSB>;
27092721 		};
27102722 	};
27112723 
....@@ -2965,6 +2977,8 @@
29652977 		interrupts = <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>;
29662978 		pinctrl-names = "default";
29672979 		pinctrl-0 = <&i2c0m0_xfer>;
2980
+		resets = <&cru SRST_I2C0>, <&cru SRST_P_I2C0>;
2981
+		reset-names = "i2c", "apb";
29682982 		#address-cells = <1>;
29692983 		#size-cells = <0>;
29702984 		status = "disabled";
....@@ -3443,8 +3457,7 @@
34433457 		rockchip,pvtm-temp-prop = <(-113) (-113)>;
34443458 		rockchip,pvtm-thermal-zone = "npu-thermal";
34453459 
3446
-		clocks = <&cru PCLK_NPU_GRF>;
3447
-		clock-names = "pclk";
3460
+		rockchip,opp-clocks = <&cru PCLK_NPU_GRF>, <&cru HCLK_NPU_ROOT>;
34483461 		rockchip,grf = <&npu_grf>;
34493462 		volt-mem-read-margin = <
34503463 			855000	1
....@@ -5950,6 +5963,8 @@
59505963 		interrupts = <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>;
59515964 		pinctrl-names = "default";
59525965 		pinctrl-0 = <&i2c1m0_xfer>;
5966
+		resets = <&cru SRST_I2C1>, <&cru SRST_P_I2C1>;
5967
+		reset-names = "i2c", "apb";
59535968 		#address-cells = <1>;
59545969 		#size-cells = <0>;
59555970 		status = "disabled";
....@@ -5963,6 +5978,8 @@
59635978 		interrupts = <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>;
59645979 		pinctrl-names = "default";
59655980 		pinctrl-0 = <&i2c2m0_xfer>;
5981
+		resets = <&cru SRST_I2C2>, <&cru SRST_P_I2C2>;
5982
+		reset-names = "i2c", "apb";
59665983 		#address-cells = <1>;
59675984 		#size-cells = <0>;
59685985 		status = "disabled";
....@@ -5976,6 +5993,8 @@
59765993 		interrupts = <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>;
59775994 		pinctrl-names = "default";
59785995 		pinctrl-0 = <&i2c3m0_xfer>;
5996
+		resets = <&cru SRST_I2C3>, <&cru SRST_P_I2C3>;
5997
+		reset-names = "i2c", "apb";
59795998 		#address-cells = <1>;
59805999 		#size-cells = <0>;
59816000 		status = "disabled";
....@@ -5989,6 +6008,8 @@
59896008 		interrupts = <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>;
59906009 		pinctrl-names = "default";
59916010 		pinctrl-0 = <&i2c4m0_xfer>;
6011
+		resets = <&cru SRST_I2C4>, <&cru SRST_P_I2C4>;
6012
+		reset-names = "i2c", "apb";
59926013 		#address-cells = <1>;
59936014 		#size-cells = <0>;
59946015 		status = "disabled";
....@@ -6002,6 +6023,8 @@
60026023 		interrupts = <GIC_SPI 322 IRQ_TYPE_LEVEL_HIGH>;
60036024 		pinctrl-names = "default";
60046025 		pinctrl-0 = <&i2c5m0_xfer>;
6026
+		resets = <&cru SRST_I2C5>, <&cru SRST_P_I2C5>;
6027
+		reset-names = "i2c", "apb";
60056028 		#address-cells = <1>;
60066029 		#size-cells = <0>;
60076030 		status = "disabled";
....@@ -6429,6 +6452,8 @@
64296452 		interrupts = <GIC_SPI 323 IRQ_TYPE_LEVEL_HIGH>;
64306453 		pinctrl-names = "default";
64316454 		pinctrl-0 = <&i2c6m0_xfer>;
6455
+		resets = <&cru SRST_I2C6>, <&cru SRST_P_I2C6>;
6456
+		reset-names = "i2c", "apb";
64326457 		#address-cells = <1>;
64336458 		#size-cells = <0>;
64346459 		status = "disabled";
....@@ -6442,6 +6467,8 @@
64426467 		interrupts = <GIC_SPI 324 IRQ_TYPE_LEVEL_HIGH>;
64436468 		pinctrl-names = "default";
64446469 		pinctrl-0 = <&i2c7m0_xfer>;
6470
+		resets = <&cru SRST_I2C7>, <&cru SRST_P_I2C7>;
6471
+		reset-names = "i2c", "apb";
64456472 		#address-cells = <1>;
64466473 		#size-cells = <0>;
64476474 		status = "disabled";
....@@ -6455,6 +6482,8 @@
64556482 		interrupts = <GIC_SPI 325 IRQ_TYPE_LEVEL_HIGH>;
64566483 		pinctrl-names = "default";
64576484 		pinctrl-0 = <&i2c8m0_xfer>;
6485
+		resets = <&cru SRST_I2C8>, <&cru SRST_P_I2C8>;
6486
+		reset-names = "i2c", "apb";
64586487 		#address-cells = <1>;
64596488 		#size-cells = <0>;
64606489 		status = "disabled";