From patchwork Tue Apr 19 13:18:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8879921 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 127E09F1C1 for ; Tue, 19 Apr 2016 13:19:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34EF1201F2 for ; Tue, 19 Apr 2016 13:19:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C959201B9 for ; Tue, 19 Apr 2016 13:19:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754327AbcDSNTG (ORCPT ); Tue, 19 Apr 2016 09:19:06 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:65008 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754323AbcDSNTF (ORCPT ); Tue, 19 Apr 2016 09:19:05 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0LqFFo-1bNQWF0FDk-00dlZo; Tue, 19 Apr 2016 15:18:55 +0200 From: Arnd Bergmann To: Mark Brown Cc: Robert Jarzmik , Arnd Bergmann , Daniel Mack , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] spi: pxa2xx: disallow building on MMP Date: Tue, 19 Apr 2016 15:18:20 +0200 Message-Id: <1461071933-3273163-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:3eeZUCXS+9xIjpSOw0mgoLPwfpAf3+EAbHvSuiZvmPUn46tsasd nsXn+fL/18u4I5/EQU07J4+Lyjh4ahgSkkvjEKcLbAXJHYnCX99s+meegJu4pxTfCN5isO4 NcexyRjtJP4mV2vIJS1/83jwTz+dzf+C3IJRh6eRvjSvUrtmaaJkRAS+TnAST2I4x6c04Nb AqXQJsuBPYjrXLJfov5rQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:Q9oXNuBiT3g=:r9NRqDx3XBkgE9G7PabVTM +crEDEXIzzlIv0uU2/uyW4PmbfJsTy3O9v+65z79wSD3N2p57ks/9gGkBbwwtjfqRckFTGBRO pRzpbJhB3bAD4mS8IatNQlzz1KSnjx5fKy0GrJGun39kvq/VGfWEmVhLYKctSKHUfipAZvMeD Tmu3RlFB6Ib6Dap6PPt36wUPzdWIZOzaryX2yZ0PZ24q486UuZV1cxjY6ucXxnAWHCUp2C98Y GnZnUhU/am3YS3Jk0au0AeTHBq6hXgrhJF5yJ90r3JmegOQSAmd/lRCQv2K0WiOZrWTeVnoLM FaQCNOqr1XxvNgoc6AomsF+hshKsSFsYpYOxu4JqQW4YtNFhnZ62kNAmy/ZfmIA5TxLVeBUfc RqG0idQijxDHQBzcFSLPRV2jqhQ5yKGB5XqpboXVHN6mmRYLsjZZKLfzQXxqFT0TaQQEifTrA q3y18Wts+esH6GZuK2oRU6rk7FagegkkJSxfJfvnscm3AHs0P7OotXG3tH32AC8LZu5ykpKjO aRTF+YpSWABEjrf9nTCwfYcwXI3SadnPwcF+8iqJhD6blIYiSYXwg10MhTWKBbJzShbTqHq/6 6ynXSEjFe1larM5N78IODg/nkFx9y5PpmBQ4IDcsRU+kRwdetSEr4t2oZh2qPsmQnhT2xQlEJ cFQEFAMHspxrS9R+1Sbj7seNRcn2ob8QQk5+dmWvjtgxVQ8cf31S7LDg7lUx0536TPAU= Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After MMP has become part of a multiplatform build, we can end up with a randconfig build failure in the pxa2xx spi driver: drivers/spi/built-in.o: In function `pxa2xx_spi_remove': :(.text+0x1845c): undefined reference to `pxa_ssp_free' drivers/spi/built-in.o: In function `pxa2xx_spi_probe': :(.text+0x19844): undefined reference to `pxa_ssp_request' What happens here is that we can enable SPI_PXA2XX when some other platform in the same build supports PCI. This normally works because the pxa_ssp_request/pxa_ssp_free functions are stubbed out when CONFIG_PXA_SSP is disabled. However, we can have PXA_SSP=m when that driver is used by the SND_SOC_TTC_DKB audio driver. This changes the Kconfig logic to just disallow the pxa2xx SPI driver on anything but x86 and pxa. Signed-off-by: Arnd Bergmann --- drivers/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index e33be3775a3c..ad8d8714d5b0 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -469,7 +469,7 @@ config SPI_PPC4xx config SPI_PXA2XX tristate "PXA2xx SSP SPI master" - depends on (ARCH_PXA || PCI || ACPI) + depends on ARCH_PXA || (X86 && (PCI || ACPI)) select PXA_SSP if ARCH_PXA help This enables using a PXA2xx or Sodaville SSP port as a SPI master