From patchwork Tue Dec 5 12:48:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10092891 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 0D80060329 for ; Tue, 5 Dec 2017 12:49:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB67A287FA for ; Tue, 5 Dec 2017 12:49:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E012428CE6; Tue, 5 Dec 2017 12:49:25 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 74DB9287FA for ; Tue, 5 Dec 2017 12:49:25 +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=O7aOC1WD/jPoqurwuuz82UxgjxPX1I3gmJiNfinFhk8=; b=Whx LBLvy6fiH4MGpeUsNu5T0pzPoNAc61ECIuJCB9TsQBlHk/fFiyGdTJweLZEYuX7n4WVYBdvEGu1sP lmHrdgnuUvWIqiafoAu2lL5MYbxTH5V/HwsZvH42hL9+oDsyGP2OmxmmyhSJ7PuA2FGrPWTpjKNrE BRuCrPDotlB0iEBt0mfmu3bTUH6X4aUF2tt2ToNvgRWhUB0SowPMOFPNRbp7S61gbgYIPKrckbMyt roKP435Ra0l3Mt2yFZ4oD2hpDTShpt/XPwNybatDflEeSC/5S7a+8ognpKHfjLIJf2pmi+ZYmvj75 iTZ4SUfBCojtxhv1H4haQDO+nwxgxlw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eMCf7-0005Hb-60; Tue, 05 Dec 2017 12:49:25 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMCf5-0005Az-DV for linux-arm-kernel@bombadil.infradead.org; Tue, 05 Dec 2017 12:49:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.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=rj3H9OR5TE0x34KHjAglhdzmqKv86eBDc+YdGhCOTp4=; b=y/iIRTs7c811n0qDsi1s4d/WFL WUbMpgO4uJas6XxC3VJszP4rqsd4Mj2KCSPk9yVvrExhkC4ScIBUfG0hJ0P6chiSqVa88cInGhBrd U03RHr2dnDggnyJ8eHZI2wTtSTMaZyCvcZCaeY8ML17/UWhtThzYwjsAneCMGIvc8WN9PQRtPMstv k1BBMMBMqOT6fr5xCwUXrOFICDMC5Zzk4bNI0OXmlxPvd2bQmXhiK24BdnRujPIOy3SpmEQVbZ4xu DsyHSHjlooL/a7ZowQseQM19r/AQwhmbcB0dW2iAe5yIbImxOhvP3sTA6Pnf5JZ9u4ahvtGgcYIeb +zeHQIZA==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMCf2-0005bM-DS for linux-arm-kernel@lists.infradead.org; Tue, 05 Dec 2017 12:49:21 +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=rj3H9OR5TE0x34KHjAglhdzmqKv86eBDc+YdGhCOTp4=; b=CXMiSgX/WFHc R0faylBuJY1yG/0PI5t12Y0zBZXUinRS6RjZX6nbndWru+6Nibo724E8z2LeOWO37NtaQqFNWBzoS yGBI1jfgz/4Egq5kVO0D3El21iSv/UHIgW0B7GanftR1OhCddu7t6oLXv7oq3xv0Zi1yiesxAln1E jhRQc=; Received: from 92.40.248.179.threembb.co.uk ([92.40.248.179] 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 1eMCdo-0001Mc-UB; Tue, 05 Dec 2017 12:48:05 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id D380E44006B; Tue, 5 Dec 2017 12:48:03 +0000 (GMT) From: Mark Brown To: Arnd Bergmann Subject: Applied "ASoC: atmel-classd: select correct Kconfig symbol" to the asoc tree In-Reply-To: <20171205101000.968887-1-arnd@arndb.de> Message-Id: <20171205124803.D380E44006B@finisterre.ee.mobilebroadband> Date: Tue, 5 Dec 2017 12:48:03 +0000 (GMT) X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. 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, Liam Girdwood , linux-kernel@vger.kernel.org, Takashi Iwai , Mark Brown , Alexandre Belloni , 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: atmel-classd: select correct Kconfig symbol 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 7e3dba272e5ef5b38fba8710f98b4b3da7232ea5 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 5 Dec 2017 11:09:38 +0100 Subject: [PATCH] ASoC: atmel-classd: select correct Kconfig symbol Commit 061981ff8cc8 ("ASoC: atmel: properly select dma driver state") changed the way that the dependencies are handled, but then the Class D amplifier support got merged, which used the old method. This seems to have triggered a very rare randconfig condition for me now, leading to a link error: sound/soc/atmel/atmel_ssc_dai.o: In function `atmel_ssc_set_audio': atmel_ssc_dai.c:(.text+0x79c): undefined reference to `atmel_pcm_dma_platform_register' atmel_ssc_dai.c:(.text+0x79c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `atmel_pcm_dma_platform_register' sound/soc/atmel/atmel_ssc_dai.o: In function `atmel_ssc_put_audio': atmel_ssc_dai.c:(.text+0xf24): undefined reference to `atmel_pcm_dma_platform_unregister' atmel_ssc_dai.c:(.text+0xf24): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `atmel_pcm_dma_platform_unregister' Changing it to select SND_ATMEL_SOC_SSC_DMA as intended rather than SND_ATMEL_SOC_DMA directly makes it work again. Fixes: e0a25b6d1862 ("ASoC: atmel-classd: add the Audio Class D Amplifier") Signed-off-by: Arnd Bergmann Acked-by: Alexandre Belloni Signed-off-by: Mark Brown --- sound/soc/atmel/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index 4a56f3dfba51..2d998e5c4fb5 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig @@ -64,7 +64,7 @@ config SND_AT91_SOC_SAM9X5_WM8731 config SND_ATMEL_SOC_CLASSD tristate "Atmel ASoC driver for boards using CLASSD" depends on ARCH_AT91 || COMPILE_TEST - select SND_ATMEL_SOC_DMA + select SND_ATMEL_SOC_SSC_DMA select REGMAP_MMIO help Say Y if you want to add support for Atmel ASoC driver for boards using