diff options
| author | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-06-17 11:34:19 +0200 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-06-23 11:26:38 +0200 |
| commit | ac1489228c1a6a795d07863d39d73e1640c0b7ba (patch) | |
| tree | ab4ccb01edc4928726c0f34fd940b752e4cf1d94 | |
| parent | 057b9b859cee72a4e70658ae6e28a1ad1f37bad5 (diff) | |
ccwmx51: Replace SMSC9118 driver for newest mainline version
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
| -rw-r--r-- | arch/arm/mach-mx5/devices_ccwmx51.c | 16 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/mx51_ccwmx51js.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/mx51_ccwmx51js_gpio.c | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-mx5/devices_ccwmx51.c b/arch/arm/mach-mx5/devices_ccwmx51.c index f8bc641320b4..074e4d369e89 100644 --- a/arch/arm/mach-mx5/devices_ccwmx51.c +++ b/arch/arm/mach-mx5/devices_ccwmx51.c @@ -33,6 +33,7 @@ #include <linux/ipu.h> #include <linux/mxcfb.h> #include <linux/pwm_backlight.h> +#include <linux/smsc911x.h> #include <mach/common.h> #include <mach/hardware.h> #include <asm/irq.h> @@ -89,12 +90,11 @@ struct flash_platform_data mxc_nand_data = { }; #endif -#if defined(CONFIG_SMSC9118) || defined(CONFIG_SMSC9118_MODULE) -struct smc911x_platdata ccwmx51_smsc9118 = { - .flags = 0, - .irq_flags = IRQF_DISABLED | IRQF_TRIGGER_FALLING, - .irq_polarity = 0, - .irq_type = 1, /* push-pull irq */ +#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) +struct smsc911x_platform_config ccwmx51_smsc9118 = { + .flags = SMSC911X_USE_32BIT, + .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW, + .irq_type = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH, /* push-pull irq */ }; #endif @@ -231,7 +231,7 @@ struct mxc_w1_config mxc_w1_data = { }; #endif -#if defined(CONFIG_SMSC9118) || defined(CONFIG_SMSC9118_MODULE) +#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) static struct resource smsc911x_device_resources[] = { { @@ -449,7 +449,7 @@ device_initcall(ccwmx51_init_fb); void __init ccwmx51_init_devices ( void ) { -#if defined(CONFIG_SMSC9118) || defined(CONFIG_SMSC9118_MODULE) +#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) ccwmx51_init_ext_eth_mac(); #endif } diff --git a/arch/arm/mach-mx5/mx51_ccwmx51js.c b/arch/arm/mach-mx5/mx51_ccwmx51js.c index d85c62272340..167ada25a4c4 100644 --- a/arch/arm/mach-mx5/mx51_ccwmx51js.c +++ b/arch/arm/mach-mx5/mx51_ccwmx51js.c @@ -268,7 +268,7 @@ static void __init mxc_board_init(void) || defined(CONFIG_MTD_NAND_MXC_V3_MODULE) mxc_register_device(&mxc_nandv2_mtd_device, &mxc_nand_data); #endif -#if defined(CONFIG_SMSC9118) || defined(CONFIG_SMSC9118_MODULE) +#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) mxc_register_device(&smsc911x_device, &ccwmx51_smsc9118); #endif #if defined(CONFIG_SND_SOC_IMX_CCWMX51_WM8753) || defined(CONFIG_SND_SOC_IMX_CCWMX51_WM8753_MODULE) diff --git a/arch/arm/mach-mx5/mx51_ccwmx51js_gpio.c b/arch/arm/mach-mx5/mx51_ccwmx51js_gpio.c index 7922347f4f3e..6e5d0d25e221 100644 --- a/arch/arm/mach-mx5/mx51_ccwmx51js_gpio.c +++ b/arch/arm/mach-mx5/mx51_ccwmx51js_gpio.c @@ -28,7 +28,7 @@ static void ccwmx51_mmc2_gpio_active(void); /** * iomux settings for the external ethernet mac */ -#if defined(CONFIG_SMSC9118) || defined(CONFIG_SMSC9118_MODULE) +#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) static struct mxc_iomux_pin_cfg __initdata ccwmx51_iomux_ext_eth_pins[] = { {MX51_PIN_EIM_CS5, IOMUX_CONFIG_ALT0, (PAD_CTL_HYS_ENABLE | PAD_CTL_PUE_KEEPER | PAD_CTL_DRV_MEDIUM), }, @@ -569,7 +569,7 @@ void __init ccwmx51_io_init(void) { int i; -#if defined(CONFIG_SMSC9118) || defined(CONFIG_SMSC9118_MODULE) +#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE) for (i = 0; i < ARRAY_SIZE(ccwmx51_iomux_ext_eth_pins); i++) { mxc_request_iomux(ccwmx51_iomux_ext_eth_pins[i].pin, ccwmx51_iomux_ext_eth_pins[i].mux_mode); |