forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 10ebd8556b7990499c896a550e3d416b444211e6
kernel/arch/arm64/boot/dts/rockchip/rk3568-nvr.dtsi
....@@ -42,19 +42,39 @@
4242 };
4343
4444 hdmi_sound: hdmi-sound {
45
+ compatible = "simple-audio-card";
46
+ simple-audio-card,format = "i2s";
47
+ simple-audio-card,mclk-fs = <128>;
48
+ simple-audio-card,name = "hdmi-sound";
4549 status = "okay";
46
- compatible = "rockchip,hdmi";
47
- rockchip,mclk-fs = <128>;
48
- rockchip,card-name = "rockchip-hdmi0";
49
- rockchip,cpu = <&i2s0_8ch>;
50
- rockchip,codec = <&hdmi>;
51
- rockchip,jack-det;
50
+
51
+ simple-audio-card,cpu {
52
+ sound-dai = <&i2s0_8ch>;
53
+ };
54
+ simple-audio-card,codec {
55
+ sound-dai = <&hdmi>;
56
+ };
5257 };
5358
54
- spdif_sound: spdif-sound {
59
+ reserved-memory {
60
+ #address-cells = <2>;
61
+ #size-cells = <2>;
62
+ ranges;
63
+
64
+ rknpu_reserved: rknpu {
65
+ compatible = "shared-dma-pool";
66
+ inactive;
67
+ reusable;
68
+ size = <0x0 0x20000000>;
69
+ alignment = <0x0 0x1000>;
70
+ };
71
+ };
72
+
73
+ spdif-sound {
5574 status = "okay";
5675 compatible = "simple-audio-card";
57
- simple-audio-card,name = "ROCKCHIP-SPDIF";
76
+ simple-audio-card,name = "ROCKCHIP,SPDIF";
77
+ simple-audio-card,mclk-fs = <128>;
5878 simple-audio-card,cpu {
5979 sound-dai = <&spdif_8ch>;
6080 };
....@@ -239,7 +259,7 @@
239259 status = "okay";
240260
241261 vdd_cpu: tcs4525@1c {
242
- compatible = "tcs,tcs452x";
262
+ compatible = "tcs,tcs4525";
243263 reg = <0x1c>;
244264 vin-supply = <&vcc5v0_sys>;
245265 regulator-compatible = "fan53555-reg";
....@@ -326,12 +346,13 @@
326346 };
327347
328348 &rknpu {
349
+ memory-region = <&rknpu_reserved>;
329350 rknpu-supply = <&vdd_npu>;
330351 status = "okay";
331352 };
332353
333354 &rknpu_mmu {
334
- status = "okay";
355
+ status = "disabled";
335356 };
336357
337358 &rkvdec {
....@@ -368,13 +389,22 @@
368389
369390 &sdhci {
370391 bus-width = <8>;
371
- supports-emmc;
392
+ no-sdio;
393
+ no-sd;
372394 non-removable;
373395 status = "okay";
374396 };
375397
376398 &sfc {
377399 status = "okay";
400
+
401
+ flash@0 {
402
+ compatible = "spi-nand";
403
+ reg = <0>;
404
+ spi-max-frequency = <75000000>;
405
+ spi-rx-bus-width = <4>;
406
+ spi-tx-bus-width = <1>;
407
+ };
378408 };
379409
380410 &spdif_8ch {