| Message ID | 20170524100607.29790-4-icenowy@aosc.io (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2cfeaec0ec896bc0b8aad2de28a3de4572c7e4a1 |
| Headers | show |
On Wed, May 24, 2017 at 06:06:01PM +0800, Icenowy Zheng wrote: > 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> > --- > Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt | 1 + > sound/soc/sunxi/sun8i-codec-analog.c | 9 +++++++++ > 2 files changed, 10 insertions(+) Acked-by: Rob Herring <robh@kernel.org>
On Thu, May 25, 2017 at 11:58:37AM +0800, Chen-Yu Tsai wrote: > On Wed, May 24, 2017 at 6:06 PM, Icenowy Zheng <icenowy@aosc.io> wrote: > > 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> > > Mark, please hold off on applying this patch until the comments from the > previous patch have been addressed. They should be applied in order. > > > --- > > Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt | 1 + > > sound/soc/sunxi/sun8i-codec-analog.c | 9 +++++++++ > > Also, is there a preference for splitting out device tree binding > changes from driver changes? Yes, but not necessary for a 1 line change. Rob
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 4c34a12b3739..465d53fa93ac 100644 --- a/sound/soc/sunxi/sun8i-codec-analog.c +++ b/sound/soc/sunxi/sun8i-codec-analog.c @@ -808,6 +808,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; @@ -882,6 +887,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);