Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7ce7f0d authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68knommu: merge common ColdFire FEC platform setup code 



The ColdFire FEC is common to quite a few ColdFire CPUs. No need to duplicate
its platform setup code for every CPU family member that has it. Merge all the
setup code into a single shared file.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent 50469547

arch/m68k/platform/520x/config.c

+0 −31
Original line number Original line Diff line number Diff line
@@ -25,36 +25,6 @@ 




/***************************************************************************/

/***************************************************************************/





static struct resource m520x_fec_resources[] = {

	{

		.start		= MCFFEC_BASE0,

		.end		= MCFFEC_BASE0 + MCFFEC_SIZE0 - 1,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= MCF_IRQ_FEXRX0,

		.end		= MCF_IRQ_FECRX0,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECTX0,

		.end		= MCF_IRQ_FECTX0,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECENTC0,

		.end		= MCF_IRQ_FECENTC0,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct platform_device m520x_fec = {

	.name			= "fec",

	.id			= 0,

	.num_resources		= ARRAY_SIZE(m520x_fec_resources),

	.resource		= m520x_fec_resources,

};



#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

static struct resource m520x_qspi_resources[] = {

static struct resource m520x_qspi_resources[] = {

	{

	{
@@ -196,7 +166,6 @@ static void __init m520x_qspi_init(void) 








static struct platform_device *m520x_devices[] __initdata = {

static struct platform_device *m520x_devices[] __initdata = {

	&m520x_fec,

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

	&m520x_qspi,

	&m520x_qspi,

#endif

#endif

arch/m68k/platform/523x/config.c

+0 −31
Original line number Original line Diff line number Diff line
@@ -26,36 +26,6 @@ 




/***************************************************************************/

/***************************************************************************/





static struct resource m523x_fec_resources[] = {

	{

		.start		= MCFFEC_BASE0,

		.end		= MCFFEC_BASE0 + MCFFEC_SIZE0 - 1,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= MCF_IRQ_FECRX0,

		.end		= MCF_IRQ_FECRX0,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECTX0,

		.end		= MCF_IRQ_FECTX0,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECENTC0,

		.end		= MCF_IRQ_FECENTC0,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct platform_device m523x_fec = {

	.name			= "fec",

	.id			= 0,

	.num_resources		= ARRAY_SIZE(m523x_fec_resources),

	.resource		= m523x_fec_resources,

};



#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

static struct resource m523x_qspi_resources[] = {

static struct resource m523x_qspi_resources[] = {

	{

	{
@@ -258,7 +228,6 @@ void __init config_BSP(char *commandp, int size) 




static int __init init_BSP(void)

static int __init init_BSP(void)

{

{

	m523x_fec_init();

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

	m523x_qspi_init();

	m523x_qspi_init();

#endif

#endif

arch/m68k/platform/5272/config.c

+0 −37
Original line number Original line Diff line number Diff line
@@ -30,42 +30,6 @@ unsigned char ledbank = 0xff; 




/***************************************************************************/

/***************************************************************************/





static struct resource m5272_fec_resources[] = {

	{

		.start		= MCFFEC_BASE0,

		.end		= MCFFEC_BASE0 + MCFFEC_SIZE0 - 1,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= MCF_IRQ_FECRX0,

		.end		= MCF_IRQ_FECRX0,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECTX0,

		.end		= MCF_IRQ_FECTX0,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECENTC0,

		.end		= MCF_IRQ_FECENTC0,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct platform_device m5272_fec = {

	.name			= "fec",

	.id			= 0,

	.num_resources		= ARRAY_SIZE(m5272_fec_resources),

	.resource		= m5272_fec_resources,

};



static struct platform_device *m5272_devices[] __initdata = {

	&m5272_fec,

};



/***************************************************************************/



static void __init m5272_uarts_init(void)

static void __init m5272_uarts_init(void)

{

{

	u32 v;

	u32 v;
@@ -138,7 +102,6 @@ static int __init init_BSP(void) 
{

{

	m5272_uarts_init();

	m5272_uarts_init();

	fixed_phy_add(PHY_POLL, 0, &nettel_fixed_phy_status);

	fixed_phy_add(PHY_POLL, 0, &nettel_fixed_phy_status);

	platform_add_devices(m5272_devices, ARRAY_SIZE(m5272_devices));

	return 0;

	return 0;

}

}

arch/m68k/platform/527x/config.c

+0 −65
Original line number Original line Diff line number Diff line
@@ -26,67 +26,6 @@ 




/***************************************************************************/

/***************************************************************************/





static struct resource m527x_fec0_resources[] = {

	{

		.start		= MCFFEC_BASE0,

		.end		= MCFFEC_BASE0 + MCFFEC_SIZE0 - 1,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= MCF_IRQ_FECRX0,

		.end		= MCF_IRQ_FECRX0,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECTX0,

		.end		= MCF_IRQ_FECTX0,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECENTC0,

		.end		= MCF_IRQ_FECENTC0,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct resource m527x_fec1_resources[] = {

	{

		.start		= MCFFEC_BASE1,

		.end		= MCFFEC_BASE1 + MCFFEC_SIZE1 - 1,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= MCF_IRQ_FECRX1,

		.end		= MCF_IRQ_FECRX1,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECTX1,

		.end		= MCF_IRQ_FECTX1,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECENTC1,

		.end		= MCF_IRQ_FECENTC1,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct platform_device m527x_fec[] = {

	{

		.name		= "fec",

		.id		= 0,

		.num_resources	= ARRAY_SIZE(m527x_fec0_resources),

		.resource	= m527x_fec0_resources,

	},

	{

		.name		= "fec",

		.id		= 1,

		.num_resources	= ARRAY_SIZE(m527x_fec1_resources),

		.resource	= m527x_fec1_resources,

	},

};



#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

static struct resource m527x_qspi_resources[] = {

static struct resource m527x_qspi_resources[] = {

	{

	{
@@ -261,10 +200,6 @@ static void __init m527x_qspi_init(void) 
#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */

#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */





static struct platform_device *m527x_devices[] __initdata = {

static struct platform_device *m527x_devices[] __initdata = {

	&m527x_fec[0],

#ifdef CONFIG_FEC2

	&m527x_fec[1],

#endif

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

	&m527x_qspi,

	&m527x_qspi,

#endif

#endif

arch/m68k/platform/528x/config.c

+0 −31
Original line number Original line Diff line number Diff line
@@ -27,36 +27,6 @@ 




/***************************************************************************/

/***************************************************************************/





static struct resource m528x_fec_resources[] = {

	{

		.start		= MCFFEC_BASE0,

		.end		= MCFFEC_BASE0 + MCFFEC_SIZE0 - 1,

		.flags		= IORESOURCE_MEM,

	},

	{

		.start		= MCF_IRQ_FECRX0,

		.end		= MCF_IRQ_FECRX0,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECTX0,

		.end		= MCF_IRQ_FECTX0,

		.flags		= IORESOURCE_IRQ,

	},

	{

		.start		= MCF_IRQ_FECENTC0,

		.end		= MCF_IRQ_FECENTC0,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct platform_device m528x_fec = {

	.name			= "fec",

	.id			= 0,

	.num_resources		= ARRAY_SIZE(m528x_fec_resources),

	.resource		= m528x_fec_resources,

};



#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

static struct resource m528x_qspi_resources[] = {

static struct resource m528x_qspi_resources[] = {

	{

	{
@@ -187,7 +157,6 @@ static void __init m528x_qspi_init(void) 
#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */

#endif /* defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE) */





static struct platform_device *m528x_devices[] __initdata = {

static struct platform_device *m528x_devices[] __initdata = {

	&m528x_fec,

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

#if defined(CONFIG_SPI_COLDFIRE_QSPI) || defined(CONFIG_SPI_COLDFIRE_QSPI_MODULE)

	&m528x_qspi,

	&m528x_qspi,

#endif

#endif