Skip to content

Commit

Permalink
ARM: OMAP: No need to include board-omap2430sdp.h from hardware.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tony Lindgren committed Mar 24, 2009
1 parent b283081 commit a362fdb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 50 deletions.
13 changes: 8 additions & 5 deletions arch/arm/mach-omap2/board-2430sdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
{
Expand Down Expand Up @@ -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,
},
};
Expand Down Expand Up @@ -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);
Expand Down
41 changes: 0 additions & 41 deletions arch/arm/plat-omap/include/mach/board-2430sdp.h

This file was deleted.

4 changes: 0 additions & 4 deletions arch/arm/plat-omap/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,6 @@
#include "board-h4.h"
#endif

#ifdef CONFIG_MACH_OMAP_2430SDP
#include "board-2430sdp.h"
#endif

#ifdef CONFIG_MACH_OMAP3_BEAGLE
#include "board-omap3beagle.h"
#endif
Expand Down

0 comments on commit a362fdb

Please sign in to comment.