From patchwork Fri Nov 2 11:20:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 150025 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1948210ljp; Fri, 2 Nov 2018 04:21:15 -0700 (PDT) X-Google-Smtp-Source: AJdET5fGC8pwLZ5eQ9PSa4ea+nor9aCSA4S/yJWppLfZfxNC9gM+tt09tj/1Evtk8ptsr1fnjPay X-Received: by 2002:a1c:cc0f:: with SMTP id h15-v6mr382259wmb.1.1541157675467; Fri, 02 Nov 2018 04:21:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541157675; cv=none; d=google.com; s=arc-20160816; b=q0lENr4LbnrJZdYTGnZ5CZvZrHhIopY+M/TiuyGEfFnEfltLpmVWRzCa90u9QIjDXG SwaLj5ZxqrGl6ntfAiW9lnyRLSut136NmLKW7pqYAVuIuTaPxGbMBjzk1gW46xfN4GT1 kx/zOoKoejbc9aOj0WX2p01PJb1zMSGb6ud6NXYRdwsSzZVf76AnHnSb8VXCKlKDUSnW htD/TPlAQ4GLgKDAdXyUAijwhXS3yctOZtRPdXylH3ePytsFBtKDqArL3Kpj1D/Ct5fg q/i0MY0qdRvMin/lVjX21o/p+cTMAusvu+jD8ukwCRUF+y1YoElvO7UpQl8UWoXjrVix mreA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from:delivered-to; bh=LK1pHen7z74OkMS0MpSUXUYkxGgF4GtFanwhPjQ2J7Y=; b=Qv3CunnhNjb4EkhPWV2iVPohM5bkbMDB0RSWkdwtFrfMmsHKt2jJ7qCBTXVCX/e7zv qQ8CwGXhctgLtEBz4QzuIjT/WHTdjNVpRYjzxWUP0TH32dntfyj9/qAaLKdaKBfE4PLX g0sRNRaTIsynhYYCdbZAWO3PohADvFGH6y1uPwkRWHbL6nKVu9mgCg2go1Oij1S2fB8Y tLQUK9oNKl2pLyfITlGnJOm0+ms2M+Go78Ss4oQj2D6Kf8E9KZtJCmYPZHj4mcHsxAax XtrbuQb30AXr8z3AFZnLpBZLdXZw6cqMCqFD1r48/yCh4ZLVsJXt8/8hlP5AujMFw7C9 OOVQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id v70-v6si21112879wmd.151.2018.11.02.04.21.15; Fri, 02 Nov 2018 04:21:15 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 5124E2678CA; Fri, 2 Nov 2018 12:21:13 +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 F40F626792C; Fri, 2 Nov 2018 12:21:09 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by alsa0.perex.cz (Postfix) with ESMTP id 73F8A2675BA for ; Fri, 2 Nov 2018 12:21:07 +0100 (CET) Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MSKly-1g7aEs36E4-00Sfre; Fri, 02 Nov 2018 12:20:58 +0100 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MSKly-1g7aEs36E4-00Sfre; Fri, 02 Nov 2018 12:20:58 +0100 From: Arnd Bergmann To: Robert Jarzmik , Mark Brown Date: Fri, 2 Nov 2018 12:20:39 +0100 Message-Id: <20181102112055.659197-1-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 X-Provags-ID: V03:K1:ESqNhR/pZIkwUiJzsNsw109mDWNtgeDa26qYuT02SK8cuyfEmct FNtOVObVUeR9aw+CVyloUj+FFwO/MhTn7aWBAeO0zgDTJzy/ibGDTR4uprlGzUxhISxKSRB RRFKJIB4LXBquPPIH6TPXtN8rTzts1tOFWHwZ+Ui9BJlQVEJOgPDn8r6B8lkzPHA+rwaDdE IX09MIBeVZJk/6lVJBgMw== X-UI-Out-Filterresults: notjunk:1; V01:K0:gZ6fwWnECpI=:3BrnEWfYsZQu6elAT4zEAY PkQUw2doxPKEy12uRO65xi3V5RRA+RL/CZvMKjibcKJbgAUpY4O7b7FxfbojG8kBjD+XQnvUV SLySL7UPlqeiEePT9oMYehvHVPpETfo+HuJFTKitCv1y9YYJ3eAZOWxKjDZ/6VB7LwG9vFZGm G+Vp9Gwy897yrcH912z3T+LjCaOTUWyyHvsNH442hFnFz2la0aw4OIj7h+KE3ZuYzJCjGfoTg CFkwviJLDH5xg/PP+n5EkU7KwIjMjT6oZBuSH1BSbYlKpDf9vx60lsCuwlDkNYewc84lQGsn8 4H7CQD4ZAXUF8QBd0tRF8Q4tKJ+ZABP+7GEl0a5MCbv8BCeVPZKOI8WVZFEaIu7f+5gq17Zyq rH3JtaD2+yc2E8Q4vEYOwWJcJRvEmW8sn50nF+gmI1mKOhCWtA8TEF+hHAsv0xWyLMJzPv4H4 jYiXZezCJd5orIvMLmmwm4O/DBbqqKNQPWGQNdbaYzhyFbd9yObKnzZTRrXKZZ1gKT0tvI5Fj DIvwpjJVBvemM5/j40KEuwcSh0lArMQA2SFJTBb88VY4W85dJYijnspZQCP0XfciQI1K7hqzp xBfYCwoBRkt75hvYTVY5PjjdI2iIpFrWF3yvc18uS1+jLFxhZnxID5XvpzbhJLC5tLSOgB54f lwZc1x4nNB8Xt0j8CYdr0FofJ3579owU9b6MAMncK9uhVSas5nEiRKtVySZy7cEzbi9M= Cc: alsa-devel@alsa-project.org, Arnd Bergmann , Liam Girdwood , linux-kernel@vger.kernel.org, Takashi Iwai , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, Daniel Mack Subject: [alsa-devel] [PATCH] ASoC: pxa: change ac97 dependencies 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 Enabling both the old AC97_BUS code and the new AC97_BUS_COMPAT causes problems because both modules provide an exported snd_ac97_reset() function. I had tried to fix the problem of having both coexist earlier, but my patch only prevented them from being built-in. This is because of a special Kconfig feature that lets a symbol have a dependency on another one being disabled, but still allow both to be loadable modules. Changing the dependency to =n avoids that problem, now we can only build the new driver if the old one is completely disabled. If we could figure out a way to let rename one of the reset functions and have each driver link to exactly the old or the compat code, that would also work, but I could not find if that's possible. Fixes: bec5ecdf41d4 ("ASoC: pxa: avoid AC97_BUS build warning") Signed-off-by: Arnd Bergmann --- sound/soc/pxa/Kconfig | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.18.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig index 943b44de1464..6075fc32e6b9 100644 --- a/sound/soc/pxa/Kconfig +++ b/sound/soc/pxa/Kconfig @@ -79,7 +79,7 @@ config SND_PXA2XX_SOC_TOSA tristate "SoC AC97 Audio support for Tosa" depends on SND_PXA2XX_SOC && MACH_TOSA depends on MFD_TC6393XB - depends on !AC97_BUS + depends on AC97_BUS=n select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -89,7 +89,7 @@ config SND_PXA2XX_SOC_TOSA config SND_PXA2XX_SOC_E740 tristate "SoC AC97 Audio support for e740" depends on SND_PXA2XX_SOC && MACH_E740 - depends on !AC97_BUS + depends on AC97_BUS=n select SND_SOC_WM9705 select SND_PXA2XX_SOC_AC97 help @@ -99,7 +99,7 @@ config SND_PXA2XX_SOC_E740 config SND_PXA2XX_SOC_E750 tristate "SoC AC97 Audio support for e750" depends on SND_PXA2XX_SOC && MACH_E750 - depends on !AC97_BUS + depends on AC97_BUS=n select SND_SOC_WM9705 select SND_PXA2XX_SOC_AC97 help @@ -109,7 +109,7 @@ config SND_PXA2XX_SOC_E750 config SND_PXA2XX_SOC_E800 tristate "SoC AC97 Audio support for e800" depends on SND_PXA2XX_SOC && MACH_E800 - depends on !AC97_BUS + depends on AC97_BUS=n select SND_SOC_WM9712 select SND_PXA2XX_SOC_AC97 help @@ -120,7 +120,7 @@ config SND_PXA2XX_SOC_EM_X270 tristate "SoC Audio support for CompuLab EM-x270, eXeda and CM-X300" depends on SND_PXA2XX_SOC && (MACH_EM_X270 || MACH_EXEDA || \ MACH_CM_X300) - depends on !AC97_BUS + depends on AC97_BUS=n select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -131,7 +131,7 @@ config SND_PXA2XX_SOC_PALM27X bool "SoC Audio support for Palm T|X, T5, E2 and LifeDrive" depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || \ MACH_PALMT5 || MACH_PALMTE2) - depends on !AC97_BUS + depends on AC97_BUS=n select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9712 help @@ -161,7 +161,7 @@ config SND_SOC_TTC_DKB config SND_SOC_ZYLONITE tristate "SoC Audio support for Marvell Zylonite" depends on SND_PXA2XX_SOC && MACH_ZYLONITE - depends on !AC97_BUS + depends on AC97_BUS=n select SND_PXA2XX_SOC_AC97 select SND_PXA_SOC_SSP select SND_SOC_WM9713 @@ -201,7 +201,7 @@ config SND_PXA2XX_SOC_MAGICIAN config SND_PXA2XX_SOC_MIOA701 tristate "SoC Audio support for MIO A701" depends on SND_PXA2XX_SOC && MACH_MIOA701 - depends on !AC97_BUS + depends on AC97_BUS=n select SND_PXA2XX_SOC_AC97 select SND_SOC_WM9713 help