From 792a7d4273a59e80dafca48ba11438f43a6d8bda Mon Sep 17 00:00:00 2001 From: Grey Li Date: Wed, 9 Oct 2024 09:18:28 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3308-evb: dmac use sram and del aloop sound card Change-Id: I5d73da020593c67e11a15c747307f0abe160dc66 Signed-off-by: Grey Li Signed-off-by: Zou Dengming --- .../rockchip/rk3308-evb-audio-v10-partybox.dts | 18 +++++++++++++++++- .../rockchip/rk3308-evb-audio-v11-partybox.dts | 4 ---- .../rk3308-partybox-coreboard-demo.dtsi | 14 +++++++++++++- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10-partybox.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10-partybox.dts index fb42491114f6..1a654f34f6e5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10-partybox.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v10-partybox.dts @@ -12,7 +12,7 @@ compatible = "rockchip,rk3308-evb-audio-v10-partybox", "rockchip,rk3308"; chosen { - bootargs = "earlycon=uart8250,mmio32,0xff0c0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1 isolcpus=2,3 nohz_full=2,3"; + bootargs = "earlycon=uart8250,mmio32,0xff0c0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1 isolcpus=2,3 nohz_full=2,3 snd_soc_core.prealloc_buffer_size_kbytes=16"; }; reserved-memory { @@ -57,6 +57,14 @@ }; }; +&dmac0 { + iram = <&vad_sram>; +}; + +&dmac1 { + iram = <&vad_sram>; +}; + &rk3308bs_cpu0_opp_table { opp-408000000 { status = "disabled"; @@ -81,6 +89,14 @@ rockchip,wait-card-locked = <0>; }; +&vad { + status = "disabled"; +}; + &vad_acodec_sound { status = "okay"; }; + +&vad_sram { + pool; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v11-partybox.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v11-partybox.dts index 19bab4625663..cd75ccc4f81a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v11-partybox.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-audio-v11-partybox.dts @@ -11,8 +11,4 @@ / { model = "Rockchip RK3308 EVB AUDIO V11 PARTYBOX"; compatible = "rockchip,rk3308-evb-audio-v11-partybox", "rockchip,rk3308"; - - chosen { - bootargs = "earlycon=uart8250,mmio32,0xff0c0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1 isolcpus=2,3 nohz_full=2,3"; - }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3308-partybox-coreboard-demo.dtsi b/arch/arm64/boot/dts/rockchip/rk3308-partybox-coreboard-demo.dtsi index e1b883dd656f..5f467a174595 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-partybox-coreboard-demo.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3308-partybox-coreboard-demo.dtsi @@ -8,7 +8,7 @@ / { chosen { - bootargs = "earlycon=uart8250,mmio32,0xff0c0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait snd_aloop.index=7 snd_aloop.use_raw_jiffies=1 isolcpus=2,3 nohz_full=2,3"; + bootargs = "earlycon=uart8250,mmio32,0xff0c0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=squashfs rootwait isolcpus=2,3 nohz_full=2,3 snd_soc_core.prealloc_buffer_size_kbytes=16"; }; pwm-leds { @@ -78,6 +78,14 @@ status = "okay"; }; +&dmac0 { + iram = <&vad_sram>; +}; + +&dmac1 { + iram = <&vad_sram>; +}; + &emmc { bus-width = <8>; cap-mmc-highspeed; @@ -175,6 +183,10 @@ }; }; +&vad_sram { + pool; +}; + &pinctrl { wireless-bluetooth { uart4_gpios: uart4-gpios {