From patchwork Mon Feb 19 10:13:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10227395 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 45A9A602B7 for ; Mon, 19 Feb 2018 10:15:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34FFC2896D for ; Mon, 19 Feb 2018 10:15:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27915289CD; Mon, 19 Feb 2018 10:15:50 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96F43289C7 for ; Mon, 19 Feb 2018 10:15:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752417AbeBSKPI (ORCPT ); Mon, 19 Feb 2018 05:15:08 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:37105 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752244AbeBSKPE (ORCPT ); Mon, 19 Feb 2018 05:15:04 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.129]) with ESMTPA (Nemesis) id 0MCk22-1evvgG1uYE-009NOO; Mon, 19 Feb 2018 11:14:50 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Cc: Greg KH , linux-kernel@vger.kernel.org, Arnd Bergmann , Mark Brown , Sasha Levin , Geert Uytterhoeven , linux-spi@vger.kernel.org Subject: [4.9-stable 5/9] spi: bcm-qspi: shut up warning about cfi header inclusion Date: Mon, 19 Feb 2018 11:13:24 +0100 Message-Id: <20180219101343.2922561-6-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180219101343.2922561-1-arnd@arndb.de> References: <20180219101343.2922561-1-arnd@arndb.de> X-Provags-ID: V03:K0:fNFR2SkUFidD6DOd1hU5AvN+G6oI/N4CzysfeBlm1iWZIRCXOjG lzSiGhuoVlgPkivX+6stIh5N/Jf0u9LytIbyq28exIKTIGw14a9UrOiZjRCSTzRu/lGbybA qMpS3H3sDgUDW0uUAzzK9bJCz4LO3ub7HvBrnpH9Jt+g3czQLb4vxAeeO3LeRPwrRa/WG1s 3EAsc7gB9arOjNrOzBm3A== X-UI-Out-Filterresults: notjunk:1; V01:K0:AY+2YVoWEbo=:fcLX51cy29RDGkP2X7ABTd nTnjHh6+mW6exPRfg9cVmHDnu5imP2UR6MDsWOAfSPGSGt3ptNr+bR7nQNA7uBv0gHt5Kkzu3 6h44G5xyrlDmlhfZ/WS9mXJE4dqi48R9GAEnd9iSHbJuf/y3h2SFL53eV/WSl254Yt39LVSJI 8fLuN8MgOm4wBFqWi8ohl9130IwniMzh6PAfyUcdM3BIAObboHm/9NQWClD6RHsVVLv2iy9/8 /Vsp6EUx6f2ZD/7GQKhcEcEHz3yaKxy4IK+uwbLboPJV/6rVwoRc/uB03051qq02Z4tRM5Udb 6QZsYIIyOMilbBvCLOHqPBKWF16pKkYeAh59SlzSD6TQ2nD08ER2vy6UwJkgWxXAInaMCP7xa nsZx0YWb0wgBvPMtsAGSfUc2MGZRRkOIcDhhr4ZyGiFqvKG2LG/aQoBjRwkUmZkbjAq04a96B yQH6brhEwlPXZdYUft/jgnkxVXluvhrz8M0SscUBsKwJnVwc/oOvfhiBnJXVzaz+hSJ4gjt5L NRZaSu6ll5VrjSo2mUmky7CfrS/hwEPxPfz4LnaXqReKE9dQqVVlJFZER4Co5oYG4hsKsRWHb 6chw7mabsJOmU6UYtT/7nJfybMADygwUaOA45EhVBex9Tffe1WNlI7bboKiQLruORZOfqBocc Xnqrg3hMxQZ0y5aqLVk0FLgN8mbZmK9GBkDsiDcZj7vm925RcMUElyz0+IfhmSwK5GXrPPAai +yRLugm2oY5cEDT7lpKTmSFoJQ5Xlphf+slcOw== Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When CONFIG_MTD_CFI is disabled, we get a warning for this spi driver: include/linux/mtd/cfi.h:76:2: #warning No CONFIG_MTD_CFI_Ix selected. No NOR chip support can work. [-Werror=cpp] The problem here is a layering violation that was fixed in mainline kernels with a larger rework in commit 054e532f8f90 ("spi: bcm-qspi: Remove hardcoded settings and spi-nor.h dependency"). We can't really backport that to stable kernels, so this just adds a Kconfig dependency to make it either build cleanly or force it to be disabled. Signed-off-by: Arnd Bergmann --- drivers/spi/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index b7995474148c..0e7415f6d093 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -156,6 +156,7 @@ config SPI_BCM63XX_HSSPI config SPI_BCM_QSPI tristate "Broadcom BSPI and MSPI controller support" depends on ARCH_BRCMSTB || ARCH_BCM || ARCH_BCM_IPROC || COMPILE_TEST + depends on MTD_NORFLASH default ARCH_BCM_IPROC help Enables support for the Broadcom SPI flash and MSPI controller.