From patchwork Wed Mar 14 16:39:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10282773 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0C7FF60621 for ; Wed, 14 Mar 2018 16:47:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1F0F25D99 for ; Wed, 14 Mar 2018 16:47:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E664F27C2D; Wed, 14 Mar 2018 16:47:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 63A1225D99 for ; Wed, 14 Mar 2018 16:47:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=MN5uCHssYGMeMscPHYUPHSrgn47Q69b2ecg/2H3D1J4=; b=uYk dy+lUXCs2FhxMk8EGMVBHxy4q1GNFTFSl7RFeEy07lpMAZVvqYzmSpAzP6XBW93gc1nWxURNfWINw ELDV+G1pal2km+CnodWMjEmoLRqVqOl7gfZxP/PmyaMm98a2LQTAYgkhw5iYXkHAWwXQ1ZuaKDRbs fLJJf6I7156E6bQrLbPyP/iEslwSA5sX8XPPZXG152PX4iC2ZwsXJojyHQ9afKPukiSJfrdd7Pr5/ pTRacFedpW1HcR8AJGQmuKMyzDT+PMZT9POBjYev8hqf0Z0yh5G3BWmD2F44YjWxO5D+tlFkreYtE br+wVlkqDnbNiB9o6Ys1j3EqezjI0Jw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1ew9Yp-0005UW-J5; Wed, 14 Mar 2018 16:47:31 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ew9Yn-0005L6-ME for linux-arm-kernel@bombadil.infradead.org; Wed, 14 Mar 2018 16:47:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Date:Message-Id:In-Reply-To:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=oo940w4QUj2cfSL+hJAgwixOgb29pUtvwNrnUX9nhv4=; b=Ef2cHhywwuc/caJlVQeKTxyA75 jM+4mp2eytxQ7VeDErpabXdRcoAMwHfzJvk25yQVE4QSypPi69cP3uzbiHrxqTYu2smv+Y6m09ZC4 jxI1/U3yOEmRYsoVVeqbWO5oVyBLaXSOlZIzGoErhF8sGFENi0sBMER7e2B+VUBvnw2HWKqJ76+L7 ifQc9CkeVq3WH4PInvxQIrk5wZ9It3HtmcCoWZMx6XOJoYp4eTNu0lFp+ps1HSAxrV/Rh8CXz+rqP 9ARHy9SrZa7iD4eHRxzmaW9+xW4kCkx2pHh8RwV7s5cQxoOprLSIvc6mXX7EdZa6tzuuCS7iY/QgS DLWfzO2A==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1ew9S5-0006vG-5J for linux-arm-kernel@lists.infradead.org; Wed, 14 Mar 2018 16:40:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=oo940w4QUj2cfSL+hJAgwixOgb29pUtvwNrnUX9nhv4=; b=n1GJfi3J8d4C ZYS3NSL5p0g0bTijrldfFrNJqu18KwxAuPz6jKtKd1JfM57DS7sIeXQn9Sml02JpS7QjPCNZc1say riyVnadBHv35VpsvJvw+aORfU4GQCEwV0nNIQuI4UXyj6/XRnmOM+iwZqDvDi2PksbJpgZdCNbbqe IorrE=; Received: from [65.153.83.185] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1ew9RQ-0002bt-32; Wed, 14 Mar 2018 16:39:52 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 001CB44007C; Wed, 14 Mar 2018 16:39:49 +0000 (GMT) From: Mark Brown To: Katsuhiro Suzuki Subject: Applied "ASoC: uniphier: evea: add switch for changing source of line-in" to the asoc tree In-Reply-To: <20180314123900.19505-1-suzuki.katsuhiro@socionext.com> Message-Id: <20180314163950.001CB44007C@finisterre.ee.mobilebroadband> Date: Wed, 14 Mar 2018 16:39:49 +0000 (GMT) X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180314_164033_223660_A6BD1D57 X-CRM114-Status: GOOD ( 17.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Masami Hiramatsu , linux-kernel@vger.kernel.org, Jassi Brar , Mark Brown , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch ASoC: uniphier: evea: add switch for changing source of line-in has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 90e0fb05e5c1b1cf6a59c4f888f500e2b1feffc4 Mon Sep 17 00:00:00 2001 From: Katsuhiro Suzuki Date: Wed, 14 Mar 2018 21:39:00 +0900 Subject: [PATCH] ASoC: uniphier: evea: add switch for changing source of line-in This patch adds mixer switch for changing audio source of line-in. We can choose one of LIN1, 2, 3, default is LIN1. Signed-off-by: Katsuhiro Suzuki Signed-off-by: Mark Brown --- sound/soc/uniphier/evea.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/uniphier/evea.c b/sound/soc/uniphier/evea.c index 439f14f91b23..73fd6730095c 100644 --- a/sound/soc/uniphier/evea.c +++ b/sound/soc/uniphier/evea.c @@ -18,6 +18,8 @@ #define AADCPOW(n) (0x0078 + 0x04 * (n)) #define AADCPOW_AADC_POWD BIT(0) +#define ALINSW1 0x0088 +#define ALINSW1_SEL1_SHIFT 3 #define AHPOUTPOW 0x0098 #define AHPOUTPOW_HP_ON BIT(4) #define ALINEPOW 0x009c @@ -278,7 +280,16 @@ static int evea_set_switch_hp(struct snd_kcontrol *kcontrol, return evea_update_switch_hp(evea); } +static const char * const linsw1_sel1_text[] = { + "LIN1", "LIN2", "LIN3" +}; + +static SOC_ENUM_SINGLE_DECL(linsw1_sel1_enum, + ALINSW1, ALINSW1_SEL1_SHIFT, + linsw1_sel1_text); + static const struct snd_kcontrol_new evea_controls[] = { + SOC_ENUM("Line Capture Source", linsw1_sel1_enum), SOC_SINGLE_BOOL_EXT("Line Capture Switch", 0, evea_get_switch_lin, evea_set_switch_lin), SOC_SINGLE_BOOL_EXT("Line Playback Switch", 0,