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

Commit 6bd96f3c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

ARM: imx: dynamically register fec devices 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 8a8d2060

arch/arm/mach-imx/devices-imx27.h

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
#include <mach/mx27.h>

#include <mach/devices-common.h>



extern const struct imx_fec_data imx27_fec_data __initconst;

#define imx27_add_fec(pdata)	\

	imx_add_fec(&imx27_fec_data, pdata)



extern const struct imx_imx_i2c_data imx27_imx_i2c_data[] __initconst;

#define imx27_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx27_imx_i2c_data[id], pdata)

arch/arm/mach-imx/devices.c

+0 −21
Original line number Diff line number Diff line
@@ -314,27 +314,6 @@ struct platform_device mxc_fb_device = { 
	},

};



#ifdef CONFIG_MACH_MX27

static struct resource mxc_fec_resources[] = {

	{

		.start = MX27_FEC_BASE_ADDR,

		.end = MX27_FEC_BASE_ADDR + SZ_4K - 1,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MX27_INT_FEC,

		.end = MX27_INT_FEC,

		.flags = IORESOURCE_IRQ,

	},

};



struct platform_device mxc_fec_device = {

	.name = "fec",

	.id = 0,

	.num_resources = ARRAY_SIZE(mxc_fec_resources),

	.resource = mxc_fec_resources,

};

#endif



static struct resource mxc_pwm_resources[] = {

	{

		.start = MX2x_PWM_BASE_ADDR,

arch/arm/mach-imx/devices.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ extern struct platform_device mxc_gpt5; 
extern struct platform_device mxc_wdt;

extern struct platform_device mxc_w1_master_device;

extern struct platform_device mxc_fb_device;

extern struct platform_device mxc_fec_device;

extern struct platform_device mxc_pwm_device;

extern struct platform_device mxc_sdhc_device0;

extern struct platform_device mxc_sdhc_device1;

arch/arm/mach-imx/mach-cpuimx27.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ cpuimx27_nand_board_info __initconst = { 


static struct platform_device *platform_devices[] __initdata = {

	&eukrea_cpuimx27_nor_mtd_device,

	&mxc_fec_device,

	&mxc_wdt,

	&mxc_w1_master_device,

};
@@ -261,6 +260,7 @@ static void __init eukrea_cpuimx27_init(void) 


	imx27_add_imx_i2c(1, &cpuimx27_i2c1_data);



	imx27_add_fec(NULL);

	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));



#if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2)

arch/arm/mach-imx/mach-imx27_visstrim_m10.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ static struct platform_device visstrim_m10_nor_mtd_device = { 
static struct platform_device *platform_devices[] __initdata = {

	&visstrim_gpio_keys_device,

	&visstrim_m10_nor_mtd_device,

	&mxc_fec_device,

};



/* Visstrim_M10 uses UART0 as console */
@@ -240,6 +239,7 @@ static void __init visstrim_m10_board_init(void) 
	imx27_add_imx_i2c(1, &visstrim_m10_i2c_data);

	mxc_register_device(&mxc_sdhc_device0, &visstrim_m10_sdhc_pdata);

	mxc_register_device(&mxc_otg_host, &visstrim_m10_usbotg_pdata);

	imx27_add_fec(NULL);

	platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));

}