Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1657600

[PATCH v4 2/3] ASoC: sun8i-codec-analog: add support for V3s SoC

Show all headers | View raw

From: Icenowy Zheng <icenowy@aosc.xyz>

The V3s SoC features an analog codec with headphone support but without
mic2 and linein.

Add support for it.

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Rob Herring <robh@kernel.org>
---
Changes in v4:
- Added Chen-Yu's Reviewed-By.
- Added Rob's ACK.

 Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt | 1 +
 sound/soc/sunxi/sun8i-codec-analog.c                           | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt
index 779b735781ba..1b6e7c4e50ab 100644
--- a/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt
+++ b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt
@@ -4,6 +4,7 @@ Required properties:
 - compatible: must be one of the following compatibles:
 		- "allwinner,sun8i-a23-codec-analog"
 		- "allwinner,sun8i-h3-codec-analog"
+		- "allwinner,sun8i-v3s-codec-analog"
 
 Required properties if not a sub-node of the PRCM node:
 - reg: must contain the registers location and length
diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c
index 29c446068151..485e79f292c4 100644
--- a/sound/soc/sunxi/sun8i-codec-analog.c
+++ b/sound/soc/sunxi/sun8i-codec-analog.c
@@ -810,6 +810,11 @@ static int sun8i_codec_analog_add_mixer(struct snd_soc_component *cmpnt,
 	return 0;
 }
 
+static const struct sun8i_codec_analog_quirks sun8i_v3s_quirks = {
+	.has_headphone	= true,
+	.has_hmic	= true,
+};
+
 static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt)
 {
 	struct device *dev = cmpnt->dev;
@@ -886,6 +891,10 @@ static const struct of_device_id sun8i_codec_analog_of_match[] = {
 		.compatible = "allwinner,sun8i-h3-codec-analog",
 		.data = &sun8i_h3_quirks,
 	},
+	{
+		.compatible = "allwinner,sun8i-v3s-codec-analog",
+		.data = &sun8i_v3s_quirks,
+	},
 	{}
 };
 MODULE_DEVICE_TABLE(of, sun8i_codec_analog_of_match);
-- 
2.12.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 0/3] Allwinner V3s audio codec support (ASoC part) Icenowy Zheng <icenowy@aosc.io> - 2017-06-05 15:30 +0200
  [PATCH v4 1/3] ASoC: sun8i-codec-analog: prepare a mixer control/widget/route set for V3s Icenowy Zheng <icenowy@aosc.io> - 2017-06-05 15:30 +0200
    Re: [linux-sunxi] [PATCH v4 1/3] ASoC: sun8i-codec-analog: prepare a  mixer control/widget/route set for V3s Chen-Yu Tsai <wens@csie.org> - 2017-06-06 16:10 +0200
    Applied "ASoC: sun8i-codec-analog: prepare a mixer control/widget/route set for V3s" to the asoc tree Mark Brown <broonie@kernel.org> - 2017-06-06 21:10 +0200
  [PATCH v4 2/3] ASoC: sun8i-codec-analog: add support for V3s SoC Icenowy Zheng <icenowy@aosc.io> - 2017-06-05 15:40 +0200
  [PATCH v4 3/3] ASoC: sun4i-codec: Add support for V3s codec Icenowy Zheng <icenowy@aosc.io> - 2017-06-05 15:50 +0200
    Re: [linux-sunxi] [PATCH v4 3/3] ASoC: sun4i-codec: Add support for  V3s codec Chen-Yu Tsai <wens@csie.org> - 2017-06-06 16:10 +0200

csiph-web