From 4cc7c912e14e439deae9cc2691c5e28dcffe092b Mon Sep 17 00:00:00 2001 From: Zhe Wang Date: Mon, 15 Apr 2019 16:32:43 +0800 Subject: [PATCH] audio: AB311 bringup, init 2 AMPs AD82584f [1/1] PD#SWPL-7174 Problem: spk is out of work on AB311 Solution: bringup AMP ad82584f Verify: AB311 Change-Id: I8771fc204b19eeebed5247ec4c8984acbf004372 Signed-off-by: Zhe Wang --- .../arm/boot/dts/amlogic/tm2_t962e2_ab311.dts | 25 ++++++++++++------- .../boot/dts/amlogic/tm2_t962e2_ab311.dts | 25 +++++++++++++------ 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts index d92de5e54fb6..a6ea1f07e6b0 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts @@ -320,12 +320,12 @@ }; tdmacodec: codec { //sound-dai = <&dummy_codec>; - sound-dai = ; + prefix-names = "AMP", "AMP1"; + sound-dai = <&ad82584f &ad82584f1 &tl1_codec>; }; }; aml-audio-card,dai-link@1 { - status = "disabled"; format = "i2s"; mclk-fs = <256>; @@ -1417,8 +1417,8 @@ pinctrl-names = "spdif_pins", "spdif_pins_mute"; - pinctrl-0 = <&spdifout_a>; - pinctrl-1 = <&spdifout_a_mute>; + pinctrl-0 = <&spdifin_a>; + //pinctrl-1 = <&spdifout_a_mute>; /* * whether do asrc for pcm and resample a or b @@ -1727,12 +1727,19 @@ pinctrl-0=<&i2c3_h1_pins>; clock-frequency = <400000>; - ad82584f: ad82584f@62 { + ad82584f: ad82584f@60 { + compatible = "ESMT, ad82584f"; + #sound-dai-cells = <0>; + reg = <0x30>; + status = "okay"; + reset_pin = <&gpio GPIOH_13 0>; + no_mclk; + }; + ad82584f1: ad82584f@62 { compatible = "ESMT, ad82584f"; #sound-dai-cells = <0>; reg = <0x31>; - status = "disabled"; - reset_pin = <&gpio GPIOH_13 0>; + status = "okay"; no_mclk; }; }; @@ -1833,8 +1840,8 @@ ðmac { status = "okay"; - pinctrl-names = "internal_eth_pins"; - pinctrl-0 = <&internal_eth_pins>; + //pinctrl-names = "internal_eth_pins"; + //pinctrl-0 = <&internal_eth_pins>; mc_val = <0x4be04>; internal_phy=<1>; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts index c81834076863..4cf33f45b697 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts @@ -316,7 +316,8 @@ }; tdmacodec: codec { //sound-dai = <&dummy_codec>; - sound-dai = ; + prefix-names = "AMP", "AMP1"; + sound-dai = <&ad82584f &ad82584f1 &tl1_codec>; }; }; @@ -1411,8 +1412,8 @@ pinctrl-names = "spdif_pins", "spdif_pins_mute"; - pinctrl-0 = <&spdifout_a>; - pinctrl-1 = <&spdifout_a_mute>; + pinctrl-0 = <&spdifin_a>; + //pinctrl-1 = <&spdifout_a_mute>; /* * whether do asrc for pcm and resample a or b @@ -1686,12 +1687,20 @@ pinctrl-0=<&i2c3_h1_pins>; clock-frequency = <400000>; - ad82584f: ad82584f@62 { + ad82584f: ad82584f@60 { + compatible = "ESMT, ad82584f"; + #sound-dai-cells = <0>; + reg = <0x30>; + status = "okay"; + reset_pin = <&gpio GPIOH_13 0>; + no_mclk; + }; + + ad82584f1: ad82584f@62 { compatible = "ESMT, ad82584f"; #sound-dai-cells = <0>; reg = <0x31>; - status = "disabled"; - reset_pin = <&gpio GPIOH_13 0>; + status = "okay"; no_mclk; }; }; @@ -1793,8 +1802,8 @@ ðmac { status = "okay"; - pinctrl-names = "internal_eth_pins"; - pinctrl-0 = <&internal_eth_pins>; + //pinctrl-names = "internal_eth_pins"; + //pinctrl-0 = <&internal_eth_pins>; mc_val = <0x4be04>; internal_phy=<1>;