From 937de4a48b7d7c151492f4b6c0fb98c9ceb5d8b0 Mon Sep 17 00:00:00 2001 From: Peipeng Zhao Date: Thu, 10 Aug 2017 19:16:26 +0800 Subject: [PATCH] audio: modified dts for S400 & S420 board V03 PD#149114: modified dts for S400 & S420 board V03 Change-Id: Idd311e0061bc5fcf30f0a4cf3bdfef4aec3767fa Signed-off-by: Peipeng Zhao --- arch/arm64/boot/dts/amlogic/axg_s400.dts | 2 +- arch/arm64/boot/dts/amlogic/axg_s400_v03.dts | 32 ++++++++++++++++------------ arch/arm64/boot/dts/amlogic/axg_s420.dts | 2 +- arch/arm64/boot/dts/amlogic/axg_s420_v03.dts | 16 +++++++------- scripts/amlogic/mk_dtb_gx.sh | 4 ++++ 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/axg_s400.dts b/arch/arm64/boot/dts/amlogic/axg_s400.dts index a6d84ae..6f1ac1d 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400.dts @@ -21,7 +21,7 @@ #include "mesonaxg_s400-panel.dtsi" / { model = "Amlogic"; - amlogic-dt-id= "axg_s400_1g"; + amlogic-dt-id = "axg_s400_1g"; compatible = "amlogic, axg"; interrupt-parent = <&gic>; #address-cells = <2>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts index f5d467f..6e26f65 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s400_v03.dts @@ -21,7 +21,7 @@ #include "mesonaxg_s400-panel.dtsi" / { model = "Amlogic"; - amlogic-dt-id= "axg_s400_v03"; + amlogic-dt-id = "axg_s400_v03"; compatible = "amlogic, axg"; interrupt-parent = <&gic>; #address-cells = <2>; @@ -480,7 +480,7 @@ mclk-fs = <256>; continuous-clock; //bitclock-inversion; - frame-inversion; + //frame-inversion; bitclock-master = <&aml_tdmb>; frame-master = <&aml_tdmb>; cpu { @@ -491,10 +491,13 @@ dai-tdm-slot-width = <32>; }; codec { - prefix-names = "3101_A", "3101_B", - "3101_C", "3101_D"; - sound-dai = <&tlv320adc3101_32 &tlv320adc3101_30 - &tlv320adc3101_34 &tlv320adc3101_36>; + sound-dai = <&tlv320adc3101_32 &dummy_codec>; + /*prefix-names = "3101_A", "3101_B",*/ + /*"3101_C", "3101_D";*/ + /*sound-dai = <&tlv320adc3101_32*/ + /*&tlv320adc3101_30*/ + /*&tlv320adc3101_34*/ + /*&tlv320adc3101_36>;*/ }; }; @@ -503,7 +506,7 @@ mclk-fs = <256>; continuous-clock; //bitclock-inversion; - frame-inversion; + //frame-inversion; //bitclock-master = <&aml_tdmc>; //frame-master = <&aml_tdmc>; cpu { @@ -889,19 +892,19 @@ compatible = "ti,tlv320adc3101"; #sound-dai-cells = <0>; reg = <0x18>; - status = "okay"; + status = "disable"; }; tlv320adc3101_34: tlv320adc3101_34@30 { compatible = "ti,tlv320adc3101"; #sound-dai-cells = <0>; reg = <0x1a>; - status = "okay"; + status = "disable"; }; tlv320adc3101_36: tlv320adc3101_36@30 { compatible = "ti,tlv320adc3101"; #sound-dai-cells = <0>; reg = <0x1b>; - status = "okay"; + status = "disable"; }; }; @@ -909,8 +912,8 @@ aml_tdma: tdma { compatible = "amlogic, snd-tdma"; #sound-dai-cells = <0>; - dai-tdm-lane-slot-mask-in = <1>; - dai-tdm-lane-slot-mask-out = <1>; + dai-tdm-lane-slot-mask-in = <1 0>; + dai-tdm-lane-slot-mask-out = <0 1>; dai-tdm-clk-sel = <0>; tdm_from_ddr = <0>; tdm_to_ddr = <0>; @@ -929,7 +932,8 @@ aml_tdmb: tdmb { compatible = "amlogic, snd-tdmb"; #sound-dai-cells = <0>; - dai-tdm-lane-slot-mask-in = <1 1 1 1>; + /*dai-tdm-lane-slot-mask-in = <1 1 1 1>;*/ + dai-tdm-lane-slot-mask-in = <0 0 0 1>; dai-tdm-clk-sel = <1>; tdm_from_ddr = <1>; tdm_to_ddr = <1>; @@ -947,7 +951,7 @@ compatible = "amlogic, snd-tdmc"; #sound-dai-cells = <0>; dai-tdm-lane-slot-mask-in = <0 1 0 0>; - dai-tdm-lane-slot-mask-out = <1 0 1 1>; + dai-tdm-lane-slot-mask-out = <0 0 1 1>; dai-tdm-clk-sel = <2>; tdm_from_ddr = <2>; tdm_to_ddr = <2>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s420.dts b/arch/arm64/boot/dts/amlogic/axg_s420.dts index e8695f5..87b64b9 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s420.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s420.dts @@ -21,7 +21,7 @@ / { model = "Amlogic"; - amlogic-dt-id= "axg_s420_1g"; + amlogic-dt-id = "axg_s420_1g"; compatible = "amlogic, axg"; interrupt-parent = <&gic>; #address-cells = <2>; diff --git a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts index d6bc95b..ba5fb22 100644 --- a/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts +++ b/arch/arm64/boot/dts/amlogic/axg_s420_v03.dts @@ -21,7 +21,7 @@ / { model = "Amlogic"; - amlogic-dt-id= "axg_s420_v03"; + amlogic-dt-id = "axg_s420_v03"; compatible = "amlogic, axg"; interrupt-parent = <&gic>; #address-cells = <2>; @@ -367,7 +367,7 @@ mclk-fs = <256>; continuous-clock; //bitclock-inversion; - frame-inversion; + //frame-inversion; bitclock-master = <&aml_tdmb>; frame-master = <&aml_tdmb>; cpu { @@ -378,8 +378,8 @@ dai-tdm-slot-width = <32>; }; codec { - sound-dai = <&tlv320adc3101_30 - &tlv320adc3101_32>; + sound-dai = <&tlv320adc3101_32>; + /*&tlv320adc3101_30>;*/ }; }; @@ -389,7 +389,7 @@ continuous-clock; /* tdmb clk using tdmc so no bclk-inv */ //bitclock-inversion; - frame-inversion; + //frame-inversion; bitclock-master = <&aml_tdmc>; frame-master = <&aml_tdmc>; cpu { @@ -738,7 +738,7 @@ compatible = "ti,tlv320adc3101"; #sound-dai-cells = <0>; reg = <0x18>; - status = "okay"; + status = "disable"; }; tlv320adc3101_34: tlv320adc3101_34@30 { compatible = "ti,tlv320adc3101"; @@ -763,7 +763,7 @@ dai-tdm-clk-sel = <0>; tdm_from_ddr = <0>; tdm_to_ddr = <0>; - clocks = <&clkc CLKID_MPLL2>; + clocks = <&clkc CLKID_MPLL0>; //&clkaudio CLKID_AUDIO_TDMOUTA //&clkaudio CLKID_AUDIO_MCLK_A>; clock-names = "mpll0", "gate", "mclk"; @@ -907,7 +907,7 @@ tdmout_c:tdmout_c { mux { - pins = "GPIOA_2", "GPIOA_3", "GPIOA_4";// "GPIOA_5"; + pins = "GPIOA_2", "GPIOA_3", "GPIOA_4"; function = "tdmc_out"; }; }; diff --git a/scripts/amlogic/mk_dtb_gx.sh b/scripts/amlogic/mk_dtb_gx.sh index 166faa0..46593c3 100755 --- a/scripts/amlogic/mk_dtb_gx.sh +++ b/scripts/amlogic/mk_dtb_gx.sh @@ -23,3 +23,7 @@ make ARCH=arm64 axg_a113d_skt.dtb || echo "Compile dtb Fail !!" make ARCH=arm64 axg_s400.dtb || echo "Compile dtb Fail !!" make ARCH=arm64 axg_s420.dtb || echo "Compile dtb Fail !!" + +make ARCH=arm64 axg_s400_v03.dtb || echo "Compile dtb Fail !!" + +make ARCH=arm64 axg_s420_v03.dtb || echo "Compile dtb Fail !!" -- 2.7.4