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

Groups > linux.kernel > #1661971

[PATCH v11 06/12] sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them.

Show all headers | View raw

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 sound/soc/sunxi/sun4i-codec.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index f56a59ad..b1da14d1 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -897,9 +897,22 @@ struct sun4i_codec_quirks {
 	unsigned int reg_dac_txdata;	/* TX FIFO offset for DMA config */
 	unsigned int reg_adc_rxdata;	/* RX FIFO offset for DMA config */
 	bool has_reset;
+	const struct snd_kcontrol_new *controls;
+	unsigned int num_controls;
 };
 
+static int sun4i_codec_codec_probe(struct snd_soc_codec *scodec)
+{
+	const struct sun4i_codec_quirks *quirks;
+
+	quirks = of_device_get_match_data(scodec->dev);
+	return snd_soc_add_codec_controls(scodec,
+					  quirks->controls,
+					  quirks->num_controls);
+}
+
 static struct snd_soc_codec_driver sun4i_codec_codec = {
+	.probe = sun4i_codec_codec_probe,
 	.component_driver = {
 		.controls		= sun4i_codec_controls,
 		.num_controls		= ARRAY_SIZE(sun4i_codec_controls),

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

Thread

[PATCH v11 00/12] sun4i-codec: Add Line-In, FM-In, Mic 2,  Capture Source, Differential Line-In Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 12/12] sun4i-codec: Add routes for playback switches, Mic2, Capture Select. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 10/12] sun4i-codec: Add Left Capture Select, Right Capture Select. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 07/12] sun4i-codec: Add extra controls to sun4i_codec_quirks, sun7i_codec_quirks. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
    Re: [PATCH v11 07/12] sun4i-codec: Add extra controls to  sun4i_codec_quirks, sun7i_codec_quirks. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
  [PATCH v11 09/12] sun4i-codec: Add Line Playback Switch, FM Playback Switch, Mic1 Playback Switch, Mic2 Playback Switch. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 02/12] sun4i-codec: Add Differential Line Capture Switch and its routes Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
    Re: [PATCH v11 02/12] sun4i-codec: Add Differential Line Capture  Switch and its routes Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:40 +0200
  [PATCH v11 11/12] sun4i-codec: Add MIC2 Pre-Amplifier. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 03/12] sun4i-codec: Add Line Playback Volume, FM Playback Volume, Mic Playback Volume, Capture Volume, Line Capture Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH 05/12] sun4i-codec: Move struct sun4i_codec_quirks further up. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
    Re: [PATCH 05/12] sun4i-codec: Move struct sun4i_codec_quirks further up. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
  [PATCH v11 04/12] sun4i-codec: Add Mic1 Capture Volume, Mic2 Capture Volume. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
    Re: [PATCH v11 04/12] sun4i-codec: Add Mic1 Capture Volume, Mic2  Capture Volume. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
  [PATCH v11 06/12] sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
    Re: [PATCH v11 06/12] sun4i-codec: Add support for extra controls to  struct sun4i_codec_quirks and use them. Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:50 +0200
  [PATCH v11 01/12] sun4i-codec: Add inputs: Mic2, Line Right, Line Left, FM Right, FM Left. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  [PATCH v11 08/12] sun4i-codec: Merge sun4i_codec_left_mixer_controls and sun4i_codec_right_mixer_controls into sun4i_codec_mixer_controls. Danny Milosavljevic <dannym@scratchpost.org> - 2017-06-09 08:30 +0200
  Re: [PATCH v11 00/12] sun4i-codec: Add Line-In, FM-In, Mic 2, Capture  Source, Differential Line-In Chen-Yu Tsai <wens@csie.org> - 2017-06-09 09:20 +0200

csiph-web