linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: dannym@scratchpost.org (Danny Milosavljevic)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v11 06/12] sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them.
Date: Fri,  9 Jun 2017 08:22:10 +0200	[thread overview]
Message-ID: <20170609062216.26807-7-dannym@scratchpost.org> (raw)
In-Reply-To: <20170609062216.26807-1-dannym@scratchpost.org>

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),

  parent reply	other threads:[~2017-06-09  6:22 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-09  6:22 [PATCH v11 00/12] sun4i-codec: Add Line-In, FM-In, Mic 2, Capture Source, Differential Line-In Danny Milosavljevic
2017-06-09  6:22 ` [PATCH v11 01/12] sun4i-codec: Add inputs: Mic2, Line Right, Line Left, FM Right, FM Left Danny Milosavljevic
2017-06-09  6:22 ` [PATCH v11 02/12] sun4i-codec: Add Differential Line Capture Switch and its routes Danny Milosavljevic
2017-06-09  7:29   ` Chen-Yu Tsai
2017-06-09  6:22 ` [PATCH v11 03/12] sun4i-codec: Add Line Playback Volume, FM Playback Volume, Mic Playback Volume, Capture Volume, Line Capture Volume Danny Milosavljevic
2017-06-09  6:22 ` [PATCH v11 04/12] sun4i-codec: Add Mic1 Capture Volume, Mic2 " Danny Milosavljevic
2017-06-09  7:45   ` Chen-Yu Tsai
2017-06-09  6:22 ` [PATCH 05/12] sun4i-codec: Move struct sun4i_codec_quirks further up Danny Milosavljevic
2017-06-09  7:46   ` Chen-Yu Tsai
2017-06-09  6:22 ` Danny Milosavljevic [this message]
2017-06-09  7:47   ` [PATCH v11 06/12] sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them Chen-Yu Tsai
2017-06-09  6:22 ` [PATCH v11 07/12] sun4i-codec: Add extra controls to sun4i_codec_quirks, sun7i_codec_quirks Danny Milosavljevic
2017-06-09  7:48   ` Chen-Yu Tsai
2017-06-09  6:22 ` [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
2017-06-09  6:22 ` [PATCH v11 09/12] sun4i-codec: Add Line Playback Switch, FM Playback Switch, Mic1 Playback Switch, Mic2 Playback Switch Danny Milosavljevic
2017-06-09  6:22 ` [PATCH v11 10/12] sun4i-codec: Add Left Capture Select, Right Capture Select Danny Milosavljevic
2017-06-09  6:22 ` [PATCH v11 11/12] sun4i-codec: Add MIC2 Pre-Amplifier Danny Milosavljevic
2017-06-09  6:22 ` [PATCH v11 12/12] sun4i-codec: Add routes for playback switches, Mic2, Capture Select Danny Milosavljevic
2017-06-09  7:14 ` [PATCH v11 00/12] sun4i-codec: Add Line-In, FM-In, Mic 2, Capture Source, Differential Line-In Chen-Yu Tsai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170609062216.26807-7-dannym@scratchpost.org \
    --to=dannym@scratchpost.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).