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

Commit 0a381330 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

RealView: Refactor the Ethernet device registration 



This patch moves the Ethernet device registration from individual
realview_*.c files to core.c.

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 1bbdf637

arch/arm/mach-realview/core.c

+15 −0
Original line number Diff line number Diff line
@@ -125,6 +125,21 @@ int realview_flash_register(struct resource *res, u32 num) 
	return platform_device_register(&realview_flash_device);

}



static struct platform_device realview_eth_device = {

	.name		= "smc911x",

	.id		= 0,

	.num_resources	= 2,

};



int realview_eth_register(const char *name, struct resource *res)

{

	if (name)

		realview_eth_device.name = name;

	realview_eth_device.resource = res;



	return platform_device_register(&realview_eth_device);

}



static struct resource realview_i2c_resource = {

	.start		= REALVIEW_I2C_BASE,

	.end		= REALVIEW_I2C_BASE + SZ_4K - 1,

arch/arm/mach-realview/core.h

+1 −0
Original line number Diff line number Diff line
@@ -62,5 +62,6 @@ extern void __iomem *timer3_va_base; 
extern void realview_leds_event(led_event_t ledevt);

extern void realview_timer_init(unsigned int timer_irq);

extern int realview_flash_register(struct resource *res, u32 num);

extern int realview_eth_register(const char *name, struct resource *res);



#endif

arch/arm/mach-realview/realview_eb.c

+5 −13
Original line number Diff line number Diff line
@@ -242,12 +242,6 @@ static struct resource realview_eb_eth_resources[] = { 
	},

};



static struct platform_device realview_eb_eth_device = {

	.id		= 0,

	.num_resources	= ARRAY_SIZE(realview_eb_eth_resources),

	.resource	= realview_eb_eth_resources,

};



/*

 * Detect and register the correct Ethernet device. RealView/EB rev D

 * platforms use the newer SMSC LAN9118 Ethernet chip
@@ -255,21 +249,19 @@ static struct platform_device realview_eb_eth_device = { 
static int eth_device_register(void)

{

	void __iomem *eth_addr = ioremap(REALVIEW_EB_ETH_BASE, SZ_4K);

	const char *name = NULL;

	u32 idrev;



	if (!eth_addr)

		return -ENOMEM;



	idrev = readl(eth_addr + 0x50);

	if ((idrev & 0xFFFF0000) == 0x01180000)

		/* SMSC LAN9118 chip present */

		realview_eb_eth_device.name = "smc911x";

	else

		/* SMSC 91C111 chip present */

		realview_eb_eth_device.name = "smc91x";

	if ((idrev & 0xFFFF0000) != 0x01180000)

		/* SMSC LAN9118 not present, use LAN91C111 instead */

		name = "smc91x";



	iounmap(eth_addr);

	return platform_device_register(&realview_eb_eth_device);

	return realview_eth_register(name, realview_eb_eth_resources);

}



static void __init gic_init_irq(void)

arch/arm/mach-realview/realview_pb1176.c

+1 −8
Original line number Diff line number Diff line
@@ -222,13 +222,6 @@ static struct resource realview_pb1176_smsc911x_resources[] = { 
	},

};



static struct platform_device realview_pb1176_smsc911x_device = {

	.name		= "smc911x",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(realview_pb1176_smsc911x_resources),

	.resource	= realview_pb1176_smsc911x_resources,

};



static void __init gic_init_irq(void)

{

	/* ARM1176 DevChip GIC, primary */
@@ -268,7 +261,7 @@ static void __init realview_pb1176_init(void) 
	clk_register(&realview_clcd_clk);



	realview_flash_register(&realview_pb1176_flash_resource, 1);

	platform_device_register(&realview_pb1176_smsc911x_device);

	realview_eth_register(NULL, realview_pb1176_smsc911x_resources);



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {

		struct amba_device *d = amba_devs[i];

arch/arm/mach-realview/realview_pb11mp.c

+1 −8
Original line number Diff line number Diff line
@@ -230,13 +230,6 @@ static struct resource realview_pb11mp_smsc911x_resources[] = { 
	},

};



static struct platform_device realview_pb11mp_smsc911x_device = {

	.name		= "smc911x",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(realview_pb11mp_smsc911x_resources),

	.resource	= realview_pb11mp_smsc911x_resources,

};



struct resource realview_pb11mp_cf_resources[] = {

	[0] = {

		.start		= REALVIEW_PB11MP_CF_BASE,
@@ -315,7 +308,7 @@ static void __init realview_pb11mp_init(void) 


	realview_flash_register(realview_pb11mp_flash_resource,

				ARRAY_SIZE(realview_pb11mp_flash_resource));

	platform_device_register(&realview_pb11mp_smsc911x_device);

	realview_eth_register(NULL, realview_pb11mp_smsc911x_resources);

	platform_device_register(&realview_i2c_device);

	platform_device_register(&realview_pb11mp_cf_device);