m68knommu: include SDHC support only when hardware has it
Subsystems (2)
Greg Ungerer
maintainerPATCH 1/1 m68knommu: include SDHC support only when hardware has it
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.
--- arch/m68k/coldfire/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/m68k/coldfire/device.c +3 -3
@@ -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 };
Signature · 1 line
2.25.1
Quoted 20 lines · Greg Ungerer
The mere fact that the kernel has the MMC subsystem enabled (
CONFIG_MMCenabled) does not mean that the underlying hardware platform has the SDHC hardware present. Within the ColdFire hardware defines that is signified byMCFSDHC_BASEbeing defined with an address.The platform data for the ColdFire parts is including the SDHC hardware if
CONFIG_MMCis enabled, instead ofMCFSDHC_BASE. This means that if you are compiling for a ColdFire target that does not support SDHC but enableCONFIG_MMCyou 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,
^
Quoted 4 lines
Make the SDHC platform support depend on
MCFSDHC_BASE, that is only include it if the specific ColdFire SoC has that hardware module.Signed-off-by Greg Ungerer <[email protected]>
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Greg Ungerer
maintainerQuoted 21 lines · Geert Uytterhoeven
Quoted 20 lines · Greg Ungerer
The mere fact that the kernel has the MMC subsystem enabled (
CONFIG_MMCenabled) does not mean that the underlying hardware platform has the SDHC hardware present. Within the ColdFire hardware defines that is signified byMCFSDHC_BASEbeing defined with an address.The platform data for the ColdFire parts is including the SDHC hardware if
CONFIG_MMCis enabled, instead ofMCFSDHC_BASE. This means that if you are compiling for a ColdFire target that does not support SDHC but enableCONFIG_MMCyou 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,
^
Quoted 7 lines
Quoted 4 lines
Make the SDHC platform support depend on
MCFSDHC_BASE, that is only include it if the specific ColdFire SoC has that hardware module.Signed-off-by Greg Ungerer <[email protected]>Fixes 991f5c4dd2422881 ("m68k: mcf5441x: add support for esdhc mmc controller")Reviewed-by Geert Uytterhoeven <[email protected]>
Yep, will add, thanks Geert.
Regards
Greg
Quoted 4 lines
Gr{oetje,eeting}s,
Geert
Hi Greg,
thanks a lot for the fix.
Quoted 61 lines · Greg Ungerer
The mere fact that the kernel has the MMC subsystem enabled (
CONFIG_MMCenabled) does not mean that the underlying hardware platform has the SDHC hardware present. Within the ColdFire hardware defines that is signified byMCFSDHC_BASEbeing defined with an address.The platform data for the ColdFire parts is including the SDHC hardware if
CONFIG_MMCis enabled, instead ofMCFSDHC_BASE. This means that if you are compiling for a ColdFire target that does not support SDHC but enableCONFIG_MMCyou 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.Signed-off-by Greg Ungerer <[email protected]>--- arch/m68k/coldfire/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/m68k/coldfire/device.c +3
-4@@ -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 }; --
Quoted 2 lines
2.25.1
Tested on mcf54418 stmark2.
Regards,
angelo
Greg Ungerer
maintainerHi Angelo,
Quoted 71 lines · Angelo Dureghello
Hi Greg,
thanks a lot for the fix.
Quoted 61 lines · Greg Ungerer
The mere fact that the kernel has the MMC subsystem enabled (
CONFIG_MMCenabled) does not mean that the underlying hardware platform has the SDHC hardware present. Within the ColdFire hardware defines that is signified byMCFSDHC_BASEbeing defined with an address.The platform data for the ColdFire parts is including the SDHC hardware if
CONFIG_MMCis enabled, instead ofMCFSDHC_BASE. This means that if you are compiling for a ColdFire target that does not support SDHC but enableCONFIG_MMCyou 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.Signed-off-by Greg Ungerer <[email protected]>--- arch/m68k/coldfire/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)arch/m68k/coldfire/device.c +3
-4@@ -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 }; --Quoted 2 lines
2.25.1
Tested on mcf54418 stmark2.
Quoted 2 lines
Reviewed-by Angelo Dureghello <[email protected]>Tested-by Angelo Dureghello <[email protected]>
Thanks, will add those.
Regards
Greg