diff options
author | Tony Lindgren <tony@atomide.com> | 2009-03-23 21:07:34 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-03-23 21:07:34 -0400 |
commit | 3a0110cdae41fb91d005c335db9e5e697dddc5cd (patch) | |
tree | e41a3824d2c8fdb54cf89f6c84df78058a660e1f /arch/arm/mach-omap1 | |
parent | 278267be38949b051f49e0bc3da76bfb2af49abf (diff) |
ARM: OMAP: No need to include board-osk.h from hardware.h
Move the defines to the board file and remove the now unnecessary
header file.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/board-osk.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 1a16ecb2ccc8..9c4cac274cc0 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c | |||
@@ -52,6 +52,20 @@ | |||
52 | #include <mach/tc.h> | 52 | #include <mach/tc.h> |
53 | #include <mach/common.h> | 53 | #include <mach/common.h> |
54 | 54 | ||
55 | /* At OMAP5912 OSK the Ethernet is directly connected to CS1 */ | ||
56 | #define OMAP_OSK_ETHR_START 0x04800300 | ||
57 | |||
58 | /* TPS65010 has four GPIOs. nPG and LED2 can be treated like GPIOs with | ||
59 | * alternate pin configurations for hardware-controlled blinking. | ||
60 | */ | ||
61 | #define OSK_TPS_GPIO_BASE (OMAP_MAX_GPIO_LINES + 16 /* MPUIO */) | ||
62 | # define OSK_TPS_GPIO_USB_PWR_EN (OSK_TPS_GPIO_BASE + 0) | ||
63 | # define OSK_TPS_GPIO_LED_D3 (OSK_TPS_GPIO_BASE + 1) | ||
64 | # define OSK_TPS_GPIO_LAN_RESET (OSK_TPS_GPIO_BASE + 2) | ||
65 | # define OSK_TPS_GPIO_DSP_PWR_EN (OSK_TPS_GPIO_BASE + 3) | ||
66 | # define OSK_TPS_GPIO_LED_D9 (OSK_TPS_GPIO_BASE + 4) | ||
67 | # define OSK_TPS_GPIO_LED_D2 (OSK_TPS_GPIO_BASE + 5) | ||
68 | |||
55 | static struct mtd_partition osk_partitions[] = { | 69 | static struct mtd_partition osk_partitions[] = { |
56 | /* bootloader (U-Boot, etc) in first sector */ | 70 | /* bootloader (U-Boot, etc) in first sector */ |
57 | { | 71 | { |