From patchwork Tue Dec 5 12:48:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10092895 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 CD02E60327 for ; Tue, 5 Dec 2017 13:04:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A421E288D9 for ; Tue, 5 Dec 2017 13:04:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98ED82893B; Tue, 5 Dec 2017 13:04:23 +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 324E0288D9 for ; Tue, 5 Dec 2017 13:04:23 +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=AirkFiNYmpqZd6SPfuK0+S/SWkcQZ5KwQrBz/1EDuXg=; b=Bcz l9lQrK4YxjCjskhIblappebSWmRO7TPTUiOrfjUDr/eSH6FXHCGBJumunekiYUh/OFtHsf+qr1hxE Hf2I/qS6ZGo4VDzSGQOyk0KGoL3XLgICK6SAW17em0MdSwrnRPOsNXOneqsYt2OwQPEYqpR0b1imA yDtv60C5ETKNyAD0wTJUA8DXj5rrydrweu7apfcOwx6TQcEGNkvdKK/jngNqu9jtvav+dbnSo5SS/ takeDtaohVeq+UtwA8nVlof8XTNaqRMzFZGq5kz8j6eyeKjYxm0l0C0VJine+bjCqfwiezGtF5vPN sqLo5ycVskwA+Q6v/KjK3GrN9esK6tQ==; 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 1eMCtX-0005hT-48; Tue, 05 Dec 2017 13:04:19 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMChH-0006yz-7L for linux-arm-kernel@bombadil.infradead.org; Tue, 05 Dec 2017 12:51:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=54N+JRH8F6zjhhMsdxNgJVd2BG1FJEjAhUNSng3DDi4=; b=WlplzDtaCU24Kb3XrLJKEwN6hU ILCu1tGQI8goeU8Jvb77XWi9P/7+2PtUL909+J5VeJ8iq0ENSjBsJIKqqbzJcgygLuYi7LT350e6F fxh+bpgxBFqJchNWPaJGvnMRwvKewMANfNEjZ1S/KZdVZlsw7MHMSj7SXv45p5aRSi3XTRi/ovmwR /YrsAk8ZSpcw0GRl7xa6R1K0FMrwiQjMiL6fStl6buP6USoK9ZorzfITs9g4cM8W04QlbzG/C7BeB 7D8LIPZlf9jr9+gR4WUVUXsCDQd4LqBb2EfW8gn28r54cyYWszyqRkaxT/X58MHw3ZMvhCtpgl/SY 0kYVOKmA==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMCf5-0001PF-Mm for linux-arm-kernel@lists.infradead.org; Tue, 05 Dec 2017 12:49:25 +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=54N+JRH8F6zjhhMsdxNgJVd2BG1FJEjAhUNSng3DDi4=; b=v59PAdBT/oU1 hDD6VgeqkI5RYteM7d+a30QfSHPnrfRTo+GMiDKsHpsQdo5b9lMjwJilf2DMyk/2/bzoor2grvp8u s30eFBKi3WRrH5ss/HjlKdKSfKm1VHzGwEZXpJq/FIWjhn5HK1exNcFrOPz/Q+MIQZ0vwVTHPM5Ju Szg6I=; 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 1eMCdw-0001Mm-1w; Tue, 05 Dec 2017 12:48:12 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id B155B44006B; Tue, 5 Dec 2017 12:48:10 +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: <20171205124810.B155B44006B@finisterre.ee.mobilebroadband> Date: Tue, 5 Dec 2017 12:48:10 +0000 (GMT) X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171205_124923_782959_B9ED2365 X-CRM114-Status: GOOD ( 18.43 ) 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 d20957ef48c3c0c37e44c5385baf1cdfd132f0db 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 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