From 105c91184a3b69a59cc3f93fffa1bec0ae31e9ac Mon Sep 17 00:00:00 2001 From: Xing Wang Date: Fri, 19 Jan 2018 23:07:58 +0800 Subject: [PATCH] audio: dts: fix i2c for tas5707 and i2s pinmux PD#159131: audio: dts : fix i2c for tas5707 and i2s pinmux Change-Id: Ic4a2de8b5dcba668a793bf0c0c17d660418933b2 Signed-off-by: Xing Wang --- .../boot/dts/amlogic/txlx_t962x_r311_1g.dts | 24 +++++++------------ .../boot/dts/amlogic/txlx_t962x_r311_2g.dts | 24 +++++++------------ 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts index bf2cddde33f5..8cb782b14875 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts @@ -1158,7 +1158,7 @@ pinctrl-names = "audio_i2s"; pinctrl-0 = <&aml_audio_i2s>; /*avout mute gpio*/ - mute_gpio-gpios = <&gpio GPIOZ_7 GPIO_ACTIVE_HIGH>; + mute_gpio-gpios = <&gpio GPIODV_5 GPIO_ACTIVE_HIGH>; /*analog amp mute*/ /*amp_mute_gpio-gpios = <&gpio GPIOZ_18 GPIO_ACTIVE_LOW>;*/ aux_dev = <&tas5707>; @@ -1360,17 +1360,17 @@ }; /* end of / */ -&i2c0 { +&i2c2 { status = "okay"; pinctrl-names="default"; - pinctrl-0=<&i2c0_z_pins>; + pinctrl-0=<&i2c2_h_pins>; tas5707: tas5707@36 { compatible = "ti,tas5707"; #sound-dai-cells = <0>; codec_name = "tas5707"; reg = <0x1B>; - reset_pin = <&gpio GPIOZ_13 GPIO_ACTIVE_LOW>; + reset_pin = <&gpio GPIODV_4 GPIO_ACTIVE_LOW>; eq_enable = <0>; drc_enable = <0>; status = "okay"; @@ -1381,18 +1381,10 @@ /*i2s*/ aml_audio_i2s: aml_audio_i2s { mux { - groups = "i2s_mclk_z", - "i2s_sclk_z", - "i2s_lrclk_z", - "i2s_dout01_z" - //, "i2s_dout23_z15" - //, "i2s_dout45_z" - //, "i2s_dout67_z19" - //, "i2s_din01_h6" - //, "i2s_din23_h5" - //, "i2s_din23_h5" - //, "i2s_din67_h0" - ; + groups = "i2s_mclk_h", + "i2s_sclk_h", + "i2s_lrclk_h", + "i2s_dout01_h6"; function = "i2s"; }; }; diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts index d17698ad5d50..34406611d3c3 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts @@ -1158,7 +1158,7 @@ pinctrl-names = "audio_i2s"; pinctrl-0 = <&aml_audio_i2s>; /*avout mute gpio*/ - mute_gpio-gpios = <&gpio GPIOZ_7 GPIO_ACTIVE_HIGH>; + mute_gpio-gpios = <&gpio GPIODV_5 GPIO_ACTIVE_HIGH>; /*analog amp mute*/ /*amp_mute_gpio-gpios = <&gpio GPIOZ_18 GPIO_ACTIVE_LOW>;*/ aux_dev = <&tas5707>; @@ -1360,17 +1360,17 @@ }; /* end of / */ -&i2c0 { +&i2c2 { status = "okay"; pinctrl-names="default"; - pinctrl-0=<&i2c0_z_pins>; + pinctrl-0=<&i2c2_h_pins>; tas5707: tas5707@36 { compatible = "ti,tas5707"; #sound-dai-cells = <0>; codec_name = "tas5707"; reg = <0x1B>; - reset_pin = <&gpio GPIOZ_13 GPIO_ACTIVE_LOW>; + reset_pin = <&gpio GPIODV_4 GPIO_ACTIVE_LOW>; eq_enable = <0>; drc_enable = <0>; status = "okay"; @@ -1381,18 +1381,10 @@ /*i2s*/ aml_audio_i2s: aml_audio_i2s { mux { - groups = "i2s_mclk_z", - "i2s_sclk_z", - "i2s_lrclk_z", - "i2s_dout01_z" - //, "i2s_dout23_z15" - //, "i2s_dout45_z" - //, "i2s_dout67_z19" - //, "i2s_din01_h6" - //, "i2s_din23_h5" - //, "i2s_din23_h5" - //, "i2s_din67_h0" - ; + groups = "i2s_mclk_h", + "i2s_sclk_h", + "i2s_lrclk_h", + "i2s_dout01_h6"; function = "i2s"; }; };