forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2 
 kernel/arch/arm/boot/dts/rv1126.dtsi
....@@ -353,6 +353,12 @@
353353 		};
354354 	};
355355 
356
+	mipi_csi2: mipi-csi2 {
357
+		compatible = "rockchip,rv1126-mipi-csi2";
358
+		rockchip,hw = <&mipi_csi2_hw>;
359
+		status = "disabled";
360
+	};
361
+
356362 	mpp_srv: mpp-srv {
357363 		compatible = "rockchip,mpp-service";
358364 		rockchip,taskqueue-count = <4>;
....@@ -951,6 +957,7 @@
951957 	pwm0: pwm@ff430000 {
952958 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
953959 		reg = <0xff430000 0x10>;
960
+		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
954961 		#pwm-cells = <3>;
955962 		pinctrl-names = "active";
956963 		pinctrl-0 = <&pwm0m0_pins>;
....@@ -962,6 +969,7 @@
962969 	pwm1: pwm@ff430010 {
963970 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
964971 		reg = <0xff430010 0x10>;
972
+		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
965973 		#pwm-cells = <3>;
966974 		pinctrl-names = "active";
967975 		pinctrl-0 = <&pwm1m0_pins>;
....@@ -973,6 +981,7 @@
973981 	pwm2: pwm@ff430020 {
974982 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
975983 		reg = <0xff430020 0x10>;
984
+		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>;
976985 		#pwm-cells = <3>;
977986 		pinctrl-names = "active";
978987 		pinctrl-0 = <&pwm2m0_pins>;
....@@ -984,6 +993,8 @@
984993 	pwm3: pwm@ff430030 {
985994 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
986995 		reg = <0xff430030 0x10>;
996
+		interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
997
+			     <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
987998 		#pwm-cells = <3>;
988999 		pinctrl-names = "active";
9891000 		pinctrl-0 = <&pwm3m0_pins>;
....@@ -995,6 +1006,7 @@
9951006 	pwm4: pwm@ff440000 {
9961007 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
9971008 		reg = <0xff440000 0x10>;
1009
+		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
9981010 		#pwm-cells = <3>;
9991011 		pinctrl-names = "active";
10001012 		pinctrl-0 = <&pwm4m0_pins>;
....@@ -1006,6 +1018,7 @@
10061018 	pwm5: pwm@ff440010 {
10071019 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
10081020 		reg = <0xff440010 0x10>;
1021
+		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
10091022 		#pwm-cells = <3>;
10101023 		pinctrl-names = "active";
10111024 		pinctrl-0 = <&pwm5m0_pins>;
....@@ -1017,6 +1030,7 @@
10171030 	pwm6: pwm@ff440020 {
10181031 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
10191032 		reg = <0xff440020 0x10>;
1033
+		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
10201034 		#pwm-cells = <3>;
10211035 		pinctrl-names = "active";
10221036 		pinctrl-0 = <&pwm6m0_pins>;
....@@ -1028,6 +1042,8 @@
10281042 	pwm7: pwm@ff440030 {
10291043 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
10301044 		reg = <0xff440030 0x10>;
1045
+		interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
1046
+			     <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
10311047 		#pwm-cells = <3>;
10321048 		pinctrl-names = "active";
10331049 		pinctrl-0 = <&pwm7m0_pins>;
....@@ -1263,6 +1279,7 @@
12631279 	pwm8: pwm@ff550000 {
12641280 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
12651281 		reg = <0xff550000 0x10>;
1282
+		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
12661283 		#pwm-cells = <3>;
12671284 		pinctrl-names = "active";
12681285 		pinctrl-0 = <&pwm8m0_pins>;
....@@ -1274,6 +1291,7 @@
12741291 	pwm9: pwm@ff550010 {
12751292 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
12761293 		reg = <0xff550010 0x10>;
1294
+		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
12771295 		#pwm-cells = <3>;
12781296 		pinctrl-names = "active";
12791297 		pinctrl-0 = <&pwm9m0_pins>;
....@@ -1285,6 +1303,7 @@
12851303 	pwm10: pwm@ff550020 {
12861304 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
12871305 		reg = <0xff550020 0x10>;
1306
+		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
12881307 		#pwm-cells = <3>;
12891308 		pinctrl-names = "active";
12901309 		pinctrl-0 = <&pwm10m0_pins>;
....@@ -1296,6 +1315,8 @@
12961315 	pwm11: pwm@ff550030 {
12971316 		compatible = "rockchip,rv1126-pwm", "rockchip,rk3328-pwm";
12981317 		reg = <0xff550030 0x10>;
1318
+		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
1319
+			     <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
12991320 		#pwm-cells = <3>;
13001321 		pinctrl-names = "active";
13011322 		pinctrl-0 = <&pwm11m0_pins>;
....@@ -1861,8 +1882,8 @@
18611882 		status = "disabled";
18621883 	};
18631884 
1864
-	mipi_csi2: mipi-csi2@ffb10000 {
1865
-		compatible = "rockchip,rv1126-mipi-csi2";
1885
+	mipi_csi2_hw: mipi-csi2-hw@ffb10000 {
1886
+		compatible = "rockchip,rv1126-mipi-csi2-hw";
18661887 		reg = <0xffb10000 0x10000>;
18671888 		reg-names = "csihost_regs";
18681889 		interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
....@@ -2548,8 +2569,8 @@
25482569 			snps,dis-del-phy-power-chg-quirk;
25492570 			snps,tx-ipgap-linecheck-dis-quirk;
25502571 			snps,tx-fifo-resize;
2551
-			snps,xhci-trb-ent-quirk;
25522572 			snps,usb2-lpm-disable;
2573
+			snps,parkmode-disable-hs-quirk;
25532574 			status = "disabled";
25542575 		};
25552576 	};