From 7c4dea196e8d098f0415f7c0c3d4c8b49fac563d Mon Sep 17 00:00:00 2001 From: Kevin Kim Date: Fri, 22 Mar 2019 14:03:21 +0900 Subject: [PATCH] ODROID-COMMON:alsa-default-sink set to HDMI-output Change-Id: I6165eed22baca6150b4dfc79e9108ba344385d0d --- .../dts/amlogic/mesong12_odroid_common.dtsi | 28 +++++++++---------- arch/arm64/configs/odroidn2_defconfig | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi index 90f9abf05d35..a7598f8810ff 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi @@ -62,7 +62,7 @@ /* Audio Related start */ dummy_codec:dummy{ #sound-dai-cells = <0>; - compatible = "amlogic, aml_dummy_codec"; + compatible = "linux,spdif-dit"; status = "okay"; }; amlogic_codec:t9015{ @@ -97,7 +97,20 @@ /*for audio effect ,eqdrc */ aml-audio-card,effect = <&audio_effect>; + /* spdif_b to hdmi, only playback */ aml-audio-card,dai-link@0 { + mclk-fs = <128>; + continuous-clock; + cpu { + sound-dai = <&aml_spdif_b>; + system-clock-frequency = <6144000>; + }; + codec { + sound-dai = <&dummy_codec>; + }; + }; + + aml-audio-card,dai-link@1 { format = "i2s";// "dsp_a"; mclk-fs = <256>; bitclock-master = <&aml_tdmc>; @@ -116,19 +129,6 @@ }; }; - /* spdif_b to hdmi, only playback */ - aml-audio-card,dai-link@1 { - mclk-fs = <128>; - continuous-clock; - cpu { - sound-dai = <&aml_spdif_b>; - system-clock-frequency = <6144000>; - }; - codec { - sound-dai = <&dummy_codec>; - }; - }; - /* spdif_out GPIOA_11 */ aml-audio-card,dai-link@2 { mclk-fs = <128>; diff --git a/arch/arm64/configs/odroidn2_defconfig b/arch/arm64/configs/odroidn2_defconfig index 5059bedfbfef..191835bd99eb 100644 --- a/arch/arm64/configs/odroidn2_defconfig +++ b/arch/arm64/configs/odroidn2_defconfig @@ -4065,7 +4065,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_RT5677_SPI is not set # CONFIG_SND_SOC_SGTL5000 is not set # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set -# CONFIG_SND_SOC_SPDIF is not set +CONFIG_SND_SOC_SPDIF=y # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM4567 is not set