From 233f9f77d51f5f63b0f1b94bfd671ac5e533c1eb Mon Sep 17 00:00:00 2001 From: Yueguie He Date: Thu, 19 Oct 2017 14:54:43 +0800 Subject: [PATCH] dts: sync s420 & s420_128m PD#150185: dts: sync s420 & s420_128m Change-Id: I2e11bdffb760ee51d57aeb7aaf6d0f833a15c9ec Signed-off-by: Yueguie He --- arch/arm64/boot/dts/amlogic/axg_s420_128m.dts | 5 ++--- arch/arm64/boot/dts/amlogic/axg_s420_v03.dts | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts b/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts index 868c48a299f4..af15085f851b 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s420_128m.dts @@ -346,8 +346,8 @@ aml-audio-card,dai-link@0 { format = "dsp_a"; mclk-fs = <256>;//512 - //continuous-clock; - bitclock-inversion; + continuous-clock; + //bitclock-inversion; //frame-inversion; bitclock-master = <&aml_tdma>; frame-master = <&aml_tdma>; @@ -378,7 +378,6 @@ dai-tdm-slot-rx-mask = <1 1>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <32>; - system-clock-frequency = <12288000>; }; codec { sound-dai = <&tlv320adc3101_32>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts index 540e8e5dc636..9af1c09f8d30 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts @@ -349,7 +349,7 @@ format = "dsp_a"; mclk-fs = <256>;//512 continuous-clock; - bitclock-inversion; + //bitclock-inversion; //frame-inversion; bitclock-master = <&aml_tdma>; frame-master = <&aml_tdma>; @@ -804,8 +804,6 @@ aml_spdif: spdif { compatible = "amlogic, snd-spdif"; #sound-dai-cells = <0>; - spdif_from_ddr = <0>; - spdif_to_ddr = <0>; clocks = <&clkc CLKID_MPLL0 &clkc CLKID_FCLK_DIV4 &clkaudio CLKID_AUDIO_SPDIFIN