From patchwork Fri Nov 2 15:33:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10665831 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 9E52314BD for ; Fri, 2 Nov 2018 16:12:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A5132C38A for ; Fri, 2 Nov 2018 16:12:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87B152C4DE; Fri, 2 Nov 2018 16:12:04 +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,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,SUBJ_OBFU_PUNCT_MANY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 209DA2C38A for ; Fri, 2 Nov 2018 16:12:03 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3DAA426798A; Fri, 2 Nov 2018 16:34:18 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id A00ED267996; Fri, 2 Nov 2018 16:34:16 +0100 (CET) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by alsa0.perex.cz (Postfix) with ESMTP id 5EC7826796C for ; Fri, 2 Nov 2018 16:34:13 +0100 (CET) Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1M42fA-1gIbSb1SRE-0001PJ; Fri, 02 Nov 2018 16:34:09 +0100 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPA (Nemesis) id 1M42fA-1gIbSb1SRE-0001PJ; Fri, 02 Nov 2018 16:34:09 +0100 From: Arnd Bergmann To: Jaroslav Kysela , Takashi Iwai Date: Fri, 2 Nov 2018 16:33:40 +0100 Message-Id: <20181102153406.1528053-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:fT64GQCt3ITNlORRv1BBYCNCCCF4dp4AUPXGY+8Cd4hqQf6OUi0 a9dyGNM9kkEvvpaOKWc3fznCfwMmwReEa8h3m9BWqID0DSmfY3xRXPFAITA0eKOfiVnKx1S Ch8STSv+ZnMwy3A4eipNfK3lBQEDOTM/AOONVQBrq/KV1YFJyEdTsBxACb0v7K28EKZ+Acs FAjYdeBhqFiUJVWb6MALQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:J1+RDrAoVjU=:sCZDXzLXJw5uCGCxELqcPR 4DBd4VR2Xm1W9enHgYlEmU/94ufNZU778ORyadVIDHqCXh9oL6h7ReWT0nyk6L08nC9vSqVkl axTqjpnjHP5V2JrPQUqsN9yxurvfka2TCPdWZaq0xGr3lafd5/2FD6O9Mcs+4zNoFWeUHcYgC ygTMJiDd0bIPYAJaxguQATlJOK2M47JPB4eFSTYS6RVS97SDRChqAL+7AMp0ijTjBrjqpWybG orALo2FGqehKv9oTMpYOoypET/E78zBjQtzymfdFHk0yQOLertGS9tuOXmWFGn9vvi4s3sqnC BITKjBAJ0/4JHKC/C8Ba3KPbgkSYBvu+05NbABtF+LQ+pLyMPUSaxQrlwfE8khtj4xBBXiZE3 DhuQYpVL6Hd0xvjSy1AW5D9JasMBBMzBtIf0Bg/BglHFM+nKS842UTM/59IiAlaxFN7puo7ah 5a9G1GwGmfn/XOSIL9hc4/reUHR5DS7WCHimSIqvmOhnoHkVElxJxmDa/um1hKFDpi+Svf4SP yYB0MAjijk+gSYLAScCPWWsNHDCeMx8+DWQ+mh+d5iXTjR4MF+y5l7HuazLXo1cFbW2ZqsJJp dzci/rlXHPpUe6xOxOxPcBLhucXHZQiHA90T41xFq5nYYbkhwQAHY0VOshu0kBoUIJJQC55ve LGfB41DwkP82c1pLUMaoLvmarr9+pSImYvoX7l11dc1C1ivcY8oGwB5mYfx+L0f2fxpU= Cc: alsa-devel@alsa-project.org, Arnd Bergmann , Maxime Ripard , Liam Girdwood , linux-kernel@vger.kernel.org, Vasily Khoruzhick , Chen-Yu Tsai , Mark Brown , linux-arm-kernel@lists.infradead.org Subject: [alsa-devel] [PATCH] ASoC: sunxi: rename SND_SUN8I_ADDA_PR_REGMAP X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The newly added SND_SUN50I_CODEC_ANALOG driver selects a nonexisting symbol SND_SUNXI_ADDA_PR_REGMAP, which was evidently intended to replace SND_SUN8I_ADDA_PR_REGMAP, but since they are now mismatched, we can run into link errors for some configurations: sound/soc/sunxi/sun50i-codec-analog.o: In function `sun50i_codec_analog_probe': sun50i-codec-analog.c:(.text+0x62): undefined reference to `sun8i_adda_pr_regmap_init' The new name appears to be more sensible, and as the symbol is hidden, there are no downsides in the rename, so use that consistently now. Fixes: 42371f327df0 ("ASoC: sunxi: Add new driver for Allwinner A64 codec's analog path controls") Signed-off-by: Arnd Bergmann --- sound/soc/sunxi/Kconfig | 4 ++-- sound/soc/sunxi/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/sunxi/Kconfig b/sound/soc/sunxi/Kconfig index 66aad0d3f9c7..0f992bdf1a10 100644 --- a/sound/soc/sunxi/Kconfig +++ b/sound/soc/sunxi/Kconfig @@ -23,7 +23,7 @@ config SND_SUN8I_CODEC config SND_SUN8I_CODEC_ANALOG tristate "Allwinner sun8i Codec Analog Controls Support" depends on MACH_SUN8I || (ARM64 && ARCH_SUNXI) || COMPILE_TEST - select SND_SUN8I_ADDA_PR_REGMAP + select SND_SUNXI_ADDA_PR_REGMAP help Say Y or M if you want to add support for the analog controls for the codec embedded in newer Allwinner SoCs. @@ -54,7 +54,7 @@ config SND_SUN4I_SPDIF Say Y or M to add support for the S/PDIF audio block in the Allwinner A10 and affiliated SoCs. -config SND_SUN8I_ADDA_PR_REGMAP +config SND_SUNXI_ADDA_PR_REGMAP tristate select REGMAP diff --git a/sound/soc/sunxi/Makefile b/sound/soc/sunxi/Makefile index a86be340a076..c4dd2803a011 100644 --- a/sound/soc/sunxi/Makefile +++ b/sound/soc/sunxi/Makefile @@ -5,4 +5,4 @@ obj-$(CONFIG_SND_SUN4I_SPDIF) += sun4i-spdif.o obj-$(CONFIG_SND_SUN8I_CODEC_ANALOG) += sun8i-codec-analog.o obj-$(CONFIG_SND_SUN50I_CODEC_ANALOG) += sun50i-codec-analog.o obj-$(CONFIG_SND_SUN8I_CODEC) += sun8i-codec.o -obj-$(CONFIG_SND_SUN8I_ADDA_PR_REGMAP) += sun8i-adda-pr-regmap.o +obj-$(CONFIG_SND_SUNXI_ADDA_PR_REGMAP) += sun8i-adda-pr-regmap.o