Commit 7ebe7afe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68knommu-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu updates from Greg Ungerer:

 - only include FEC platform entries when hardware supports it

 - fix typo in ifdef config name

* tag 'm68knommu-for-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: coldfire/device.c: only build FEC when HW macros are defined
  m68k: mcfgpio: Fix incorrect register offset for CONFIG_M5441x
parents 798bb342 63a24cf8

arch/m68k/coldfire/device.c

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static struct platform_device mcf_uart = { 
	.dev.platform_data	= mcf_uart_platform_data,

};



#if IS_ENABLED(CONFIG_FEC)

#ifdef MCFFEC_BASE0



#ifdef CONFIG_M5441x

#define FEC_NAME	"enet-fec"
@@ -145,6 +145,7 @@ static struct platform_device mcf_fec0 = { 
		.platform_data		= FEC_PDATA,

	}

};

#endif /* MCFFEC_BASE0 */



#ifdef MCFFEC_BASE1

static struct resource mcf_fec1_resources[] = {
@@ -182,7 +183,6 @@ static struct platform_device mcf_fec1 = { 
	}

};

#endif /* MCFFEC_BASE1 */

#endif /* CONFIG_FEC */



#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)

/*
@@ -624,12 +624,12 @@ static struct platform_device mcf_flexcan0 = { 


static struct platform_device *mcf_devices[] __initdata = {

	&mcf_uart,

#if IS_ENABLED(CONFIG_FEC)

#ifdef MCFFEC_BASE0

	&mcf_fec0,

#endif

#ifdef MCFFEC_BASE1

	&mcf_fec1,

#endif

#endif

#if IS_ENABLED(CONFIG_SPI_COLDFIRE_QSPI)

	&mcf_qspi,

#endif

arch/m68k/include/asm/mcfgpio.h

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static inline void gpio_free(unsigned gpio) 
 * read-modify-write as well as those controlled by the EPORT and GPIO modules.

 */

#define MCFGPIO_SCR_START		40

#elif defined(CONFIGM5441x)

#elif defined(CONFIG_M5441x)

/* The m5441x EPORT doesn't have its own GPIO port, uses PORT C */

#define MCFGPIO_SCR_START		0

#else