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: 10665305 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 2867713BF for ; Fri, 2 Nov 2018 11:22:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 173BF2B351 for ; Fri, 2 Nov 2018 11:22:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A11F2B37A; Fri, 2 Nov 2018 11:22: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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham 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 93CD92B351 for ; Fri, 2 Nov 2018 11:22:03 +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:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=/HrpaLFZAwi8QCOmKHFHlo0YYo3e19WRCnAV+fvBwXc=; b=Xbk 9bnrEWSGBcEWsz4HUXpGtNlHCuJ1TmQFRldk+5YkevOppdWRpwlI5SETfOFBxcSXRI7GcrsduKERZ h7F6bcp1ZYnRpTdQWEcsAjmHrRzLrMcKXdK0CXC6bX/h1AfhWL/hBsb33b7uVxSmr3E3GY78q0mti D4xJ7kGpbY4TgOSM5U067bd6TCoUICNCa4ZdOxGe7J8cjAUZMlHT7Wwga7yr5Xzfa9Z1J/j1YN6ry I0ALUMaj7aYE/frMBSGODp6gFQ3vXifGWEC68bOHl3ucsbTlw4Gg4fGzytl/b3rO1YfbHuU7edb9f a/7l7oYnW/S+q1hkXqpxkAxIA5KLI2A==; 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 1gIXWY-0005h0-Os; Fri, 02 Nov 2018 11:21:58 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gIXWU-0005fr-TP for linux-arm-kernel@lists.infradead.org; Fri, 02 Nov 2018 11:21:56 +0000 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 Subject: [PATCH] ASoC: pxa: change ac97 dependencies 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= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181102_042155_249386_E839AF75 X-CRM114-Status: GOOD ( 14.78 ) 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, Arnd Bergmann , Liam Girdwood , linux-kernel@vger.kernel.org, Takashi Iwai , Haojian Zhuang , Jaroslav Kysela , linux-arm-kernel@lists.infradead.org, Daniel Mack 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 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(-) 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