From patchwork Thu Mar 21 22:15:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 10864427 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 68A6E1390 for ; Thu, 21 Mar 2019 22:17:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45DD928923 for ; Thu, 21 Mar 2019 22:17:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3693E2A279; Thu, 21 Mar 2019 22:17:05 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8558428923 for ; Thu, 21 Mar 2019 22:17:04 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 89574920; Thu, 21 Mar 2019 23:16:12 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 89574920 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1553206622; bh=rCtMzw8JyoCQ4CU0dHyXtaU43yZzsNGrsEfP6PCF9zc=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=ZQFpeU4cpFzA9Q4/CG7tNd8wHGBfW/cyATxaXWTlMi2aEqQVun2Zgqjqv7g6nr1YU LLmObN/ttURMiTQl65tOgqifw6cTKHfUxiQI7G3K/zvADgG6JqsnpgL+DXlT/dV9kk s0udLV+wDV0sHt9M5NtuFBIH4HlPf7X4pvwcduBc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 49BCDF89713; Thu, 21 Mar 2019 23:16:02 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 64C17F8970F; Thu, 21 Mar 2019 23:16:00 +0100 (CET) Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3D47EF8076F for ; Thu, 21 Mar 2019 23:15:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3D47EF8076F Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=criticallink.com header.i=@criticallink.com header.b="nc1bnd/b" Received: by mail-qk1-x741.google.com with SMTP id w20so96882qka.7 for ; Thu, 21 Mar 2019 15:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KzWqXzu0MES7QWDiYCfpkzfd1rAbmIZUJfKN+nnjS/Y=; b=nc1bnd/bYIpsne+BA2hNY/EpznTwIrVkkrE8XgzwsKYLkXb/Sr/cNeKH9XO7JXrJCe pj6NNuUwYjWNhwgIfAtl1NydbcNsNVpxGFPMnrDYk8Dj3RQHElxJFcgHDz8bWvyQ2oku ozryoukt2aGmXsmLpf/GhwFhf+yZlGQMUcvvASm0ulWTJTSlcJH6f8pv9DnHgRwQVZKF O0kpstz/Vy0oCtL5rqr8cQBBRjVguG5/3Z1JcPMk4YH3B3UPGutQ0KGlHwIbwicGWey+ tOBsNnDaHNoITnRzI38dEcds+3l9U6cSxye2Dx93+/RI2I1TALUl32ir9B3iYA8v3cTL TXUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KzWqXzu0MES7QWDiYCfpkzfd1rAbmIZUJfKN+nnjS/Y=; b=peG/hJJ3GMds4hTKf9UrlRcJTLDsymOwR2IxaPyjIutGPCADvNKm6pnST/BAkVV8sy PdO9lj5jAY4dPRtyP5hp2Peb8D7yUyAc+xkP90pDwPHpQ+IgEiRAXEIW9/+XK5Cnhr3+ C42/tsJEAnCHlN444YNh7hLvWmW7u7cvpC0pKuoMFh1Wp96otaoE9GI1bAfz0wnt6D9i HV+KFKlfSMoBj0FqOvGUunRZ75DR0Kk4Bu+e4ZBjd/EF6V/Qnb3tziFPTfXSjqlETcQQ OVs5TDTLTHTF2uvO/6jir8CQeXmFTaIVD96zHiYMPmpQbn+eq5n4k6NYh6GEGEKXvd97 oUEQ== X-Gm-Message-State: APjAAAV01Jx+OfU+eps2eSPKJKaSJZh1WvuuJLNTL8K6ZT8ydno7mIj/ lXC1VShNjQxtFHfObIX6J8zeuA== X-Google-Smtp-Source: APXvYqwfVganjXK59RsLZeRjA3BMwI6AWyUnr7KzPMR6P4SuDy557nWicnZ3M27l3TFPGFWvZHEGjQ== X-Received: by 2002:a37:c15:: with SMTP id 21mr4852630qkm.50.1553206555276; Thu, 21 Mar 2019 15:15:55 -0700 (PDT) Received: from jcormier-MS-7A93.syr.criticallink.com (static-72-90-70-109.syrcny.fios.verizon.net. [72.90.70.109]) by smtp.gmail.com with ESMTPSA id w37sm3895968qtw.27.2019.03.21.15.15.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 15:15:54 -0700 (PDT) From: "Cormier, Jonathan" To: Liam Girdwood , devicetree@vger.kernel.org Date: Thu, 21 Mar 2019 18:15:43 -0400 Message-Id: <20190321221549.13765-2-jcormier@criticallink.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190321221549.13765-1-jcormier@criticallink.com> References: <20190321221549.13765-1-jcormier@criticallink.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Bob Duke , Mark Brown , linux-kernel@vger.kernel.org, Takashi Iwai , Rob Herring , Peter Ujfalusi , Mike Williamson , Jyri Sarha , Greg Gluszek , Misael Lopez Cruz Subject: [alsa-devel] [PATCH v2 1/7] ASoC: tlv320aic26: Allow tlv320aic26 to be selected in menuconfig X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP Without a description you can't select the device in menuconfig Set depends to SPI_MASTER to match conditional in SND_SOC_ALL_CODECS Signed-off-by: Cormier, Jonathan --- sound/soc/codecs/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 419114edfd57..cd697a015819 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1087,8 +1087,8 @@ config SND_SOC_TLV320AIC23_SPI select SND_SOC_TLV320AIC23 config SND_SOC_TLV320AIC26 - tristate - depends on SPI + tristate "Texas Instruments TLV320AIC26 audio CODEC - SPI" + depends on SPI_MASTER config SND_SOC_TLV320AIC31XX tristate "Texas Instruments TLV320AIC31xx CODECs" From patchwork Thu Mar 21 22:15:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 10864429 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8424F1515 for ; Thu, 21 Mar 2019 22:17:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 635CE28923 for ; Thu, 21 Mar 2019 22:17:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5747329A8B; Thu, 21 Mar 2019 22:17:51 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 99C8428923 for ; Thu, 21 Mar 2019 22:17:50 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D0B3D9EB; Thu, 21 Mar 2019 23:16:58 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D0B3D9EB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1553206668; bh=aCAcMy1scWh2d55XKq9eq8wR7s70qVD4fT6XHx82MSQ=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=m4ZEQieSUE3l8ckxvUhc2rhoDix8kQ8VtBtXyfzXCfVUjzlweEez3/LQ9HhNHp6RY kT/TdgVarWQWfYm3+c5kIFlzOVDexwc/ERfyOkJmtVchDk2DsPZJPTtd9yf+OAx76n Nw6gWLK+wcz4btmLs1o12MW/4EKXFjpH78kuYxyw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id BAF11F89719; Thu, 21 Mar 2019 23:16:04 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 79FB2F89715; Thu, 21 Mar 2019 23:16:02 +0100 (CET) Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id B1E68F8970A for ; Thu, 21 Mar 2019 23:15:59 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz B1E68F8970A Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=criticallink.com header.i=@criticallink.com header.b="OMCf6GaP" Received: by mail-qt1-x843.google.com with SMTP id s1so442833qte.5 for ; Thu, 21 Mar 2019 15:15:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0L6pXJZ0e75bqx2mujAz7nIQyHFH4GSrwd10wKDOHxg=; b=OMCf6GaPjHgVkOGH1sbY6yZrV6o6klze5++h0tE27BvIi8uZYEg5/NTeNPDzovZVox 6uuowY9xuqoNuDmtDF96qYMrlYaepPGx1T25h//xamTclB99NYPGyMYT0Y+sSIZAAga5 7n0Jy/Pc78mqh+73qJYcIcDh2gRYl7B8LdK5Kcl+a10q+YDm8srhCxyOlG6p4ao/WwPM TyMvUUlFqI7kT6C+ciW2/2sk+EHkhpVnTOnYhYtrpZKX+sw8OgBxVh0EQHT59pLvoEuM MVq2mPxqgvtbZ9CWhn7q+6DuQ3Acof4ilnkPT/LFoWMb7nJWJwdLbkIOt1SC3LrRKERQ xUOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0L6pXJZ0e75bqx2mujAz7nIQyHFH4GSrwd10wKDOHxg=; b=hHuOyamNzgRv0c3c6yXD+f45Qhlk5yY1//cQPO8AoRmX5olOnA5mSfHQrSfw0yBcK6 AVnCRvfs+boTXiT8RvbTFWcCrSOISw+rfke8TRafhAdlPeH42dhyCMMWPU65oGJKIzMv rdpji46V8rsPKmbTut7Y3J1F9mY68mhnlcL5I8lBamxuFWl5hYZnNePWtJqA4/edIaFr 4t1c7rULV6Bv203alobcQQxudSlKv6N84MsBuPVZ2wdTK4YY/r13t51ZiQSLM4m1t0oE XMOZbWA5Q6/21Pch7SqXnSgKXCn/3m/jKajXBbOjPSZLNH14IHw+NoBftTbK4D2W8GLv Hwyw== X-Gm-Message-State: APjAAAXz+ntSUAjQ9RDawij5ltVwraxMB0G7UAIuHXZ1yowWaOymBUwB wH74Qt/3yZIhyJc0aqsVUOddCA== X-Google-Smtp-Source: APXvYqx1o1DtNNRTcTBhLNI23ehxQ4CdCWRjmqnhH15kg0/eUecIs13rZ58FggoZBmX6HL/rpShgIg== X-Received: by 2002:a0c:8a54:: with SMTP id 20mr5273084qvu.167.1553206558613; Thu, 21 Mar 2019 15:15:58 -0700 (PDT) Received: from jcormier-MS-7A93.syr.criticallink.com (static-72-90-70-109.syrcny.fios.verizon.net. [72.90.70.109]) by smtp.gmail.com with ESMTPSA id w37sm3895968qtw.27.2019.03.21.15.15.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 15:15:57 -0700 (PDT) From: "Cormier, Jonathan" To: Liam Girdwood , devicetree@vger.kernel.org Date: Thu, 21 Mar 2019 18:15:44 -0400 Message-Id: <20190321221549.13765-3-jcormier@criticallink.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190321221549.13765-1-jcormier@criticallink.com> References: <20190321221549.13765-1-jcormier@criticallink.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Bob Duke , Mark Brown , linux-kernel@vger.kernel.org, Takashi Iwai , Rob Herring , Peter Ujfalusi , Mike Williamson , Jyri Sarha , Greg Gluszek , Misael Lopez Cruz Subject: [alsa-devel] [PATCH v2 2/7] dt-bindings: ASoC: tlv320aic26: Add device tree binding X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add support for the TI tlv320aic26 sound codec Signed-off-by: Cormier, Jonathan --- .../devicetree/bindings/sound/tlv320aic26.txt | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic26.txt diff --git a/Documentation/devicetree/bindings/sound/tlv320aic26.txt b/Documentation/devicetree/bindings/sound/tlv320aic26.txt new file mode 100644 index 000000000000..93aa0f76ec0d --- /dev/null +++ b/Documentation/devicetree/bindings/sound/tlv320aic26.txt @@ -0,0 +1,65 @@ +Texas Instruments - tlv320aic26 Codec module + +The tlv320aic26 serial control bus communicates through I2C protocols + +Required properties: + +- compatible - "string" - One of: + "ti,tlv320aic26" - TLV320AIC26 +- reg - - SPI chip select + +CODEC input pins: + * MICIN + * AUX + +CODEC output pins: + * HPL + * HPR + +The pins can be used in referring sound node's audio-routing property. + +Example: + +tlv320aic26: tlv320aic26@0 { + compatible = "ti,tlv320aic26"; + reg = <0>; +}; + +&spi0 { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&spi0_pins>; + pinctrl-1 = <&spi0_sleep_pins>; + + status = "okay"; + ti,pindir-d0-out-d1-in = <1>; + + tlv320aic26: tlv320aic26@1 { + compatible = "ti,tlv320aic26"; + reg = <0x1>; + status = "okay"; + + spi-max-frequency = <2000000>; + spi-cpha; + }; +}; + +sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "AM335x_SND"; + simple-audio-card,format = "dsp_b"; + /* SND_SOC_DAIFMT_CBM_CFM */ + simple-audio-card,bitclock-master = <&tlv320aic26_codec>; + simple-audio-card,frame-master = <&tlv320aic26_codec>; + /* SND_SOC_DAIFMT_IB_NF */ + simple-audio-card,bitclock-inversion; + + simple-audio-card,cpu { + sound-dai = <&mcasp1>; + system-clock-frequency = <24576000>; + }; + + tlv320aic26_codec: simple-audio-card,codec { + sound-dai = <&tlv320aic26>; + system-clock-frequency = <24576000>; + }; +}; From patchwork Thu Mar 21 22:15:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 10864431 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E34D91390 for ; Thu, 21 Mar 2019 22:18:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C012028923 for ; Thu, 21 Mar 2019 22:18:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B134829A8B; Thu, 21 Mar 2019 22:18: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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ED78328923 for ; Thu, 21 Mar 2019 22:18:36 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 363E2892; Thu, 21 Mar 2019 23:17:45 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 363E2892 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1553206715; bh=d1WSJfrJuhYA4DcE2+cc71XaHyPkmt3PGeKl1T6HGWg=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Rrp+BNNWw7zriv87Ze003SE2jYFEWMzIK9q7VZCubClrw2e4KjjsGMgqKt5ZfseaY hgwA+fq4T3QQbG9J/6HxgqUR+9412cV1pSin80iKwko6EqhTKaPZu88vE0Vt0yLj1f qvKxHfCUZNgXgNGwgVPiOmr7JN/dll/uZjH5UQsM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 366D3F8971F; Thu, 21 Mar 2019 23:16:07 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 61499F8971D; Thu, 21 Mar 2019 23:16:05 +0100 (CET) Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 38C4BF89714 for ; Thu, 21 Mar 2019 23:16:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 38C4BF89714 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=criticallink.com header.i=@criticallink.com header.b="NoXUUu0R" Received: by mail-qk1-x743.google.com with SMTP id k189so122357qkc.0 for ; Thu, 21 Mar 2019 15:16:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bgAvtv5h8mLo/7zpwvPverPSWmp65KreRmC/KtHsw54=; b=NoXUUu0ROSxjxKw/Wp2icwPJfx4953Mm7ApZKMY0LPJgzi0ubyayIwtA/rhMaS9e7e iSmlAhCCaDzzDBVpNEeW8LL1d600EAGf25h46Nhzpm3sLN+S+AbkaC9DUCNAgWBWjQLw gCV+cJnB/WopWGu/qk+M0XJ59Qxy+Zr9YWMWZ5fKvFV+4kKalnUkCk9jMqIrYUsY07MU xqQnE0Ip2jIITdGo8bXnZGdbph27quzQI2h1CkxHF0pm227jSigI2ayMYElcN432w57/ fU8kidvejw/xFpMr0wTFSo3xv/+Lr4tZdVRnsoHYWhI4QvH94y7vkQve9lRv8QjR7S5v U9dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bgAvtv5h8mLo/7zpwvPverPSWmp65KreRmC/KtHsw54=; b=RR/ypEXDbPEw5OJV9hd0cV0vcZQ1s6pfLxRlprMcfBBmSbrgu+pSQOS5ia96j15IPr CKa6joUMttKzw3JLh6JSzZauM0ry7g7SXVNCsyUmq1pg+LNsunoHaw9NZ70GS/6YYpw+ TruLe2TfHPRLFVyLRI9truyzGwkox/awJBDEuprghsojJVhDODMXe4dT/NI1bEb6AIm5 bJmsWHbl7cqXxZQhLaodHBw+BESWY3K25ZK0c+j3xZVk467e8p8XqvFJkt5Dqo2iksTa P8rRP1/RkLupO1dkYSYQAeg6BpNZF4XyccPk97qXylijXZlEhFJhEn+j0qzG9bZAehQd 4mAg== X-Gm-Message-State: APjAAAVjTIhmDS7M0uUeGRAxGlot0jYVv2frQNjsXnmYrnDC6lFX5J4q zof/BMyI4Y3pmJYtuZnyHD9iUg== X-Google-Smtp-Source: APXvYqzHgQn38wTdfG19fCvlPvSLZcSB9BSJDw9bLMf6c+OB/p5YHx9w6R3MSmBYaCTFIL1yxN7+eQ== X-Received: by 2002:a37:d685:: with SMTP id p5mr4774807qkl.329.1553206560498; Thu, 21 Mar 2019 15:16:00 -0700 (PDT) Received: from jcormier-MS-7A93.syr.criticallink.com (static-72-90-70-109.syrcny.fios.verizon.net. [72.90.70.109]) by smtp.gmail.com with ESMTPSA id w37sm3895968qtw.27.2019.03.21.15.15.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 15:15:59 -0700 (PDT) From: "Cormier, Jonathan" To: Liam Girdwood , devicetree@vger.kernel.org Date: Thu, 21 Mar 2019 18:15:45 -0400 Message-Id: <20190321221549.13765-4-jcormier@criticallink.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190321221549.13765-1-jcormier@criticallink.com> References: <20190321221549.13765-1-jcormier@criticallink.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Bob Duke , Mark Brown , linux-kernel@vger.kernel.org, Takashi Iwai , Rob Herring , Peter Ujfalusi , Mike Williamson , Jyri Sarha , Greg Gluszek , Misael Lopez Cruz Subject: [alsa-devel] [PATCH v2 3/7] ASoC: tlv320aic26: Add device tree binding X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add support for the TI tlv320aic26 sound codec Signed-off-by: Cormier, Jonathan --- sound/soc/codecs/tlv320aic26.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index b91b8d5f1ba3..5c9b320b918c 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -368,9 +368,16 @@ static int aic26_spi_probe(struct spi_device *spi) return ret; } +static const struct of_device_id tlv320aic26_of_match[] = { + { .compatible = "ti,tlv320aic26", }, + {}, +}; +MODULE_DEVICE_TABLE(of, tlv320aic26_of_match); + static struct spi_driver aic26_spi = { .driver = { .name = "tlv320aic26-codec", + .of_match_table = of_match_ptr(tlv320aic26_of_match), }, .probe = aic26_spi_probe, }; From patchwork Thu Mar 21 22:15:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 10864435 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1D24117E0 for ; Thu, 21 Mar 2019 22:20:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F10502A4E4 for ; Thu, 21 Mar 2019 22:20:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E54552A52B; Thu, 21 Mar 2019 22:20:14 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3F5382A4E8 for ; Thu, 21 Mar 2019 22:20:14 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 7AB88883; Thu, 21 Mar 2019 23:19:22 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7AB88883 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1553206812; bh=/Z8NYNXAILFhyloG2xlvyY4+Sx/v6WaH/GniB1tXdMk=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=acgTe+VIP6s4aXcY+BtOYJx62M75yMoJxT9kpYLrpIyNOA1gaTuLZFhg7p/g5fcqY pPh+Bl/NFIUlfD+Ky/rqFqB97KualVLcYer2vkQojnllzmRLxphEq/rjR6M8F+tRzL GXF7W+JtGCqlKUT+tG8vGVwvb1C+4q8hYzdpaf9w= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A5F59F89729; Thu, 21 Mar 2019 23:16:13 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7B109F89724; Thu, 21 Mar 2019 23:16:09 +0100 (CET) Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id BAE33F89718 for ; Thu, 21 Mar 2019 23:16:03 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BAE33F89718 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=criticallink.com header.i=@criticallink.com header.b="p6YLh11W" Received: by mail-qt1-x842.google.com with SMTP id s1so442985qte.5 for ; Thu, 21 Mar 2019 15:16:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=if1sNoy1mfi3YtgVv5HkU4CwZTmtdZQjl4UklTZ2rEU=; b=p6YLh11WSgnnDd4ZAr7VdS8XJiY7RLPj1Sm1VREGS4INfI8cJyqzuX+UKMRUKFyR4g Yda6v1GXizL5yF+oLDo6ybsevnVXp0d5k7z/Jieav0pDBhGRbOA9fDuQPVevNSrxVHPV NC1eMgJij3YFlsWLvqTpO0W+Ks9u5q/yS1wefY9tQfbcMK1Zyc3Uzc3xHwXiEvY8S9pz ZQr0ttFZZLwJVndWTjzaz7yJtDOKYtewik2wU1aUmK13wD43PDCpVE0NfE3QhV3Oh9LI Grrx3kB/DSHq2v53d9SAQq1N8n/hkZd95ONzADUHqXqGTPIDuUhDRBjWBHX1/sFLC4K/ 4aQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=if1sNoy1mfi3YtgVv5HkU4CwZTmtdZQjl4UklTZ2rEU=; b=m9N9Tz+P3wBspbkRW6r/zsy/flNS+07JVLmfhUqbMMNZ3SEBcMuGQjmIM2j61eOiyO +9MY68RsQRMUCvP61RicQ+1UYZUPU8rsiQHi0A3EorBfvLpJympkRVYvNuucd5IyISoJ Ies1DzHwnyClKJ228g7de/bYdBv9Os+psNMgD5ljQfXTiOCQnO5sI+TMUOAjUbP8mJfA sXvxxZ4rk8cbeqaAQgdetAK2HxzWIzwbGVc+qK5pJQI3wsudiKezNOVUANwvZRsKvu6x 5wKmuYoLZAcQjybpT1/9gDpcfRkyYLB9cpWUDb4CvH/n3ZgvAMUXXD08yxtNCArLotph gVdw== X-Gm-Message-State: APjAAAUCcuTM9Y+mPOhwefcR+6KL5GKLfXBEqTgMOtkWUdgemaXRJMro MHmC01wD/n6z/1wPwPt4eI5KAA== X-Google-Smtp-Source: APXvYqx3exho2Mefhgr+2F7yBgcEOmqHXx0WKmrrDrMiNge8oUsnTjSVKnm4bO3njHK08Pt58jRipw== X-Received: by 2002:a0c:8b63:: with SMTP id d35mr5155881qvc.148.1553206561958; Thu, 21 Mar 2019 15:16:01 -0700 (PDT) Received: from jcormier-MS-7A93.syr.criticallink.com (static-72-90-70-109.syrcny.fios.verizon.net. [72.90.70.109]) by smtp.gmail.com with ESMTPSA id w37sm3895968qtw.27.2019.03.21.15.16.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 15:16:01 -0700 (PDT) From: "Cormier, Jonathan" To: Liam Girdwood , devicetree@vger.kernel.org Date: Thu, 21 Mar 2019 18:15:46 -0400 Message-Id: <20190321221549.13765-5-jcormier@criticallink.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190321221549.13765-1-jcormier@criticallink.com> References: <20190321221549.13765-1-jcormier@criticallink.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Bob Duke , Mark Brown , linux-kernel@vger.kernel.org, Takashi Iwai , Rob Herring , Peter Ujfalusi , Mike Williamson , Jyri Sarha , Greg Gluszek , Misael Lopez Cruz Subject: [alsa-devel] [PATCH v2 4/7] ASoC: tlv320aic26: Fix module autoload X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add the missing MODULE_DEVICE_TABLE() for OF and SPI to export the information so modules have the correct aliases built-in and autoloading works correctly. A longer explanation by Javier Canillas can be found here: https://lkml.org/lkml/2015/7/30/519 https://lkml.org/lkml/2014/9/11/458 Signed-off-by: Cormier, Jonathan --- sound/soc/codecs/tlv320aic26.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index 5c9b320b918c..db1d1704ae5c 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -368,6 +368,12 @@ static int aic26_spi_probe(struct spi_device *spi) return ret; } +static const struct spi_device_id tlv320aic26_id_table[] = { + { "tlv320aic26" }, + {}, +}; +MODULE_DEVICE_TABLE(spi, tlv320aic26_id_table); + static const struct of_device_id tlv320aic26_of_match[] = { { .compatible = "ti,tlv320aic26", }, {}, @@ -380,6 +386,7 @@ static struct spi_driver aic26_spi = { .of_match_table = of_match_ptr(tlv320aic26_of_match), }, .probe = aic26_spi_probe, + .id_table = tlv320aic26_id_table, }; module_spi_driver(aic26_spi); From patchwork Thu Mar 21 22:15:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 10864433 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2CD171515 for ; Thu, 21 Mar 2019 22:19:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09C0728796 for ; Thu, 21 Mar 2019 22:19:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED03928A20; Thu, 21 Mar 2019 22:19:24 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E27EF28A0A for ; Thu, 21 Mar 2019 22:19:23 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id E420894F; Thu, 21 Mar 2019 23:18:31 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz E420894F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1553206762; bh=yPZhoSyKiUZLxLZ3cav9uWZQ0u2zDNXSOXvz7ny91zM=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=mUow/nqYxoy4TQGZnns8b//fSWFq5YRcckAbEg9+tzQUMV/uWf04ZMayDhWl2SLE/ 3qM17VGDKNJwpaojZzHzqXrNHJAMIajDczzg1UF5Q6ePp1CSJXsqWIlqMrTW5pvJ9i LewCJRH7hn5ZVN/A6D15skHkV4fe+/iMVtKmivzY= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id A226DF89718; Thu, 21 Mar 2019 23:16:10 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id B2B2DF89723; Thu, 21 Mar 2019 23:16:08 +0100 (CET) Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id F2D24F8971B for ; Thu, 21 Mar 2019 23:16:04 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz F2D24F8971B Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=criticallink.com header.i=@criticallink.com header.b="BbLV4RLD" Received: by mail-qt1-x843.google.com with SMTP id y36so458144qtb.3 for ; Thu, 21 Mar 2019 15:16:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s0UWPcv45YDJ6fJXV9UJPLaAr8ooymlKhZRtGYGNJeo=; b=BbLV4RLDEgeW1nsgRPdI4SPa4CMGxHfMuiWXTrUBqLRmCiu6LqWifE2Vg1o1Ki+1dQ by4xgp1XPXOcnYrrdkmYHSVqr2TFknVsj+FBTHbActaJCF4yUj/gHyutOEH7ffkHdqBX x2aafF/qj06QVstJAyv2zFdiqYc8M3BHH4JzMUa5jV21XSoagrLgEnbvBxn8sOea/KxQ B/9csYbxa1eG0U40KRmCsBAKfBv9kv/NGMMO+nVuHD9RkCr2amWCL6DRNKD4MfSj1okd DCi69EylJSNjvedlIleSB4V4QKGHTgSq02quxGzfwhr56O0Dv85K59kyUA7VnR87+nOS pxmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s0UWPcv45YDJ6fJXV9UJPLaAr8ooymlKhZRtGYGNJeo=; b=V4hOCwp3SURO1Duy5k96CN6c6rEY+/2YGBZYiGD9Q24ATqWYRQc5EhGHBTOppJkSWN 0iewPne6mL9x+mRxoo7H9dMIyMCNG5f03/CNXDwPtosTF/790sUXr6EM5Ej0dIUAHRhq jn5asvi0KAwD1Dk1JMS3T90G8ABMzNYBOwxU2xXw9aYlCcugu/WUd+HR0WxeC3aGxI8H BlKxF8in8Pkcod56e6dBgzS5RCsMPOJsm7gvnbarqZv9yEUIUQe0G5Op0KuomL9QiEfj V04G56/S9jAAypEJs62jBiBltjnt988OeLCpgrf7zYjzEEigve8ouzJDKI/wrRp07njY zI0A== X-Gm-Message-State: APjAAAVAgMtXkYR0eqvJjMZZuQC7GGXrs4z+VjEv6gKQ3Qf7Sa4SFiMC 4cHoyv4vvcvVUrFRelTXVldUYQ== X-Google-Smtp-Source: APXvYqwzwIZ2p8lX4ACrpomWcq8ueJyK1xSgw+G4qos9cfxnxt+dYC25L1EUvZtrKjyiSeYH5x6a+g== X-Received: by 2002:ac8:7545:: with SMTP id b5mr5282235qtr.239.1553206563395; Thu, 21 Mar 2019 15:16:03 -0700 (PDT) Received: from jcormier-MS-7A93.syr.criticallink.com (static-72-90-70-109.syrcny.fios.verizon.net. [72.90.70.109]) by smtp.gmail.com with ESMTPSA id w37sm3895968qtw.27.2019.03.21.15.16.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 15:16:02 -0700 (PDT) From: "Cormier, Jonathan" To: Liam Girdwood , devicetree@vger.kernel.org Date: Thu, 21 Mar 2019 18:15:47 -0400 Message-Id: <20190321221549.13765-6-jcormier@criticallink.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190321221549.13765-1-jcormier@criticallink.com> References: <20190321221549.13765-1-jcormier@criticallink.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Bob Duke , Mark Brown , linux-kernel@vger.kernel.org, Takashi Iwai , Rob Herring , Peter Ujfalusi , Mike Williamson , Jyri Sarha , Greg Gluszek , Misael Lopez Cruz Subject: [alsa-devel] [PATCH v2 5/7] ASoC: tlv320aic26: Fix regmap by setting reg_defaults and reg_stride X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP tlv320aic26 codec wasn't being setup correctly on bootup due to a misconfigured regmap cache. Fixes: b7e9f3973279 "ASoC: tlv320aic26: Convert to direct regmap API usage" Signed-off-by: Cormier, Jonathan --- sound/soc/codecs/tlv320aic26.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index db1d1704ae5c..cd1bcb9cbfe1 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -41,6 +41,27 @@ struct aic26 { int keyclick_len; }; +static const struct reg_default aic26_reg[] = { + /* Page 0 */ + { 0x00A0, 0x0000 }, { 0x00C0, 0x0000 }, { 0x00E0, 0x0000 }, + { 0x0120, 0x0000 }, { 0x0140, 0x0000 }, + /* Page 1 */ + { 0x0800, 0x0000 }, { 0x0820, 0x8000 }, { 0x0860, 0x0002 }, + { 0x0880, 0xFFFF }, + /* Page 2 */ + { 0x1000, 0x0000 }, { 0x1020, 0x8000 }, { 0x1040, 0xFFFF }, + { 0x1060, 0xC580 }, { 0x1080, 0x4410 }, { 0x10A0, 0xAFC0 }, + { 0x10C0, 0x0000 }, { 0x10E0, 27619 }, { 0x1100, -27034 }, + { 0x1120, 26461 }, { 0x1140, 27619 }, { 0x1160, -27034 }, + { 0x1180, 26461 }, { 0x11A0, 32131 }, { 0x11C0, -31506 }, + { 0x11E0, 32131 }, { 0x1200, -31506 }, { 0x1220, 27619 }, + { 0x1240, -27034 }, { 0x1260, 26461 }, { 0x1280, 27619 }, + { 0x12A0, -27034 }, { 0x12C0, 26461 }, { 0x12E0, 32131 }, + { 0x1300, -31506 }, { 0x1320, 32131 }, { 0x1340, -31506 }, + { 0x1360, 0x1004 }, { 0x1380, 0x0000 }, { 0x13A0, 0x0000 }, + { 0x13C0, 0xFE00 }, +}; + static const struct snd_soc_dapm_widget tlv320aic26_dapm_widgets[] = { SND_SOC_DAPM_INPUT("MICIN"), SND_SOC_DAPM_INPUT("AUX"), @@ -336,6 +357,13 @@ static const struct snd_soc_component_driver aic26_soc_component_dev = { static const struct regmap_config aic26_regmap = { .reg_bits = 16, .val_bits = 16, + /* AIC26_PAGE_ADDR(0, 0x01) */ + .reg_stride = 0x20, + + .max_register = AIC26_REG_AUDIO_CTRL5, + .reg_defaults = aic26_reg, + .num_reg_defaults = ARRAY_SIZE(aic26_reg), + .cache_type = REGCACHE_RBTREE, }; /* --------------------------------------------------------------------- From patchwork Thu Mar 21 22:15:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 10864437 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9DBC21390 for ; Thu, 21 Mar 2019 22:20:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B8632A4E8 for ; Thu, 21 Mar 2019 22:20:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FB1B2A530; Thu, 21 Mar 2019 22:20:47 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A5D582A4E9 for ; Thu, 21 Mar 2019 22:20:46 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id DCA3586F; Thu, 21 Mar 2019 23:19:54 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DCA3586F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1553206844; bh=P2BiquOdWDW61vmA/hg1qTokj4gNh0vU+FqBPCuEQE4=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=CtaDy9fVIKF5oT5Xpg9ov5B265IPCtYH6MhEB+h5XPmIT8y8B19jLSdqbNS9QukHn Jz7PptpZ/BBXlOHZbtTkojJbnYSCfLkp5OqP4be3Y2ajObSM88ok6ea/yTPYfiOOGA LyHD/RwDx8bstfX8+P3Y0M/LEYittLvW/Pdy9cYw= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1FA6CF89731; Thu, 21 Mar 2019 23:16:15 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 88EF0F8971B; Thu, 21 Mar 2019 23:16:10 +0100 (CET) Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id AA6B1F89693 for ; Thu, 21 Mar 2019 23:16:06 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz AA6B1F89693 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=criticallink.com header.i=@criticallink.com header.b="Rd/NcxI3" Received: by mail-qt1-x841.google.com with SMTP id h39so465952qte.2 for ; Thu, 21 Mar 2019 15:16:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PaAiK0DR2sIQWzoKy9Rm5Q9ewZFtpvbkDJA7a+dgNIQ=; b=Rd/NcxI3SiTqghKLtjSSi1Yv28GGZ5BOQx3mDk4NUx9AFttyl7VoBpY54e/v8KJMWA bk/e25I4k7LbksAsM5o95GzMKquXi14B860qYXdfuQK9Ggp6qR5vGIl0YwXTD6PIXgos WPP4soeT8fF/8qI+GWDRie/n8PRHERwT1ehRO85Zw3SAFx7jVquWlepCwtqF8qMXVa04 yENVJHPLxfVAqv2Nq7rqEb36bg/phHF0SxrWRDCsJf09l2bYG0puJgWn5Ph+CWwC8z4P 7imCkSkCTz+HQrVQDYND4Nsb6A+UZhiFgTK+ExloSKme8FOWbN7ERco0P5Ssi2xj9Sno RNWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PaAiK0DR2sIQWzoKy9Rm5Q9ewZFtpvbkDJA7a+dgNIQ=; b=R83guSYpkuQ8jSInGuB3N5XDzM4QQKgj6hwjm7YHm8S//gKTRyhLMIeZntsbMC/en2 FC44Tk+OR6b4YCg9n0JvZeRh/WDhFpydcYX4KRoIk1w2M/uILkebvQyxKgIeByRnl+TJ l7/6E30IYCyqnsUcvDpvomsjaB0YxeSJN3fY59N8OhgNUB5deRcNXMVqucrQFqQxoDum SHbCG1s+aCbAlmIqt57jBSefI6J5OpPNM63c1mXDq7sx4cclJR3bEgBFlwvc8FROLTyB VD6RmSNqWVQY+30TmE5adErLGSJQlib/d9LJi5aiMM0GL2JaNRH2MwxVovBOQuWk/QSb ys3Q== X-Gm-Message-State: APjAAAUUB1/WkXDZjB2ayr9UPq/jse+qkhgKsnmJOUPBcJX/zgqudEze C86veOtnFTs+sYFVnH2HzzOlxjVAJjWQMqrp X-Google-Smtp-Source: APXvYqxW8KY5acPBbd3l0z7nMTSHAl2jEQL/aIeaTfianJL+n6xtWTDQ5tXC94y66IRi+2VRm6PqsA== X-Received: by 2002:ac8:3202:: with SMTP id x2mr5262310qta.56.1553206564811; Thu, 21 Mar 2019 15:16:04 -0700 (PDT) Received: from jcormier-MS-7A93.syr.criticallink.com (static-72-90-70-109.syrcny.fios.verizon.net. [72.90.70.109]) by smtp.gmail.com with ESMTPSA id w37sm3895968qtw.27.2019.03.21.15.16.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 15:16:03 -0700 (PDT) From: "Cormier, Jonathan" To: Liam Girdwood , devicetree@vger.kernel.org Date: Thu, 21 Mar 2019 18:15:48 -0400 Message-Id: <20190321221549.13765-7-jcormier@criticallink.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190321221549.13765-1-jcormier@criticallink.com> References: <20190321221549.13765-1-jcormier@criticallink.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Bob Duke , Mark Brown , linux-kernel@vger.kernel.org, Takashi Iwai , Rob Herring , Peter Ujfalusi , Mike Williamson , Jyri Sarha , Greg Gluszek , Misael Lopez Cruz Subject: [alsa-devel] [PATCH v2 6/7] ASoC: tlv320aic26: hw_params was unintentionally clearing AIC26 master mode X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP Commit 5b0959d472c2 ("ASoC: tlv320aic26: Use snd_soc_update_bits()") broke setting AIC26_REG_AUDIO_CTRL3 in master mode when fsref happens to be 48000. The master mode bit was getting cleared. Also fix setting AIC26_REG_DAC_GAIN and AIC26_REG_AUDIO_CTRL2 which was broke by same commit. Fixes 5b0959d472c2 ("ASoC: tlv320aic26: Use snd_soc_update_bits()") Signed-off-by: Cormier, Jonathan --- sound/soc/codecs/tlv320aic26.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index cd1bcb9cbfe1..c6ff4ca29d43 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -138,11 +138,12 @@ static int aic26_hw_params(struct snd_pcm_substream *substream, snd_soc_component_write(component, AIC26_REG_PLL_PROG2, reg); /* Audio Control 3 (master mode, fsref rate) */ + reg = 0; if (aic26->master) - reg = 0x0800; + reg |= 0x0800; if (fsref == 48000) - reg = 0x2000; - snd_soc_component_update_bits(component, AIC26_REG_AUDIO_CTRL3, 0xf800, reg); + reg |= 0x2000; + snd_soc_component_update_bits(component, AIC26_REG_AUDIO_CTRL3, 0x2800, reg); /* Audio Control 1 (FSref divisor) */ reg = wlen | aic26->datfm | (divisor << 3) | divisor; @@ -167,7 +168,7 @@ static int aic26_mute(struct snd_soc_dai *dai, int mute) reg = 0x8080; else reg = 0; - snd_soc_component_update_bits(component, AIC26_REG_DAC_GAIN, 0x8000, reg); + snd_soc_component_update_bits(component, AIC26_REG_DAC_GAIN, 0x8080, reg); return 0; } @@ -302,7 +303,7 @@ static ssize_t aic26_keyclick_set(struct device *dev, struct aic26 *aic26 = dev_get_drvdata(dev); snd_soc_component_update_bits(aic26->component, AIC26_REG_AUDIO_CTRL2, - 0x8000, 0x800); + 0x8000, 0x8000); return count; } From patchwork Thu Mar 21 22:15:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cormier X-Patchwork-Id: 10864439 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 091A21390 for ; Thu, 21 Mar 2019 22:21:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC1482A4E7 for ; Thu, 21 Mar 2019 22:21:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D02872A4F1; Thu, 21 Mar 2019 22:21:17 +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=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2C8002A52D for ; Thu, 21 Mar 2019 22:21:17 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 679A19FE; Thu, 21 Mar 2019 23:20:25 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 679A19FE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1553206875; bh=ztYNBw2JtZCftg5u+DJqNK3wZJOtSzrEOevm7/xmr5g=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=UPatclPMa7+SglZkzEFgvz795xP08jkpUzYJOJKLTt1lIOvoH9A7JUcAbQcFXTvjI iomMf1O9WH6eyfWEVlFp+O3QPwNAh42wysqV+WORfijbBqEboDCwZe9CDF6CR6oqPw vCdbL0c2+jkIINQ5uRxrAeHEOCWuLKW2Jp7AmMj0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 8F23AF89737; Thu, 21 Mar 2019 23:16:16 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 40C05F89725; Thu, 21 Mar 2019 23:16:11 +0100 (CET) Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id E3F58F89721 for ; Thu, 21 Mar 2019 23:16:07 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz E3F58F89721 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=criticallink.com header.i=@criticallink.com header.b="DiiRYMPG" Received: by mail-qt1-x841.google.com with SMTP id k14so482281qtb.0 for ; Thu, 21 Mar 2019 15:16:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=criticallink.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mu9vXisaQd7ghjQVLWfrL4876M7CDnfKlb87qdepNrs=; b=DiiRYMPGV8qwxWOzqeuHbFkr40TI6APbXrOH0/YUd0kUIN7wPTF88EUml1b2nXFEXs WE6sM1PisgoLCg3t6Wi+mkFYssmL2uMi0uLkCASmIDY5xrn87pz9sxZanfufW4G66iYk 8NMrq4YPzukYbfuyefjqo7HAo7235nH7es0qroIWoFGuOoFEo0+5aie2qG1ebK84pjXe BHAIqen9tmssXDMvA11cCGW5okZWbS1vxPf0VMegdNDZRxbMlPaS9CkX7bZT3WFBj2v1 HniDbMzhRKr4piOwksnT+gBsNMsuZhqj075GO3GhPe6eLd1Zymz8N03U/FKdmBa326mm Dcdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mu9vXisaQd7ghjQVLWfrL4876M7CDnfKlb87qdepNrs=; b=q+X+SkwbILb0Q23/q6Wy+MRT68an75dTkzPtU1Rx3FfeLBleSPztg1CqpfxLAbnTHy Sw4XxICkzy5Sy5/L9YlVS8bpQ3st2BjFoT57bgsUVTHuHmwx8GIxYIe0gJbM8JK/0ODb Q1Z5PUFzSvFQxs2hWcosaHnAbxswDR1SDB47U9YukyWiDhY6aXzRqnQHlLNLOZYLFcCT MfByL1tkysHz/crRmtKwynXjDxWJia5DkVkPbQoqv1zlFEZ2oLlsl7Yn3I7alYpQxQ7H rNvO3ri5U+L3TNxfEkGZ7WnU+p2bT5azFlQHZt0lKiwEEYupSenuUwwCQEo2Ppz1ZMPy 07Tw== X-Gm-Message-State: APjAAAVIryIvDp/WLI1UJOYRpdAGfu1Fy8Nn36Xkh6h0V6UcmHNXCHZS BpSSYK/5eDh0K1Dbw+z706V+Ig== X-Google-Smtp-Source: APXvYqyrnQKlB8qmYvLMRwUg+4JuuE2obl6Jjc3atAOxJCBZzaYtjSNe4k+wYYgpdtOFjxSzru1jYA== X-Received: by 2002:a0c:a3c1:: with SMTP id v59mr5177313qvv.159.1553206566766; Thu, 21 Mar 2019 15:16:06 -0700 (PDT) Received: from jcormier-MS-7A93.syr.criticallink.com (static-72-90-70-109.syrcny.fios.verizon.net. [72.90.70.109]) by smtp.gmail.com with ESMTPSA id w37sm3895968qtw.27.2019.03.21.15.16.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 15:16:05 -0700 (PDT) From: "Cormier, Jonathan" To: Liam Girdwood , devicetree@vger.kernel.org Date: Thu, 21 Mar 2019 18:15:49 -0400 Message-Id: <20190321221549.13765-8-jcormier@criticallink.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190321221549.13765-1-jcormier@criticallink.com> References: <20190321221549.13765-1-jcormier@criticallink.com> MIME-Version: 1.0 Cc: alsa-devel@alsa-project.org, Bob Duke , Mark Brown , linux-kernel@vger.kernel.org, Takashi Iwai , Rob Herring , Peter Ujfalusi , Mike Williamson , Jyri Sarha , Greg Gluszek , Misael Lopez Cruz Subject: [alsa-devel] [PATCH v2 7/7] ASoC: tlv320aic26: Change Capture Mute to Capture Switch to match alsa documentation. X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" X-Virus-Scanned: ClamAV using ClamSMTP Control name needs to match Switch for alsa to use it as the channel mute Signed-off-by: Cormier, Jonathan --- sound/soc/codecs/tlv320aic26.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/tlv320aic26.c b/sound/soc/codecs/tlv320aic26.c index c6ff4ca29d43..3935be79b091 100644 --- a/sound/soc/codecs/tlv320aic26.c +++ b/sound/soc/codecs/tlv320aic26.c @@ -269,7 +269,7 @@ static const struct snd_kcontrol_new aic26_snd_controls[] = { SOC_DOUBLE("PCM Playback Volume", AIC26_REG_DAC_GAIN, 8, 0, 0x7f, 1), SOC_DOUBLE("PCM Playback Switch", AIC26_REG_DAC_GAIN, 15, 7, 1, 1), SOC_SINGLE("PCM Capture Volume", AIC26_REG_ADC_GAIN, 8, 0x7f, 0), - SOC_SINGLE("PCM Capture Mute", AIC26_REG_ADC_GAIN, 15, 1, 1), + SOC_SINGLE("PCM Capture Switch", AIC26_REG_ADC_GAIN, 15, 1, 1), SOC_SINGLE("Keyclick activate", AIC26_REG_AUDIO_CTRL2, 15, 0x1, 0), SOC_SINGLE("Keyclick amplitude", AIC26_REG_AUDIO_CTRL2, 12, 0x7, 0), SOC_SINGLE("Keyclick frequency", AIC26_REG_AUDIO_CTRL2, 8, 0x7, 0),