diff options
| author | Tony Lindgren | 2009-01-15 12:09:53 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2009-01-15 12:09:53 +0100 |
| commit | 145d9c94b9039efdab6853255f6b916adc793bfd (patch) | |
| tree | ca6238b321120fd4fd524a1d3986699c2a2e6874 /arch/arm | |
| parent | ARM: OMAP: Fix gpio by switching to generic gpio calls, v2 (diff) | |
| download | kernel-qcow2-linux-145d9c94b9039efdab6853255f6b916adc793bfd.tar.gz kernel-qcow2-linux-145d9c94b9039efdab6853255f6b916adc793bfd.tar.xz kernel-qcow2-linux-145d9c94b9039efdab6853255f6b916adc793bfd.zip | |
ARM: OMAP: Fix compile for beagle
Move twl4030 gpio init code to where it should be.
Also include twl4030.h.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 9e5ada01b5fa..38c88fbe658d 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -28,6 +28,8 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/nand.h> +#include <linux/i2c/twl4030.h> + #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> @@ -120,6 +122,9 @@ static int beagle_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio) { /* gpio + 0 is "mmc0_cd" (input/IRQ) */ + omap_cfg_reg(AH8_34XX_GPIO29); + mmc[0].gpio_cd = gpio + 0; + twl4030_mmc_init(mmc); /* REVISIT: need ehci-omap hooks for external VBUS * power switch and overcurrent detect @@ -304,10 +309,6 @@ static void __init omap3_beagle_init(void) omap_board_config_size = ARRAY_SIZE(omap3_beagle_config); omap_serial_init(); - omap_cfg_reg(AH8_34XX_GPIO29); - mmc[0].gpio_cd = gpio + 0; - twl4030_mmc_init(mmc); - omap_cfg_reg(J25_34XX_GPIO170); gpio_request(170, "DVI_nPD"); /* REVISIT leave DVI powered down until it's needed ... */ |