Unverified Commit 1e15dd6f authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "Add mediatek codec mt6359 driver" from Jiaxin Yu <jiaxin.yu@mediatek.com>: 

Add mediatek codec (MT6359) driver

MT6359 support playback and capture feature.

On downlink path, it includes three DACs for handset, headset,
and lineout path. On unlink path, it includeds three ADCs for
main mic, second mic, 3rd mic, and headset mic.

By scenario, select *_MUX widget to create damp path.
And by select mic_type_mux to choose DMIC/AMIC/....

For example, select these MUX widget to create headset path
(1) DAC In Mux --> "Normal Path"
(2) HP Mux --> "Audio Playback"

v6 changes:
	1. Remove the compatible string in mt6359codec because MFD should be registering the platform device.

v5 changes:
	1. Don't need to unregister the component whic is already relegated to devm.
	2. patchwork link:
		https://patchwork.kernel.org/cover/11716387/
		https://patchwork.kernel.org/patch/11717757/
		https://patchwork.kernel.org/patch/11716491/

v4 changes:
	1. Add a remove() function to undo regulator_enable().
	2. Removed unnecessary logs.
	3. patchwork link:
		https://patchwork.kernel.org/cover/11715553/
		https://patchwork.kernel.org/patch/11716015/
		https://patchwork.kernel.org/patch/11715557/

v3 changes:
	1. patchwork link:
		https://patchwork.kernel.org/cover/11714291/
		https://patchwork.kernel.org/patch/11714295/
		https://patchwork.kernel.org/patch/11714339/

v2 changes:
	1. patchwork link:
		https://patchwork.kernel.org/cover/11706935/
		https://patchwork.kernel.org/patch/11708865/
		https://patchwork.kernel.org/patch/11706937/

v1 changes:
	1.lkml link:
		https://lkml.org/lkml/2020/3/5/1257

Jiaxin Yu (2):
  ASoC: mediatek: mt6359: add codec driver
  dt-bindings: mediatek: mt6359: add codec document

 .../devicetree/bindings/sound/mt6359.yaml     |   61 +
 sound/soc/codecs/Kconfig                      |    8 +
 sound/soc/codecs/Makefile                     |    2 +
 sound/soc/codecs/mt6359.c                     | 2753 +++++++++++++++++
 sound/soc/codecs/mt6359.h                     | 2640 ++++++++++++++++
 5 files changed, 5464 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/mt6359.yaml
 create mode 100644 sound/soc/codecs/mt6359.c
 create mode 100644 sound/soc/codecs/mt6359.h

--
2.18.0
parents a467f2f8 539237d1

Documentation/devicetree/bindings/sound/mt6359.yaml

0 → 100644
+61 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

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

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



title: Mediatek MT6359 Codec Device Tree Bindings



maintainers:

  - Eason Yen <eason.yen@mediatek.com>

  - Jiaxin Yu <jiaxin.yu@mediatek.com>

  - Shane Chien <shane.chien@mediatek.com>



description: |

  The communication between MT6359 and SoC is through Mediatek PMIC wrapper.

  For more detail, please visit Mediatek PMIC wrapper documentation.

  Must be a child node of PMIC wrapper.



properties:

  mediatek,dmic-mode:

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

    description: |

      Indicates how many data pins are used to transmit two channels of PDM

      signal. 0 means two wires, 1 means one wire. Default value is 0.

    enum:

      - 0 # one wire

      - 1 # two wires



  mediatek,mic-type-0:

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

    description: |

      Specifies the type of mic type connected to adc0



    enum:

      - 0 # IDLE - mic in turn-off status

      - 1 # ACC - analog mic with alternating coupling

      - 2 # DMIC - digital mic

      - 3 # DCC - analog mic with direct couping

      - 4 # DCC_ECM_DIFF - analog electret condenser mic with differential mode

      - 5 # DCC_ECM_SINGLE - analog electret condenser mic with single mode



  mediatek,mic-type-1:

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

    description: |

      Specifies the type of mic type connected to adc1



  mediatek,mic-type-2:

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

    description: |

      Specifies the type of mic type connected to adc2



additionalProperties: false



examples:

  - |

    mt6359codec: mt6359codec {

      mediatek,dmic-mode = <0>;

      mediatek,mic-type-0 = <2>;

    };



...

sound/soc/codecs/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ config SND_SOC_ALL_CODECS 
	imply SND_SOC_ML26124

	imply SND_SOC_MT6351

	imply SND_SOC_MT6358

	imply SND_SOC_MT6359

	imply SND_SOC_MT6660

	imply SND_SOC_NAU8540

	imply SND_SOC_NAU8810
@@ -1724,6 +1725,13 @@ config SND_SOC_MT6358 
	  Enable support for the platform which uses MT6358 as

	  external codec device.



config SND_SOC_MT6359

	tristate "MediaTek MT6359 Codec"

	depends on MTK_PMIC_WRAP

	help

	  Enable support for the platform which uses MT6359 as

	  external codec device.



config SND_SOC_MT6660

	tristate "Mediatek MT6660 Speaker Amplifier"

	depends on I2C

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ snd-soc-msm8916-analog-objs := msm8916-wcd-analog.o 
snd-soc-msm8916-digital-objs := msm8916-wcd-digital.o

snd-soc-mt6351-objs := mt6351.o

snd-soc-mt6358-objs := mt6358.o

snd-soc-mt6359-objs := mt6359.o

snd-soc-mt6660-objs := mt6660.o

snd-soc-nau8540-objs := nau8540.o

snd-soc-nau8810-objs := nau8810.o
@@ -431,6 +432,7 @@ obj-$(CONFIG_SND_SOC_MSM8916_WCD_ANALOG) +=snd-soc-msm8916-analog.o 
obj-$(CONFIG_SND_SOC_MSM8916_WCD_DIGITAL) +=snd-soc-msm8916-digital.o

obj-$(CONFIG_SND_SOC_MT6351)	+= snd-soc-mt6351.o

obj-$(CONFIG_SND_SOC_MT6358)	+= snd-soc-mt6358.o

obj-$(CONFIG_SND_SOC_MT6359)	+= snd-soc-mt6359.o

obj-$(CONFIG_SND_SOC_MT6660)	+= snd-soc-mt6660.o

obj-$(CONFIG_SND_SOC_NAU8540)   += snd-soc-nau8540.o

obj-$(CONFIG_SND_SOC_NAU8810)   += snd-soc-nau8810.o

sound/soc/codecs/mt6359.c

0 → 100644
+2753 −0

File added.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/mt6359.h

0 → 100644
+2640 −0

File added.

Preview size limit exceeded, changes collapsed.