Unverified Commit e0e1d166 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: mediatek: Add support for MT8195 sound card with max98390 and rt5682 

Merge series from Trevor Wu <trevor.wu@mediatek.com>:

This series of patches adds support for mt8195 board with mt6359, max98390
and rt5682.  To prevent from copy-paste components, mt8195 machine
drivers and dt-bindings are merged in the patch.
parents 514ed489 cae34da5

Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml

deleted100644 → 0
+0 −51
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/mt8195-mt6359-rt1011-rt5682.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Mediatek MT8195 with MT6359, RT1011 and RT5682 ASoC sound card driver



maintainers:

  - Trevor Wu <trevor.wu@mediatek.com>



description:

  This binding describes the MT8195 sound card with RT1011 and RT5682.



properties:

  compatible:

    const: mediatek,mt8195_mt6359_rt1011_rt5682



  model:

    $ref: /schemas/types.yaml#/definitions/string

    description: User specified audio sound card name



  mediatek,platform:

    $ref: "/schemas/types.yaml#/definitions/phandle"

    description: The phandle of MT8195 ASoC platform.



  mediatek,dptx-codec:

    $ref: "/schemas/types.yaml#/definitions/phandle"

    description: The phandle of MT8195 Display Port Tx codec node.



  mediatek,hdmi-codec:

    $ref: "/schemas/types.yaml#/definitions/phandle"

    description: The phandle of MT8195 HDMI codec node.



additionalProperties: false



required:

  - compatible

  - mediatek,platform



examples:

  - |



    sound: mt8195-sound {

        compatible = "mediatek,mt8195_mt6359_rt1011_rt5682";

        mediatek,platform = <&afe>;

        pinctrl-names = "default";

        pinctrl-0 = <&aud_pins_default>;

    };



...

Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml→Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml

+6 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/mt8195-mt6359-rt1019-rt5682.yaml#

$id: http://devicetree.org/schemas/sound/mt8195-mt6359.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Mediatek MT8195 with MT6359, RT1019 and RT5682 ASoC sound card driver

title: MediaTek MT8195 ASoC sound card driver



maintainers:

  - Trevor Wu <trevor.wu@mediatek.com>
@@ -14,7 +14,10 @@ description: 


properties:

  compatible:

    const: mediatek,mt8195_mt6359_rt1019_rt5682

    enum:

      - mediatek,mt8195_mt6359_rt1019_rt5682

      - mediatek,mt8195_mt6359_rt1011_rt5682

      - mediatek,mt8195_mt6359_max98390_rt5682



  model:

    $ref: /schemas/types.yaml#/definitions/string

sound/soc/mediatek/Kconfig

+6 −20
Original line number Diff line number Diff line
@@ -198,34 +198,20 @@ config SND_SOC_MT8195 
	  Select Y if you have such device.

	  If unsure select "N".



config SND_SOC_MT8195_MT6359_RT1019_RT5682

	tristate "ASoC Audio driver for MT8195 with MT6359 RT1019 RT5682 codec"

	depends on I2C && GPIOLIB

	depends on SND_SOC_MT8195 && MTK_PMIC_WRAP

	select SND_SOC_MT6359

	select SND_SOC_RT1015P

	select SND_SOC_RT5682_I2C

	select SND_SOC_RT5682S

	select SND_SOC_DMIC

	select SND_SOC_HDMI_CODEC

	help

	  This adds ASoC driver for Mediatek MT8195 boards

	  with the MT6359 RT1019 RT5682 audio codec.

	  Select Y if you have such device.

	  If unsure select "N".



config SND_SOC_MT8195_MT6359_RT1011_RT5682

	tristate "ASoC Audio driver for MT8195 with MT6359 RT1011 RT5682 codec"

config SND_SOC_MT8195_MT6359

	tristate "ASoC Audio driver for MT8195 with MT6359 and I2S codecs"

	depends on I2C && GPIOLIB

	depends on SND_SOC_MT8195 && MTK_PMIC_WRAP

	select SND_SOC_MT6359

	select SND_SOC_RT1011

	select SND_SOC_RT1015P

	select SND_SOC_RT5682_I2C

	select SND_SOC_RT5682S

	select SND_SOC_MAX98390

	select SND_SOC_DMIC

	select SND_SOC_HDMI_CODEC

	help

	  This adds ASoC driver for Mediatek MT8195 boards

	  with the MT6359 RT1011 RT5682 audio codec.

	  This adds support for ASoC machine driver for Mediatek MT8195

	  boards with the MT6359 and other I2S audio codecs.

	  Select Y if you have such device.

	  If unsure select "N".

sound/soc/mediatek/mt8195/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -12,5 +12,4 @@ snd-soc-mt8195-afe-objs := \ 
obj-$(CONFIG_SND_SOC_MT8195) += snd-soc-mt8195-afe.o



# machine driver

obj-$(CONFIG_SND_SOC_MT8195_MT6359_RT1019_RT5682) += mt8195-mt6359-rt1019-rt5682.o

obj-$(CONFIG_SND_SOC_MT8195_MT6359_RT1011_RT5682) += mt8195-mt6359-rt1011-rt5682.o
 
obj-$(CONFIG_SND_SOC_MT8195_MT6359) += mt8195-mt6359.o

sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c

deleted100644 → 0
+0 −1198

File deleted.

Preview size limit exceeded, changes collapsed.