Received: by 10.192.165.148 with SMTP id m20csp1110271imm; Wed, 2 May 2018 14:21:58 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpxnF9l3c0YejEIa788Ien4B74N6qiPospqCe5Lwlo9vR5m1CQExpm0YcazEeNpLlY6Rlr9 X-Received: by 2002:a65:628a:: with SMTP id f10-v6mr17325149pgv.6.1525296117952; Wed, 02 May 2018 14:21:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525296117; cv=none; d=google.com; s=arc-20160816; b=i1Qw6g2qG1M8mOM4JveU7gmU0yHj2gfWI6hEGNLPBwQhSigquIyGto8c/CLujgQB2+ 9wcKOgp7Stt5cD8to6n7cSQrA2YRqdT4b2cyXnlfa1nog+8EYsqriC1kOzwCZJ95NdBZ ov802ExdZYsNdQ8WtD8TeZVrpOG462Bgu8aQfPtWvaZ4l0j9SL2KAcAKI+wAhsaI4t3d Cvw4r0orrHOZNlPt+1h5ZCqZM5AHLZRS/Ja7w/kp2nM3VRA8t9pubcjkL7cz+G0lpfHx euPEdmwz9Tf5jvW0Jj8uKMVwD7+r9fx6wV2AQtXayyUXnQQLQksdlp9QjDO5HJCd5yf4 yi2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:tags:message-id:date:subject:to:from :arc-authentication-results; bh=Rzf6fVY2bB20qB3+hcw+nQUBhOiD2GlyAnRvg6ad5wU=; b=ShqE/9dPO9WOrKqUuLR5H6RidO5zEU3cqE6gAIcfEifApO3ewgFik80ImebrrQz8Xl zsFeLU8KHJnToW+7QTEyQ2OVE7SGr92BUpFTSW5rGoOC2feCt9mYDCdJYCqwPS8O9blD 84vxWda8+iClsax5SXsSzKY1lH3gTVz7OD/XhxHeyRlC+W4OXlHA5e7uaJV1wJw0A3hk Yahn7B9ENHAiTKlK8OyqPSbrSzpKPbIIZN6vNxeLUTeY46cF3nWpMUZ2WOo7YyAGop7m FY9BtrKNFE7xRPK2yaAgKnvFJ7wgkr9Bx5POXDSdATYJA/1F8LPkiHwyeVRjPHUPosD3 vRTw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t128-v6si14588pgt.368.2018.05.02.14.21.44; Wed, 02 May 2018 14:21:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751954AbeEBVSC (ORCPT + 99 others); Wed, 2 May 2018 17:18:02 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:42610 "EHLO dd26836.kasserver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751818AbeEBVR4 (ORCPT ); Wed, 2 May 2018 17:17:56 -0400 Received: from dayas.3.home (77.118.143.54.wireless.dyn.drei.com [77.118.143.54]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 55DD53367BAF; Wed, 2 May 2018 23:08:15 +0200 (CEST) From: Danny Milosavljevic To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Maxime Ripard , Chen-Yu Tsai , Danny Milosavljevic , Andrea Bondavalli , Fabio Estevam , Icenowy Zheng , Philipp Zabel , Kuninori Morimoto , alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com Subject: [PATCH v14 0/8] ASoC: sun4i-codec: Add Line-In, FM-In, Mic 2, Capture Source, Differential Line-In Date: Wed, 2 May 2018 23:07:52 +0200 Message-Id: <20180502210800.1971-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.16.2 Tags: patch Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. v14 changes compared to v13 are: - Merged some of the patches together if it made sense to test them together. - Use snd_soc_component_driver. - Moved SUN4I_CODEC_DAC_ACTL_LFMS, SUN4I_CODEC_DAC_ACTL_RFMS to the correct patch in the series. - Kept "Left Mixer Left DAC Playback Switch", "Right Mixer Left DAC Playback Switch" and "Right Mixer Right DAC Playback Switch" unchanged compared to the released version - for backward compatibility. 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 (8): ASoC: sun4i-codec: Add MIC2 Pre-Amplifier, Mic2, Mic Playback Volume ASoC: sun4i-codec: Add Mic1 Boost Volume, Mic2 Boost Volume ASoC: sun4i-codec: Merge sun4i_codec_left_mixer_controls and sun4i_codec_right_mixer_controls into sun4i_codec_mixer_controls. ASoC: sun4i-codec: Add Mic1 Playback Switch, Mic2 Playback Switch. ASoC: sun4i-codec: Add FM Playback Volume, FM Left, FM Right, FM Playback Switch ASoC: sun4i-codec: Add Line Playback Volume, Line Boost Volume, Line Right, Line Left, Line Playback Switch ASoC: sun4i-codec: Add Differential Line Source. ASoC: sun4i-codec: Add Left Capture Select, Right Capture Select. sound/soc/sunxi/sun4i-codec.c | 233 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 209 insertions(+), 24 deletions(-)