Patch "m68knommu: include SDHC support only when hardware has it" has been added to the 5.8-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    m68knommu: include SDHC support only when hardware has it

to the 5.8-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     m68knommu-include-sdhc-support-only-when-hardware-ha.patch
and it can be found in the queue-5.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 42a252861e95abc3cd4cc288f85a2b825862b722
Author: Greg Ungerer <gerg@xxxxxxxxxxxxxx>
Date:   Mon Sep 21 12:55:20 2020 +1000

    m68knommu: include SDHC support only when hardware has it
    
    [ Upstream commit 322c512f476f07e960cecd447ef22c15bed0e5f1 ]
    
    The mere fact that the kernel has the MMC subsystem enabled (CONFIG_MMC
    enabled) does not mean that the underlying hardware platform has the
    SDHC hardware present. Within the ColdFire hardware defines that is
    signified by MCFSDHC_BASE being defined with an address.
    
    The platform data for the ColdFire parts is including the SDHC hardware
    if CONFIG_MMC is enabled, instead of MCFSDHC_BASE. This means that if
    you are compiling for a ColdFire target that does not support SDHC but
    enable CONFIG_MMC you will fail to compile with errors like this:
    
        arch/m68k/coldfire/device.c:565:12: error: â??MCFSDHC_BASEâ?? undeclared here (not in a function)
           .start = MCFSDHC_BASE,
                ^
        arch/m68k/coldfire/device.c:566:25: error: â??MCFSDHC_SIZEâ?? undeclared here (not in a function)
           .end = MCFSDHC_BASE + MCFSDHC_SIZE - 1,
                             ^
        arch/m68k/coldfire/device.c:569:12: error: â??MCF_IRQ_SDHCâ?? undeclared here (not in a function)
           .start = MCF_IRQ_SDHC,
                ^
    
    Make the SDHC platform support depend on MCFSDHC_BASE, that is only
    include it if the specific ColdFire SoC has that hardware module.
    
    Fixes: 991f5c4dd2422881 ("m68k: mcf5441x: add support for esdhc mmc controller")
    Signed-off-by: Greg Ungerer <gerg@xxxxxxxxxxxxxx>
    Reviewed-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
    Reviewed-by: Angelo Dureghello <angelo.dureghello@xxxxxxxxxxx>
    Tested-by: Angelo Dureghello <angelo.dureghello@xxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/m68k/coldfire/device.c b/arch/m68k/coldfire/device.c
index 9ef4ec0aea008..59f7dfe50a4d0 100644
--- a/arch/m68k/coldfire/device.c
+++ b/arch/m68k/coldfire/device.c
@@ -554,7 +554,7 @@ static struct platform_device mcf_edma = {
 };
 #endif /* IS_ENABLED(CONFIG_MCF_EDMA) */
 
-#if IS_ENABLED(CONFIG_MMC)
+#ifdef MCFSDHC_BASE
 static struct mcf_esdhc_platform_data mcf_esdhc_data = {
 	.max_bus_width = 4,
 	.cd_type = ESDHC_CD_NONE,
@@ -579,7 +579,7 @@ static struct platform_device mcf_esdhc = {
 	.resource		= mcf_esdhc_resources,
 	.dev.platform_data	= &mcf_esdhc_data,
 };
-#endif /* IS_ENABLED(CONFIG_MMC) */
+#endif /* MCFSDHC_BASE */
 
 static struct platform_device *mcf_devices[] __initdata = {
 	&mcf_uart,
@@ -613,7 +613,7 @@ static struct platform_device *mcf_devices[] __initdata = {
 #if IS_ENABLED(CONFIG_MCF_EDMA)
 	&mcf_edma,
 #endif
-#if IS_ENABLED(CONFIG_MMC)
+#ifdef MCFSDHC_BASE
 	&mcf_esdhc,
 #endif
 };