Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751293AbdFXG0C (ORCPT ); Sat, 24 Jun 2017 02:26:02 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:41260 "EHLO dd1012.kasserver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751215AbdFXG0A (ORCPT ); Sat, 24 Jun 2017 02:26:00 -0400 From: Danny Milosavljevic To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Maxime Ripard , Chen-Yu Tsai , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com Cc: Danny Milosavljevic Subject: [PATCH v13 00/14] ASoC: sun4i-codec: Add Line-In, FM-In, Mic 2, Capture Source, Differential Line-In Date: Sat, 24 Jun 2017 08:24:05 +0200 Message-Id: <20170624062419.23778-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.12.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3914 Lines: 100 This patchset adds some mixer controls to sun4i-codec for the Allwinner A10 and the Allwinner A20. It also adds a mux for the capture source and the PGA for the MIC2 preamp. Where possible, it uses SOC_DAPM_DOUBLE in order to cut down on the number of distinct controls in alsamixer. v13 changes compared to v12 are: - Added my "Signed-off-by". - Clarified some commit message text. v12 changes compared to v11 are: - Split up patchset in another way. - Renamed "Mic1 Capture Volume" to "Mic1 Boost Volume". - Renamed "Mic2 Capture Volume" to "Mic2 Boost Volume". - Renamed "Line Capture Volume" to "Line Boost Volume". - Renamed "Differential Line Capture Switch" to "Differential Line Source". v11 changes compared to v10 are: - Split up patchset. - Fixed typo in Differential Line Capture Switch. - Renamed "Non-Differential" value to "Stereo". - Removed duplicate PA Volume mixer control. v10 changes compared to v9 are: - Use SOC_DAPM_DOUBLE where possible and it makes sense in order to cut down on the number of controls. v9 changes compared to v8 are: - added Line Differential Capture Switch. - split Capture Source into Left Capture Select, Right Capture Select. - added Line Capture Volume. - rename "sun4i_codec_widgets" to "sun4i_codec_controls" for consistency with the struct field it's used in. - rename "Line-In" to "Line". - rename "Power Amplifier Playback Volume" to "Headphone Playback Volume". v8 changes compared to v7 are: - fixed the routes for line and mic capturing. v7 changes compared to v6 are: - preparation for different A20, A10 controls is now in an extra patch. - all register definitions are now at the top. - sun7i-specific things (A20-specific things) are now less grouped-together. - rename "Power Amplifier Volume" to "Power Amplifier Playback Volume". v6 changes compared to v5 are: - Mic preamplifier special cases for A20 and A10 now are now not icky: There are two different _widget arrays and the probe() function now selects the right one to pass to snd_soc_register_codec() unmodified. - sun7i-specific things (A20-specific things) are now grouped together. v5 changes compared to v4 are: - Mic preamplifier controls have more common names now. - Mic preamplifier scale has a 0 dB entry as well now, as documented in the A20 user manual. - Mic preamplifier has special cases for A20 and A10 now. - Gain controls have "Gain" in the name now. v4 changes compared to v3 are: - names of the input are not uppercase anymore. - bit index constants are now named as in the A20 user manual v1.4. - added Mic1-In, Mac2-In. - added Mic1 and Mic2 Pre-Amplifiers. v3 changes compared to v2 are: - added DAPM routes. v2 changes compared to v1 are: - moved Line-In and FM-In playback switches to their respective sun4i_codec_*_mixer_controls. v1 changes: - added linein, fmin output volumes and switches. Danny Milosavljevic (14): sun4i-codec: Add MIC2 Pre-Amplifier, Mic2 input, Mic2 routes. sun4i-codec: Add Mic Playback Volume. sun4i-codec: Add support for extra controls to struct sun4i_codec_quirks and use them. sun4i-codec: Add Mic1 Boost Volume, Mic2 Boost Volume. sun4i-codec: Merge sun4i_codec_left_mixer_controls and sun4i_codec_right_mixer_controls into sun4i_codec_mixer_controls. sun4i-codec: Add Mic1 Playback Switch, Mic2 Playback Switch. sun4i-codec: Add FM Playback Volume. sun4i-codec: Add FM Left, FM Right, FM Playback Switch. sun4i-codec: Add Line Playback Volume. sun4i-codec: Add Line Boost Volume. sun4i-codec: Add Line Right, Line Left, Line Playback Switch. sun4i-codec: Add Differential Line Source. sun4i-codec: Add Left Capture Select, Right Capture Select. sun4i-codec: Add Capture Volume. sound/soc/sunxi/sun4i-codec.c | 233 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 210 insertions(+), 23 deletions(-) -- 2.1.4