mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/arch/arm/boot/dts/rv1106.dtsi
..
..
@@ -239,6 +239,18 @@
239
239
 		};
240
240
 	};
241
241
 
242
+	mipi0_csi2: mipi0-csi2 {
243
+		compatible = "rockchip,rv1106-mipi-csi2";
244
+		rockchip,hw = <&mipi0_csi2_hw>, <&mipi1_csi2_hw>;
245
+		status = "disabled";
246
+	};
247
+
248
+	mipi1_csi2: mipi1-csi2 {
249
+		compatible = "rockchip,rv1106-mipi-csi2";
250
+		rockchip,hw = <&mipi0_csi2_hw>, <&mipi1_csi2_hw>;
251
+		status = "disabled";
252
+	};
253
+
242
254
 	mpp_srv: mpp-srv {
243
255
 		compatible = "rockchip,mpp-service";
244
256
 		rockchip,taskqueue-count = <2>;
..
..
@@ -1014,6 +1026,8 @@
1014
1026
 		#size-cells = <0>;
1015
1027
 		clocks = <&cru CLK_SPI1>, <&cru PCLK_SPI1>;
1016
1028
 		clock-names = "spiclk", "apb_pclk";
1029
+		assigned-clocks = <&cru CLK_SPI1>;
1030
+		assigned-clock-rates = <200000000>;
1017
1031
 		dmas = <&dmac 3>, <&dmac 2>;
1018
1032
 		dma-names = "tx", "rx";
1019
1033
 		pinctrl-names = "default";
..
..
@@ -1173,8 +1187,8 @@
1173
1187
 		status = "disabled";
1174
1188
 	};
1175
1189
 
1176
-	mipi0_csi2: mipi-csi2@ffa20000 {
1177
-		compatible = "rockchip,rk3588-mipi-csi2";
1190
+	mipi0_csi2_hw: mipi-csi2-hw@ffa20000 {
1191
+		compatible = "rockchip,rv1106-mipi-csi2-hw";
1178
1192
 		reg = <0xffa20000 0x10000>;
1179
1193
 		reg-names = "csihost_regs";
1180
1194
 		interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
..
..
@@ -1184,11 +1198,11 @@
1184
1198
 		clock-names = "pclk_csi2host", "clk_rxbyte_hs";
1185
1199
 		resets = <&cru SRST_P_CSIHOST0>;
1186
1200
 		reset-names = "srst_csihost_p";
1187
-		status = "disabled";
1201
+		status = "okay";
1188
1202
 	};
1189
1203
 
1190
-	mipi1_csi2: mipi-csi2@ffa30000 {
1191
-		compatible = "rockchip,rk3588-mipi-csi2";
1204
+	mipi1_csi2_hw: mipi-csi2-hw@ffa30000 {
1205
+		compatible = "rockchip,rv1106-mipi-csi2-hw";
1192
1206
 		reg = <0xffa30000 0x10000>;
1193
1207
 		reg-names = "csihost_regs";
1194
1208
 		interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
..
..
@@ -1198,7 +1212,7 @@
1198
1212
 		clock-names = "pclk_csi2host", "clk_rxbyte_hs";
1199
1213
 		resets = <&cru SRST_P_CSIHOST1>;
1200
1214
 		reset-names = "srst_csihost_p";
1201
-		status = "disabled";
1215
+		status = "okay";
1202
1216
 	};
1203
1217
 
1204
1218
 	rkvenc: rkvenc@ffa50000 {
..
..
@@ -1409,6 +1423,7 @@
1409
1423
 			snps,dis-tx-ipgap-linecheck-quirk;
1410
1424
 			snps,usb2-gadget-lpm-disable;
1411
1425
 			snps,usb2-lpm-disable;
1426
+			snps,parkmode-disable-hs-quirk;
1412
1427
 			status = "disabled";
1413
1428
 		};
1414
1429
 	};