diff --git a/MAINTAINERS b/MAINTAINERS index 04238a7d9e3f..7cb297b0dbcd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13794,24 +13794,17 @@ AMLOGIC M8b M: Jianxin Pan F: arch/arm/boot/dts/amlogic> -ANLOGIC AUDIO +ANLOGIC AUDIO DRIVER M: Xing Wang -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 +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/* diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab301.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab301.dts index 80c67de60b5b..a5b02d1a24ba 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab301.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab301.dts @@ -319,7 +319,7 @@ }; tdmacodec: codec { //sound-dai = <&dummy_codec>; - sound-dai = <&ad82584f &tl1_codec>; + sound-dai = ; }; }; @@ -1715,7 +1715,7 @@ compatible = "ESMT, ad82584f"; #sound-dai-cells = <0>; reg = <0x31>; - status = "okay"; + status = "disabled"; reset_pin = <&gpio_ao GPIOAO_6 0>; }; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts index e9a2f5831d50..f2ebfbfb2425 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts @@ -319,7 +319,7 @@ }; tdmacodec: codec { //sound-dai = <&dummy_codec>; - sound-dai = <&ad82584f &tl1_codec>; + sound-dai = ; }; }; @@ -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 { diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts index 27b324dbf205..3e4bb2f26659 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab319.dts @@ -309,7 +309,7 @@ }; tdmacodec: codec { //sound-dai = <&dummy_codec>; - sound-dai = <&ad82584f &tl1_codec>; + sound-dai = ; }; }; @@ -1601,7 +1601,7 @@ compatible = "ESMT, ad82584f"; #sound-dai-cells = <0>; reg = <0x31>; - status = "okay"; + status = "disabled"; reset_pin = <&gpio_ao GPIOAO_6 0>; }; diff --git a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts index da62b76d605b..519816f23ae5 100644 --- a/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts +++ b/arch/arm/boot/dts/amlogic/tm2_t962x3_ab309.dts @@ -309,7 +309,7 @@ }; tdmacodec: codec { //sound-dai = <&dummy_codec>; - sound-dai = <&ad82584f &tl1_codec>; + sound-dai = ; }; }; @@ -1601,7 +1601,7 @@ compatible = "ESMT, ad82584f"; #sound-dai-cells = <0>; reg = <0x31>; - status = "okay"; + status = "disabled"; reset_pin = <&gpio_ao GPIOAO_6 0>; }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab301.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab301.dts index efd9c2a89ebc..6b7dd05d8667 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab301.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab301.dts @@ -315,7 +315,7 @@ }; tdmacodec: codec { //sound-dai = <&dummy_codec>; - sound-dai = <&ad82584f &tl1_codec>; + sound-dai = ; }; }; @@ -1674,7 +1674,7 @@ compatible = "ESMT, ad82584f"; #sound-dai-cells = <0>; reg = <0x31>; - status = "okay"; + status = "disabled"; reset_pin = <&gpio_ao GPIOAO_6 0>; }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts index 67d9771f9e53..6a8b3478d5ce 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts @@ -315,7 +315,7 @@ }; tdmacodec: codec { //sound-dai = <&dummy_codec>; - sound-dai = <&ad82584f &tl1_codec>; + sound-dai = ; }; }; @@ -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 { diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts index 531694c601ff..6308ca8d4771 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab319.dts @@ -308,7 +308,7 @@ }; tdmacodec: codec { //sound-dai = <&dummy_codec>; - sound-dai = <&ad82584f &tl1_codec>; + sound-dai = ; }; }; @@ -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>; }; diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts index 7746bfa6a7de..5ad6c9176784 100644 --- a/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts +++ b/arch/arm64/boot/dts/amlogic/tm2_t962x3_ab309.dts @@ -308,7 +308,7 @@ }; tdmacodec: codec { //sound-dai = <&dummy_codec>; - sound-dai = <&ad82584f &tl1_codec>; + sound-dai = ; }; }; @@ -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>; };