forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-12-09 958e46acc8e900e8569dd467c1af9b8d2d019394
kernel/arch/arm64/boot/dts/rockchip/rk1808.dtsi
....@@ -21,7 +21,6 @@
2121 #size-cells = <2>;
2222
2323 aliases {
24
- ethernet0 = &gmac;
2524 i2c0 = &i2c0;
2625 i2c1 = &i2c1;
2726 i2c2 = &i2c2;
....@@ -241,19 +240,17 @@
241240 };
242241 };
243242
244
- firmware {
245
- optee: optee {
246
- compatible = "linaro,optee-tz";
247
- method = "smc";
248
- status = "disabled";
249
- };
250
- };
251
-
252243 gmac_clkin: external-gmac-clock {
253244 compatible = "fixed-clock";
254245 clock-frequency = <125000000>;
255246 clock-output-names = "gmac_clkin";
256247 #clock-cells = <0>;
248
+ };
249
+
250
+ mipi_csi2: mipi-csi2 {
251
+ compatible = "rockchip,rk1808-mipi-csi2";
252
+ rockchip,hw = <&mipi_csi2_hw>;
253
+ status = "disabled";
257254 };
258255
259256 psci {
....@@ -381,13 +378,16 @@
381378 phy-names = "usb2-phy", "usb3-phy";
382379 phy_type = "utmi_wide";
383380 snps,dis_enblslpm_quirk;
384
- snps,dis-u1u2-quirk;
381
+ snps,dis-u1-entry-quirk;
382
+ snps,dis-u2-entry-quirk;
385383 snps,dis-u2-freeclk-exists-quirk;
386384 snps,dis_u2_susphy_quirk;
387385 snps,dis_u3_susphy_quirk;
388386 snps,dis-del-phy-power-chg-quirk;
389387 snps,tx-ipgap-linecheck-dis-quirk;
390388 snps,xhci-trb-ent-quirk;
389
+ snps,parkmode-disable-hs-quirk;
390
+ snps,parkmode-disable-ss-quirk;
391391 status = "disabled";
392392 };
393393 };
....@@ -1335,7 +1335,7 @@
13351335 };
13361336
13371337 pdm: pdm@ff800000 {
1338
- compatible = "rockchip,rk1808-pdm";
1338
+ compatible = "rockchip,rk1808-pdm", "rockchip,pdm";
13391339 reg = <0x0 0xff800000 0x0 0x1000>;
13401340 clocks = <&cru SCLK_PDM>, <&cru HCLK_PDM>;
13411341 clock-names = "pdm_clk", "pdm_hclk";
....@@ -1533,8 +1533,8 @@
15331533 status = "disabled";
15341534 };
15351535
1536
- mipi_csi2: mipi-csi2@ffb10000 {
1537
- compatible = "rockchip,rk1808-mipi-csi2";
1536
+ mipi_csi2_hw: mipi-csi2-hw@ffb10000 {
1537
+ compatible = "rockchip,rk1808-mipi-csi2-hw";
15381538 reg = <0x0 0xffb10000 0x0 0x100>;
15391539 reg-names = "csihost_regs";
15401540 interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
....@@ -2254,15 +2254,15 @@
22542254 i2s1 {
22552255 i2s1_2ch_lrck: i2s1-2ch-lrck {
22562256 rockchip,pins =
2257
- <3 RK_PA0 1 &pcfg_pull_none_2ma>;
2257
+ <3 RK_PA0 1 &pcfg_pull_none_2ma_smt>;
22582258 };
22592259 i2s1_2ch_sclk: i2s1-2ch-sclk {
22602260 rockchip,pins =
2261
- <3 RK_PA1 1 &pcfg_pull_none_2ma>;
2261
+ <3 RK_PA1 1 &pcfg_pull_none_2ma_smt>;
22622262 };
22632263 i2s1_2ch_mclk: i2s1-2ch-mclk {
22642264 rockchip,pins =
2265
- <3 RK_PA2 1 &pcfg_pull_none_2ma>;
2265
+ <3 RK_PA2 1 &pcfg_pull_none_2ma_smt>;
22662266 };
22672267 i2s1_2ch_sdo: i2s1-2ch-sdo {
22682268 rockchip,pins =
....@@ -2289,11 +2289,11 @@
22892289 };
22902290 i2s0_8ch_sclkrx: i2s0-8ch-sclkrx {
22912291 rockchip,pins =
2292
- <3 RK_PB0 1 &pcfg_pull_none_2ma>;
2292
+ <3 RK_PB0 1 &pcfg_pull_none_2ma_smt>;
22932293 };
22942294 i2s0_8ch_lrckrx: i2s0-8ch-lrckrx {
22952295 rockchip,pins =
2296
- <3 RK_PB1 1 &pcfg_pull_none_2ma>;
2296
+ <3 RK_PB1 1 &pcfg_pull_none_2ma_smt>;
22972297 };
22982298 i2s0_8ch_sdo3: i2s0-8ch-sdo3 {
22992299 rockchip,pins =
....@@ -2309,15 +2309,15 @@
23092309 };
23102310 i2s0_8ch_mclk: i2s0-8ch-mclk {
23112311 rockchip,pins =
2312
- <3 RK_PB5 1 &pcfg_pull_none_2ma>;
2312
+ <3 RK_PB5 1 &pcfg_pull_none_2ma_smt>;
23132313 };
23142314 i2s0_8ch_lrcktx: i2s0-8ch-lrcktx {
23152315 rockchip,pins =
2316
- <3 RK_PB6 1 &pcfg_pull_none_2ma>;
2316
+ <3 RK_PB6 1 &pcfg_pull_none_2ma_smt>;
23172317 };
23182318 i2s0_8ch_sclktx: i2s0-8ch-sclktx {
23192319 rockchip,pins =
2320
- <3 RK_PB7 1 &pcfg_pull_none_2ma>;
2320
+ <3 RK_PB7 1 &pcfg_pull_none_2ma_smt>;
23212321 };
23222322 i2s0_8ch_sdo0: i2s0-8ch-sdo0 {
23232323 rockchip,pins =