hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f
kernel/arch/arm/boot/dts/rv1106.dtsi
....@@ -239,6 +239,18 @@
239239 };
240240 };
241241
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
+
242254 mpp_srv: mpp-srv {
243255 compatible = "rockchip,mpp-service";
244256 rockchip,taskqueue-count = <2>;
....@@ -1014,6 +1026,8 @@
10141026 #size-cells = <0>;
10151027 clocks = <&cru CLK_SPI1>, <&cru PCLK_SPI1>;
10161028 clock-names = "spiclk", "apb_pclk";
1029
+ assigned-clocks = <&cru CLK_SPI1>;
1030
+ assigned-clock-rates = <200000000>;
10171031 dmas = <&dmac 3>, <&dmac 2>;
10181032 dma-names = "tx", "rx";
10191033 pinctrl-names = "default";
....@@ -1173,8 +1187,8 @@
11731187 status = "disabled";
11741188 };
11751189
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";
11781192 reg = <0xffa20000 0x10000>;
11791193 reg-names = "csihost_regs";
11801194 interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
....@@ -1184,11 +1198,11 @@
11841198 clock-names = "pclk_csi2host", "clk_rxbyte_hs";
11851199 resets = <&cru SRST_P_CSIHOST0>;
11861200 reset-names = "srst_csihost_p";
1187
- status = "disabled";
1201
+ status = "okay";
11881202 };
11891203
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";
11921206 reg = <0xffa30000 0x10000>;
11931207 reg-names = "csihost_regs";
11941208 interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
....@@ -1198,7 +1212,7 @@
11981212 clock-names = "pclk_csi2host", "clk_rxbyte_hs";
11991213 resets = <&cru SRST_P_CSIHOST1>;
12001214 reset-names = "srst_csihost_p";
1201
- status = "disabled";
1215
+ status = "okay";
12021216 };
12031217
12041218 rkvenc: rkvenc@ffa50000 {
....@@ -1409,6 +1423,7 @@
14091423 snps,dis-tx-ipgap-linecheck-quirk;
14101424 snps,usb2-gadget-lpm-disable;
14111425 snps,usb2-lpm-disable;
1426
+ snps,parkmode-disable-hs-quirk;
14121427 status = "disabled";
14131428 };
14141429 };