From a36159eec6ca17402b0e146b86efaf76568dc353 Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Fri, 20 Sep 2024 01:41:23 +0000 Subject: [PATCH] 重命名 AX88772C_eeprom/asix.c 为 asix_mac.c --- kernel/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 56 insertions(+), 3 deletions(-) diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi index 36f43fe..77189ab 100644 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3566-box.dtsi @@ -32,6 +32,27 @@ }; }; + bt_sco: bt-sco { + status = "disabled"; + compatible = "delta,dfbmcs320"; + #sound-dai-cells = <1>; + }; + + bt_sound: bt-sound { + status = "disabled"; + compatible = "simple-audio-card"; + simple-audio-card,format = "dsp_a"; + simple-audio-card,bitclock-inversion; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,name = "rockchip,bt"; + simple-audio-card,cpu { + sound-dai = <&i2s2_2ch>; + }; + simple-audio-card,codec { + sound-dai = <&bt_sco 1>; + }; + }; + dc_12v: dc-12v { compatible = "regulator-fixed"; regulator-name = "dc_12v"; @@ -44,7 +65,7 @@ hdmi_sound: hdmi-sound { compatible = "simple-audio-card"; simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <128>; + simple-audio-card,mclk-fs = <256>; simple-audio-card,name = "hdmi-sound"; status = "okay"; @@ -56,10 +77,26 @@ }; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + rknpu_reserved: rknpu { + compatible = "shared-dma-pool"; + inactive; + reusable; + size = <0x0 0x20000000>; + alignment = <0x0 0x1000>; + status = "disabled"; + }; + }; + spdif-sound { status = "okay"; compatible = "simple-audio-card"; simple-audio-card,name = "ROCKCHIP,SPDIF"; + simple-audio-card,mclk-fs = <128>; simple-audio-card,cpu { sound-dai = <&spdif_8ch>; }; @@ -215,6 +252,12 @@ &i2s1m0_sdo0>; }; +&i2s2_2ch { + pinctrl-0 = <&i2s2m0_sclktx &i2s2m0_lrcktx &i2s2m0_sdi &i2s2m0_sdo>; + rockchip,bclk-fs = <32>; + status = "disabled"; +}; + &iep { status = "okay"; }; @@ -258,12 +301,13 @@ }; &rknpu { + memory-region = <&rknpu_reserved>; rknpu-supply = <&vdd_fixed>; status = "okay"; }; &rknpu_mmu { - status = "okay"; + status = "disabled"; }; &rkvdec { @@ -313,13 +357,22 @@ &sdhci { bus-width = <8>; - supports-emmc; + no-sdio; + no-sd; non-removable; status = "okay"; }; &sfc { status = "okay"; + + flash@0 { + compatible = "spi-nand"; + reg = <0>; + spi-max-frequency = <75000000>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <1>; + }; }; &spdif_8ch { -- Gitblit v1.6.2