DigiGoon/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

m68k: coldfire/device.c: only build FEC when HW macros are defined

Browse source 
[ Upstream commit 63a24cf8cc330e5a68ebd2e20ae200096974c475 ]

When CONFIG_FEC is set (due to COMPILE_TEST) along with
CONFIG_M54xx, coldfire/device.c has compile errors due to
missing MCFEC_* and MCF_IRQ_FEC_* symbols.

Make the whole FEC blocks dependent on having the HW macros
defined, rather than on CONFIG_FEC itself.

This fix is very similar to commit e6e1e7b19fa1 ("m68k: coldfire/device.c: only build for MCF_EDMA when h/w macros are defined")

Fixes: b7ce7f0d0e ("m68knommu: merge common ColdFire FEC platform setup code")
To: Greg Ungerer <gerg@linux-m68k.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Antonio Quartulli <antonio@mandelbit.com>
Signed-off-by: Greg Ungerer <gerg@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Antonio Quartulli 2024-10-29 22:43:15 +01:00 • committed by Greg Kroah-Hartman
parent 32d587a538
commit 7a78e2865a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/m68k/coldfire/device.c
View file

@ -92,7 +92,7 @@ static struct platform_device mcf_uart = {
.dev.platform_data = mcf_uart_platform_data, .dev.platform_data = mcf_uart_platform_data,
}; };
#if IS_ENABLED(CONFIG_FEC) #ifdef MCFFEC_BASE0
#ifdef CONFIG_M5441x #ifdef CONFIG_M5441x
#define FEC_NAME "enet-fec" #define FEC_NAME "enet-fec"
@ -144,6 +144,7 @@ static struct platform_device mcf_fec0 = {
.platform_data = FEC_PDATA, .platform_data = FEC_PDATA,
} }
}; };
#endif /* MCFFEC_BASE0 */
#ifdef MCFFEC_BASE1 #ifdef MCFFEC_BASE1
static struct resource mcf_fec1_resources[] = { static struct resource mcf_fec1_resources[] = {
@ -181,7 +182,6 @@ static struct platform_device mcf_fec1 = {
} }
}; };
#endif /* MCFFEC_BASE1 */ #endif /* MCFFEC_BASE1 */
#endif /* CONFIG_FEC */
#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
/* /*
@ -556,12 +556,12 @@ static struct platform_device mcf_edma = {
static struct platform_device *mcf_devices[] __initdata = { static struct platform_device *mcf_devices[] __initdata = {
&mcf_uart, &mcf_uart,
#if IS_ENABLED(CONFIG_FEC) #ifdef MCFFEC_BASE0
&mcf_fec0, &mcf_fec0,
#endif
#ifdef MCFFEC_BASE1 #ifdef MCFFEC_BASE1
&mcf_fec1, &mcf_fec1,
#endif #endif
#endif
#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI) #if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)
&mcf_qspi, &mcf_qspi,
#endif #endif