diff options
author | Tony Lindgren <tony@atomide.com> | 2009-03-23 21:07:35 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-03-23 21:07:35 -0400 |
commit | a362fdbddb713d27ec0931a8be64b767f85bae0d (patch) | |
tree | 223c2f293a5704805f2a0508b9c93f652753b196 | |
parent | b2830810fd8ca8cd8a929a6d6a6c886b1d689a51 (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>
-rw-r--r-- | arch/arm/mach-omap2/board-2430sdp.c | 13 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/board-2430sdp.h | 41 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/mach/hardware.h | 4 |
3 files changed, 8 insertions, 50 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 | |||
44 | static struct mtd_partition sdp2430_partitions[] = { | 47 | static 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 | ||
181 | out: | 184 | out: |
182 | clk_disable(gpmc_fck); | 185 | clk_disable(gpmc_fck); |
diff --git a/arch/arm/plat-omap/include/mach/board-2430sdp.h b/arch/arm/plat-omap/include/mach/board-2430sdp.h deleted file mode 100644 index 10d449ea7ed0..000000000000 --- a/arch/arm/plat-omap/include/mach/board-2430sdp.h +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/plat-omap/include/mach/board-2430sdp.h | ||
3 | * | ||
4 | * Hardware definitions for TI OMAP2430 SDP board. | ||
5 | * | ||
6 | * Based on board-h4.h by Dirk Behme <dirk.behme@de.bosch.com> | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify it | ||
9 | * under the terms of the GNU General Public License as published by the | ||
10 | * Free Software Foundation; either version 2 of the License, or (at your | ||
11 | * option) any later version. | ||
12 | * | ||
13 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
14 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
15 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
16 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
17 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
18 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
19 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
20 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
21 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
23 | * | ||
24 | * You should have received a copy of the GNU General Public License along | ||
25 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
26 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
27 | */ | ||
28 | |||
29 | #ifndef __ASM_ARCH_OMAP_2430SDP_H | ||
30 | #define __ASM_ARCH_OMAP_2430SDP_H | ||
31 | |||
32 | /* Placeholder for 2430SDP specific defines */ | ||
33 | #define OMAP24XX_ETHR_START 0x08000300 | ||
34 | #define OMAP24XX_ETHR_GPIO_IRQ 149 | ||
35 | #define SDP2430_CS0_BASE 0x04000000 | ||
36 | |||
37 | /* Function prototypes */ | ||
38 | extern void sdp2430_flash_init(void); | ||
39 | extern void sdp2430_usb_init(void); | ||
40 | |||
41 | #endif /* __ASM_ARCH_OMAP_2430SDP_H */ | ||
diff --git a/arch/arm/plat-omap/include/mach/hardware.h b/arch/arm/plat-omap/include/mach/hardware.h index 194ed49e4d70..346a5c73197d 100644 --- a/arch/arm/plat-omap/include/mach/hardware.h +++ b/arch/arm/plat-omap/include/mach/hardware.h | |||
@@ -298,10 +298,6 @@ | |||
298 | #include "board-h4.h" | 298 | #include "board-h4.h" |
299 | #endif | 299 | #endif |
300 | 300 | ||
301 | #ifdef CONFIG_MACH_OMAP_2430SDP | ||
302 | #include "board-2430sdp.h" | ||
303 | #endif | ||
304 | |||
305 | #ifdef CONFIG_MACH_OMAP3_BEAGLE | 301 | #ifdef CONFIG_MACH_OMAP3_BEAGLE |
306 | #include "board-omap3beagle.h" | 302 | #include "board-omap3beagle.h" |
307 | #endif | 303 | #endif |