Re: [4.9, 137/145] spi: bcm-qspi: shut up warning about cfi header inclusion
From: Florian Fainelli
Date: Tue Apr 03 2018 - 13:46:29 EST
On 02/23/2018 10:27 AM, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
> 4.9-stable review patch. If anyone has any objections, please let me know.
> From: Arnd Bergmann <arnd@xxxxxxxx>
> 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.
Sorry for noticing so late, but this appears to be bogus, there is no
MTD_NORFLASH symbol being defined in 4.9, in fact I can't find this
Kconfig symbol in any kernel version, so this effectively results in the
driver no longer being selectable, so this sure does silence the warning.
Arnd, should we just send reverts of this patch for the affected kernel
or should we be defining MTD_NORFLASH somehow? Am I missing something here?
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> drivers/spi/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
> --- 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
> Enables support for the Broadcom SPI flash and MSPI controller.