Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6

2 files changed, 94 insertions, 18 deletions

diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index e096f776f996..da57b0fcda14 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -23,6 +23,7 @@
 #include <linux/spi/ads7846.h>
 #include <linux/i2c/twl4030.h>
 #include <linux/io.h>
+#include <linux/smsc911x.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -41,12 +42,12 @@
 
 #include "mmc-twl4030.h"
 
-#define LDP_SMC911X_CS          1
-#define LDP_SMC911X_GPIO        152
+#define LDP_SMSC911X_CS         1
+#define LDP_SMSC911X_GPIO       152
 #define DEBUG_BASE              0x08000000
 #define LDP_ETHR_START          DEBUG_BASE
 
-static struct resource ldp_smc911x_resources[] = {
+static struct resource ldp_smsc911x_resources[] = {
         [0] = {
                 .start  = LDP_ETHR_START,
                 .end    = LDP_ETHR_START + SZ_4K,
@@ -59,40 +60,50 @@ static struct resource ldp_smc911x_resources[] = {
         },
 };
 
-static struct platform_device ldp_smc911x_device = {
-        .name           = "smc911x",
+static struct smsc911x_platform_config ldp_smsc911x_config = {
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+        .flags          = SMSC911X_USE_32BIT,
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
+};
+
+static struct platform_device ldp_smsc911x_device = {
+        .name           = "smsc911x",
         .id             = -1,
-        .num_resources  = ARRAY_SIZE(ldp_smc911x_resources),
-        .resource       = ldp_smc911x_resources,
+        .num_resources  = ARRAY_SIZE(ldp_smsc911x_resources),
+        .resource       = ldp_smsc911x_resources,
+        .dev            = {
+                .platform_data = &ldp_smsc911x_config,
+        },
 };
 
 static struct platform_device *ldp_devices[] __initdata = {
-        &ldp_smc911x_device,
+        &ldp_smsc911x_device,
 };
 
-static inline void __init ldp_init_smc911x(void)
+static inline void __init ldp_init_smsc911x(void)
 {
         int eth_cs;
         unsigned long cs_mem_base;
         int eth_gpio = 0;
 
-        eth_cs = LDP_SMC911X_CS;
+        eth_cs = LDP_SMSC911X_CS;
 
         if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
-                printk(KERN_ERR "Failed to request GPMC mem for smc911x\n");
+                printk(KERN_ERR "Failed to request GPMC mem for smsc911x\n");
                 return;
         }
 
-        ldp_smc911x_resources[0].start = cs_mem_base + 0x0;
-        ldp_smc911x_resources[0].end   = cs_mem_base + 0xff;
+        ldp_smsc911x_resources[0].start = cs_mem_base + 0x0;
+        ldp_smsc911x_resources[0].end   = cs_mem_base + 0xff;
         udelay(100);
 
-        eth_gpio = LDP_SMC911X_GPIO;
+        eth_gpio = LDP_SMSC911X_GPIO;
 
-        ldp_smc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
+        ldp_smsc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
 
-        if (gpio_request(eth_gpio, "smc911x irq") < 0) {
-                printk(KERN_ERR "Failed to request GPIO%d for smc911x IRQ\n",
+        if (gpio_request(eth_gpio, "smsc911x irq") < 0) {
+                printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n",
                                 eth_gpio);
                 return;
         }
@@ -104,7 +115,7 @@ static void __init omap_ldp_init_irq(void)
         omap2_init_common_hw(NULL);
         omap_init_irq();
         omap_gpio_init();
-        ldp_init_smc911x();
+        ldp_init_smsc911x();
 }
 
 static struct omap_uart_config ldp_uart_config __initdata = {
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index b3f6e9d81807..b1f23bea863f 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -57,6 +57,9 @@
 #define GPMC_CS0_BASE  0x60
 #define GPMC_CS_SIZE   0x30
 
+#define OVERO_SMSC911X_CS      5
+#define OVERO_SMSC911X_GPIO    176
+
 #if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
         defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
 
@@ -116,6 +119,67 @@ static void __init overo_ads7846_init(void)
 static inline void __init overo_ads7846_init(void) { return; }
 #endif
 
+#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+
+#include <linux/smsc911x.h>
+
+static struct resource overo_smsc911x_resources[] = {
+        {
+                .name   = "smsc911x-memory",
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
+        },
+};
+
+static struct smsc911x_platform_config overo_smsc911x_config = {
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+        .flags          = SMSC911X_USE_32BIT ,
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
+};
+
+static struct platform_device overo_smsc911x_device = {
+        .name           = "smsc911x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(overo_smsc911x_resources),
+        .resource       = &overo_smsc911x_resources,
+        .dev            = {
+                .platform_data = &overo_smsc911x_config,
+        },
+};
+
+static inline void __init overo_init_smsc911x(void)
+{
+        unsigned long cs_mem_base;
+
+        if (gpmc_cs_request(OVERO_SMSC911X_CS, SZ_16M, &cs_mem_base) < 0) {
+                printk(KERN_ERR "Failed request for GPMC mem for smsc911x\n");
+                return;
+        }
+
+        overo_smsc911x_resources[0].start = cs_mem_base + 0x0;
+        overo_smsc911x_resources[0].end   = cs_mem_base + 0xff;
+
+        if ((gpio_request(OVERO_SMSC911X_GPIO, "SMSC911X IRQ") == 0) &&
+            (gpio_direction_input(OVERO_SMSC911X_GPIO) == 0)) {
+                gpio_export(OVERO_SMSC911X_GPIO, 0);
+        } else {
+                printk(KERN_ERR "could not obtain gpio for SMSC911X IRQ\n");
+                return;
+        }
+
+        overo_smsc911x_resources[1].start = OMAP_GPIO_IRQ(OVERO_SMSC911X_GPIO);
+        overo_smsc911x_resources[1].end   = 0;
+
+        platform_device_register(&overo_smsc911x_device);
+}
+
+#else
+static inline void __init overo_init_smsc911x(void) { return; }
+#endif
+
 static struct mtd_partition overo_nand_partitions[] = {
         {
                 .name           = "xloader",
@@ -290,6 +354,7 @@ static void __init overo_init(void)
         overo_flash_init();
         usb_musb_init();
         overo_ads7846_init();
+        overo_init_smsc911x();
 
         if ((gpio_request(OVERO_GPIO_W2W_NRESET,
                           "OVERO_GPIO_W2W_NRESET") == 0) &&