forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/arch/arm/boot/dts/rv1106.dtsi
....@@ -9,6 +9,7 @@
99 #include <dt-bindings/pinctrl/rockchip.h>
1010 #include <dt-bindings/soc/rockchip,boot-mode.h>
1111 #include <dt-bindings/soc/rockchip-system-status.h>
12
+#include <dt-bindings/suspend/rockchip-rv1106.h>
1213 #include <dt-bindings/thermal/thermal.h>
1314
1415 / {
....@@ -239,6 +240,18 @@
239240 };
240241 };
241242
243
+ mipi0_csi2: mipi0-csi2 {
244
+ compatible = "rockchip,rv1106-mipi-csi2";
245
+ rockchip,hw = <&mipi0_csi2_hw>, <&mipi1_csi2_hw>;
246
+ status = "disabled";
247
+ };
248
+
249
+ mipi1_csi2: mipi1-csi2 {
250
+ compatible = "rockchip,rv1106-mipi-csi2";
251
+ rockchip,hw = <&mipi0_csi2_hw>, <&mipi1_csi2_hw>;
252
+ status = "disabled";
253
+ };
254
+
242255 mpp_srv: mpp-srv {
243256 compatible = "rockchip,mpp-service";
244257 rockchip,taskqueue-count = <2>;
....@@ -314,6 +327,55 @@
314327 compatible = "rockchip,rkisp-vir";
315328 rockchip,hw = <&rkisp>;
316329 status = "disabled";
330
+ };
331
+
332
+ rockchip_suspend: rockchip-suspend {
333
+ compatible = "rockchip,pm-config";
334
+ status = "okay";
335
+ rockchip,sleep-io-config = <
336
+ (0
337
+ | RKPM_IO_CFG_IOMUX_GPIO
338
+ | RKPM_IO_CFG_GPIO_DIR_INPUT
339
+ | RKPM_IO_CFG_PULL_DOWN
340
+ | RKPM_IO_CFG_ID(0)
341
+ )
342
+ (0
343
+ | RKPM_IO_CFG_IOMUX_GPIO
344
+ | RKPM_IO_CFG_GPIO_DIR_INPUT
345
+ | RKPM_IO_CFG_PULL_DOWN
346
+ | RKPM_IO_CFG_ID(1)
347
+ )
348
+ (0
349
+ | RKPM_IO_CFG_IOMUX_GPIO
350
+ | RKPM_IO_CFG_GPIO_DIR_INPUT
351
+ | RKPM_IO_CFG_PULL_DOWN
352
+ | RKPM_IO_CFG_ID(2)
353
+ )
354
+ (0
355
+ | RKPM_IO_CFG_IOMUX_GPIO
356
+ | RKPM_IO_CFG_GPIO_DIR_INPUT
357
+ | RKPM_IO_CFG_PULL_UP
358
+ | RKPM_IO_CFG_ID(3)
359
+ )
360
+ (0
361
+ | RKPM_IO_CFG_IOMUX_GPIO
362
+ | RKPM_IO_CFG_GPIO_DIR_INPUT
363
+ | RKPM_IO_CFG_PULL_UP
364
+ | RKPM_IO_CFG_ID(4)
365
+ )
366
+ (0
367
+ | RKPM_IO_CFG_IOMUX_GPIO
368
+ | RKPM_IO_CFG_GPIO_DIR_INPUT
369
+ | RKPM_IO_CFG_PULL_NONE
370
+ | RKPM_IO_CFG_ID(5)
371
+ )
372
+ (0
373
+ | RKPM_IO_CFG_IOMUX_GPIO
374
+ | RKPM_IO_CFG_GPIO_DIR_INPUT
375
+ | RKPM_IO_CFG_PULL_NONE
376
+ | RKPM_IO_CFG_ID(6)
377
+ )
378
+ >;
317379 };
318380
319381 rockchip_system_monitor: rockchip-system-monitor {
....@@ -1014,6 +1076,8 @@
10141076 #size-cells = <0>;
10151077 clocks = <&cru CLK_SPI1>, <&cru PCLK_SPI1>;
10161078 clock-names = "spiclk", "apb_pclk";
1079
+ assigned-clocks = <&cru CLK_SPI1>;
1080
+ assigned-clock-rates = <200000000>;
10171081 dmas = <&dmac 3>, <&dmac 2>;
10181082 dma-names = "tx", "rx";
10191083 pinctrl-names = "default";
....@@ -1173,8 +1237,8 @@
11731237 status = "disabled";
11741238 };
11751239
1176
- mipi0_csi2: mipi-csi2@ffa20000 {
1177
- compatible = "rockchip,rk3588-mipi-csi2";
1240
+ mipi0_csi2_hw: mipi-csi2-hw@ffa20000 {
1241
+ compatible = "rockchip,rv1106-mipi-csi2-hw";
11781242 reg = <0xffa20000 0x10000>;
11791243 reg-names = "csihost_regs";
11801244 interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
....@@ -1184,11 +1248,11 @@
11841248 clock-names = "pclk_csi2host", "clk_rxbyte_hs";
11851249 resets = <&cru SRST_P_CSIHOST0>;
11861250 reset-names = "srst_csihost_p";
1187
- status = "disabled";
1251
+ status = "okay";
11881252 };
11891253
1190
- mipi1_csi2: mipi-csi2@ffa30000 {
1191
- compatible = "rockchip,rk3588-mipi-csi2";
1254
+ mipi1_csi2_hw: mipi-csi2-hw@ffa30000 {
1255
+ compatible = "rockchip,rv1106-mipi-csi2-hw";
11921256 reg = <0xffa30000 0x10000>;
11931257 reg-names = "csihost_regs";
11941258 interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
....@@ -1198,7 +1262,7 @@
11981262 clock-names = "pclk_csi2host", "clk_rxbyte_hs";
11991263 resets = <&cru SRST_P_CSIHOST1>;
12001264 reset-names = "srst_csihost_p";
1201
- status = "disabled";
1265
+ status = "okay";
12021266 };
12031267
12041268 rkvenc: rkvenc@ffa50000 {
....@@ -1409,6 +1473,7 @@
14091473 snps,dis-tx-ipgap-linecheck-quirk;
14101474 snps,usb2-gadget-lpm-disable;
14111475 snps,usb2-lpm-disable;
1476
+ snps,parkmode-disable-hs-quirk;
14121477 status = "disabled";
14131478 };
14141479 };