ARM: OMAP: No need to include board-omap2430sdp.h from hardware.h

Move the defines to the associated board file and remove
the now unnecessary header file. Also rename
SDP2430_ETHR_GPIO_IRQ to SDP2430_ETHR_GPIO_IRQ.

Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index 83fa37211d77..c8abe6a8dfe9 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -38,9 +38,12 @@
 
 #include "mmc-twl4030.h"
 
+#define SDP2430_CS0_BASE        0x04000000
 #define SDP2430_FLASH_CS        0
 #define SDP2430_SMC91X_CS       5
 
+#define SDP2430_ETHR_GPIO_IRQ           149
+
 static struct mtd_partition sdp2430_partitions[] = {
         /* bootloader (U-Boot, etc) in first sector */
         {
@@ -102,8 +105,8 @@ static struct resource sdp2430_smc91x_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
-                .start  = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),
-                .end    = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ),
+                .start  = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ),
+                .end    = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ),
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
         },
 };
@@ -170,13 +173,13 @@ static inline void __init sdp2430_init_smc91x(void)
         sdp2430_smc91x_resources[0].end = cs_mem_base + 0x30f;
         udelay(100);
 
-        if (gpio_request(OMAP24XX_ETHR_GPIO_IRQ, "SMC91x irq") < 0) {
+        if (gpio_request(SDP2430_ETHR_GPIO_IRQ, "SMC91x irq") < 0) {
                 printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
-                        OMAP24XX_ETHR_GPIO_IRQ);
+                        SDP2430_ETHR_GPIO_IRQ);
                 gpmc_cs_free(eth_cs);
                 goto out;
         }
-        gpio_direction_input(OMAP24XX_ETHR_GPIO_IRQ);
+        gpio_direction_input(SDP2430_ETHR_GPIO_IRQ);
 
 out:
         clk_disable(gpmc_fck);