audio: TM2: disable spk on skt board [1/1]

PD#SWPL-6721

Problem:
audio block start.

Solution:
disable spk on dts setting.

Verify:
Verified on T962e2_ab311

Change-Id: I85da808dad14d0b16b66ea4e07276980c6896aa4
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
This commit is contained in:
Zhe Wang
2019-04-03 22:53:30 +08:00
committed by Jianxiong Pan
parent 7bcfa1847f
commit 0b4d894b68
9 changed files with 53 additions and 45 deletions

View File

@@ -13794,24 +13794,17 @@ AMLOGIC M8b
M: Jianxin Pan <jianxin.pan@amlogic.com>
F: arch/arm/boot/dts/amlogic>
ANLOGIC AUDIO
ANLOGIC AUDIO DRIVER
M: Xing Wang <xing.wang@amlogic.com>
F: arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts
F: arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts
F: arch/arm64/boot/dts/amlogic/gxl_p230_2g.dts
F: arch/arm64/boot/dts/amlogic/gxm_q200_2g.dts
F: arch/arm64/boot/dts/amlogic/gxm_skt.dts
F: arch/arm64/boot/dts/amlogic/mesongxl.dtsi
F: arch/arm64/boot/dts/amlogic/mesongxm.dtsi
M: Zhe Wang <Zhe.Wang@amlogic.com>
F: arch/arm64/boot/dts/amlogic/*
F: arch/arm/boot/dts/amlogic/*
F: arch/arm64/configs/meson64_defconfig
F: drivers/amlogic/clk/clk-mpll.c
F: drivers/amlogic/clk/clk_misc.c
F: drivers/amlogic/clk/clkc.h
F: drivers/amlogic/clk/gxl.c
F: drivers/amlogic/clk/*
F: drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
F: drivers/amlogic/pinctrl/pinctrl_gxl.c
F: include/dt-bindings/clock/amlogic,gxl-clkc.h
F: include/linux/amlogic/media/sound/audin_regs.h
F: drivers/amlogic/pinctrl/*
F: include/dt-bindings/clock/*
F: include/linux/amlogic/media/sound/*
F: sound/soc/Kconfig
F: sound/soc/Makefile
F: sound/soc/amlogic/*

View File

@@ -319,7 +319,7 @@
};
tdmacodec: codec {
//sound-dai = <&dummy_codec>;
sound-dai = <&ad82584f &tl1_codec>;
sound-dai = </*&ad82584f*/ &tl1_codec>;
};
};
@@ -1715,7 +1715,7 @@
compatible = "ESMT, ad82584f";
#sound-dai-cells = <0>;
reg = <0x31>;
status = "okay";
status = "disabled";
reset_pin = <&gpio_ao GPIOAO_6 0>;
};

View File

@@ -319,7 +319,7 @@
};
tdmacodec: codec {
//sound-dai = <&dummy_codec>;
sound-dai = <&ad82584f &tl1_codec>;
sound-dai = </*&ad82584f*/ &tl1_codec>;
};
};
@@ -1594,10 +1594,10 @@
};
tdmout_a: tdmout_a {
mux { /* GPIOZ_1, GPIOZ_2, GPIOZ_3 */
groups = "tdma_sclk_z",
"tdma_fs_z",
"tdma_dout0_z";
mux { /* GPIOH_5, GPIOH_6, GPIOH_7 */
groups = "tdma_fs_h",
"tdma_sclk_h",
"tdma_dout0_h";
function = "tdma_out";
bias-pull-down;
};
@@ -1698,7 +1698,7 @@
};
&i2c2 {
status = "okay";
status = "disabled";
pinctrl-names="default";
pinctrl-0=<&i2c2_z_pins>;
clock-frequency = <400000>;
@@ -1710,15 +1710,22 @@
reg = <0x2d>;
status = "disable";
};
};
&i2c3 {
status = "okay";
pinctrl-names="default";
pinctrl-0=<&i2c3_h1_pins>;
clock-frequency = <400000>;
ad82584f: ad82584f@62 {
compatible = "ESMT, ad82584f";
#sound-dai-cells = <0>;
reg = <0x31>;
status = "okay";
reset_pin = <&gpio_ao GPIOAO_6 0>;
status = "disabled";
reset_pin = <&gpio GPIOH_13 0>;
no_mclk;
};
};
&sd_emmc_c {

View File

@@ -309,7 +309,7 @@
};
tdmacodec: codec {
//sound-dai = <&dummy_codec>;
sound-dai = <&ad82584f &tl1_codec>;
sound-dai = </*&ad82584f*/ &tl1_codec>;
};
};
@@ -1601,7 +1601,7 @@
compatible = "ESMT, ad82584f";
#sound-dai-cells = <0>;
reg = <0x31>;
status = "okay";
status = "disabled";
reset_pin = <&gpio_ao GPIOAO_6 0>;
};

View File

@@ -309,7 +309,7 @@
};
tdmacodec: codec {
//sound-dai = <&dummy_codec>;
sound-dai = <&ad82584f &tl1_codec>;
sound-dai = </*&ad82584f*/ &tl1_codec>;
};
};
@@ -1601,7 +1601,7 @@
compatible = "ESMT, ad82584f";
#sound-dai-cells = <0>;
reg = <0x31>;
status = "okay";
status = "disabled";
reset_pin = <&gpio_ao GPIOAO_6 0>;
};

View File

@@ -315,7 +315,7 @@
};
tdmacodec: codec {
//sound-dai = <&dummy_codec>;
sound-dai = <&ad82584f &tl1_codec>;
sound-dai = </*&ad82584f*/ &tl1_codec>;
};
};
@@ -1674,7 +1674,7 @@
compatible = "ESMT, ad82584f";
#sound-dai-cells = <0>;
reg = <0x31>;
status = "okay";
status = "disabled";
reset_pin = <&gpio_ao GPIOAO_6 0>;
};

View File

@@ -315,7 +315,7 @@
};
tdmacodec: codec {
//sound-dai = <&dummy_codec>;
sound-dai = <&ad82584f &tl1_codec>;
sound-dai = </*&ad82584f*/ &tl1_codec>;
};
};
@@ -1553,10 +1553,10 @@
};
tdmout_a: tdmout_a {
mux { /* GPIOZ_1, GPIOZ_2, GPIOZ_3 */
groups = "tdma_sclk_z",
"tdma_fs_z",
"tdma_dout0_z";
mux { /* GPIOH_5, GPIOH_6, GPIOH_7 */
groups = "tdma_fs_h",
"tdma_sclk_h",
"tdma_dout0_h";
function = "tdma_out";
bias-pull-down;
};
@@ -1657,7 +1657,7 @@
};
&i2c2 {
status = "okay";
status = "disabled";
pinctrl-names="default";
pinctrl-0=<&i2c2_z_pins>;
clock-frequency = <400000>;
@@ -1669,17 +1669,25 @@
reg = <0x2d>;
status = "disable";
};
};
&i2c3 {
status = "okay";
pinctrl-names="default";
pinctrl-0=<&i2c3_h1_pins>;
clock-frequency = <400000>;
ad82584f: ad82584f@62 {
compatible = "ESMT, ad82584f";
#sound-dai-cells = <0>;
reg = <0x31>;
status = "okay";
reset_pin = <&gpio_ao GPIOAO_6 0>;
status = "disabled";
reset_pin = <&gpio GPIOH_13 0>;
no_mclk;
};
};
&sd_emmc_c {
status = "okay";
emmc {

View File

@@ -308,7 +308,7 @@
};
tdmacodec: codec {
//sound-dai = <&dummy_codec>;
sound-dai = <&ad82584f &tl1_codec>;
sound-dai = </*&ad82584f*/ &tl1_codec>;
};
};
@@ -1600,7 +1600,7 @@
compatible = "ESMT, ad82584f";
#sound-dai-cells = <0>;
reg = <0x0 0x31>;
status = "okay";
status = "disabled";
reset_pin = <&gpio_ao GPIOAO_6 0>;
};

View File

@@ -308,7 +308,7 @@
};
tdmacodec: codec {
//sound-dai = <&dummy_codec>;
sound-dai = <&ad82584f &tl1_codec>;
sound-dai = </*&ad82584f*/ &tl1_codec>;
};
};
@@ -1600,7 +1600,7 @@
compatible = "ESMT, ad82584f";
#sound-dai-cells = <0>;
reg = <0x0 0x31>;
status = "okay";
status = "disabled";
reset_pin = <&gpio_ao GPIOAO_6 0>;
};