On Sun, Mar 5, 2017 at 9:37 PM, Icenowy Zheng <icenowy@xxxxxxxx> wrote:
> The V3s SoC features an analog codec with headphone support but without
> mic2 and linein.
You should also make new mixer control sets, with out linein and mic2,
and split out the mixer widget for V3s. Otherwise ALSA is going to
export MIC2 and LineIn playback/capture switches to userspace, which
is going to be confusing to the user. We've never needed this in the
past because all SoCs shared the same set of mixer controls.
ChenYu
>
> Add support for it.
>
> Signed-off-by: Icenowy Zheng <icenowy@xxxxxxxx>
> ---
> 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 af56afe5c403..d87c75c6ad8e 100644
> --- a/sound/soc/sunxi/sun8i-codec-analog.c
> +++ b/sound/soc/sunxi/sun8i-codec-analog.c
> @@ -713,6 +713,11 @@ static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = {
> .has_mic2 = true,
> };
>
> +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;
> @@ -786,6 +791,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.11.1
>
> --
> You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@xxxxxxxxxxxxxxxx.
> For more options, visit https://groups.google.com/d/optout.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
