aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-03-23 21:07:35 -0400
committerTony Lindgren <tony@atomide.com>2009-03-23 21:07:35 -0400
commita362fdbddb713d27ec0931a8be64b767f85bae0d (patch)
tree223c2f293a5704805f2a0508b9c93f652753b196 /arch/arm/mach-omap2
parentb2830810fd8ca8cd8a929a6d6a6c886b1d689a51 (diff)
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>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/board-2430sdp.c13
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 @@
38 38
39#include "mmc-twl4030.h" 39#include "mmc-twl4030.h"
40 40
41#define SDP2430_CS0_BASE 0x04000000
41#define SDP2430_FLASH_CS 0 42#define SDP2430_FLASH_CS 0
42#define SDP2430_SMC91X_CS 5 43#define SDP2430_SMC91X_CS 5
43 44
45#define SDP2430_ETHR_GPIO_IRQ 149
46
44static struct mtd_partition sdp2430_partitions[] = { 47static struct mtd_partition sdp2430_partitions[] = {
45 /* bootloader (U-Boot, etc) in first sector */ 48 /* bootloader (U-Boot, etc) in first sector */
46 { 49 {
@@ -102,8 +105,8 @@ static struct resource sdp2430_smc91x_resources[] = {
102 .flags = IORESOURCE_MEM, 105 .flags = IORESOURCE_MEM,
103 }, 106 },
104 [1] = { 107 [1] = {
105 .start = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), 108 .start = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ),
106 .end = OMAP_GPIO_IRQ(OMAP24XX_ETHR_GPIO_IRQ), 109 .end = OMAP_GPIO_IRQ(SDP2430_ETHR_GPIO_IRQ),
107 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL, 110 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
108 }, 111 },
109}; 112};
@@ -170,13 +173,13 @@ static inline void __init sdp2430_init_smc91x(void)
170 sdp2430_smc91x_resources[0].end = cs_mem_base + 0x30f; 173 sdp2430_smc91x_resources[0].end = cs_mem_base + 0x30f;
171 udelay(100); 174 udelay(100);
172 175
173 if (gpio_request(OMAP24XX_ETHR_GPIO_IRQ, "SMC91x irq") < 0) { 176 if (gpio_request(SDP2430_ETHR_GPIO_IRQ, "SMC91x irq") < 0) {
174 printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n", 177 printk(KERN_ERR "Failed to request GPIO%d for smc91x IRQ\n",
175 OMAP24XX_ETHR_GPIO_IRQ); 178 SDP2430_ETHR_GPIO_IRQ);
176 gpmc_cs_free(eth_cs); 179 gpmc_cs_free(eth_cs);
177 goto out; 180 goto out;
178 } 181 }
179 gpio_direction_input(OMAP24XX_ETHR_GPIO_IRQ); 182 gpio_direction_input(SDP2430_ETHR_GPIO_IRQ);
180 183
181out: 184out:
182 clk_disable(gpmc_fck); 185 clk_disable(gpmc_fck);