shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: move acodec sound node to rk3308-evb-v10.dtsi

Browse Source 
The acodec part is shared with the RK3308 EVB, so that users
can select an external sound card device as required.

Change-Id: I42c1de879ba14a693c161a401ecf5ba6a8d39cd0
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
This commit is contained in:
Xing Zheng
2018-04-20 11:33:32 +08:00
committed by Tao Huang
parent 2c20d416a6
commit d0c026907f
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts
View File

@@ -11,32 +11,4 @@
/ {
model = "Rockchip RK3308 evb analog mic board";
compatible = "rockchip,rk3308-evb-amic-v10", "rockchip,rk3308";
sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,name = "rockchip,rk3308-acodec";
simple-audio-card,mclk-fs = <256>;
simple-audio-card,cpu {
sound-dai = <&i2s_8ch_2>;
};
simple-audio-card,codec {
sound-dai = <&acodec>;
};
};
};
&acodec {
status = "okay";
#sound-dai-cells = <0>;
hp-ctl-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
spk-ctl-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
};
&i2s_8ch_2 {
status = "okay";
#sound-dai-cells = <0>;
};

28
arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi
View File

@@ -102,6 +102,19 @@
reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
};
sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,name = "rockchip,rk3308-acodec";
simple-audio-card,mclk-fs = <256>;
simple-audio-card,cpu {
sound-dai = <&i2s_8ch_2>;
};
simple-audio-card,codec {
sound-dai = <&acodec>;
};
};
spdif_tx_sound: spdif-tx-sound {
status = "disabled";
compatible = "simple-audio-card";
@@ -227,6 +240,15 @@
};
};
&acodec {
status = "okay";
#sound-dai-cells = <0>;
hp-ctl-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
spk-ctl-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
};
&cpu0 {
cpu-supply = <&vdd_core>;
};
@@ -608,6 +630,12 @@
};
};
&i2s_8ch_2 {
status = "okay";
#sound-dai-cells = <0>;
};
&nandc {
status = "okay";
};