From: David Brownell Date: Tue, 30 Sep 2008 18:43:09 +0000 (+0300) Subject: twl4030-gpio: beagle pull up/down init X-Git-Tag: v2.6.27-omap1~101 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a6a0bd1b1a730422703a440e8fc6aa177ad67b81;p=linux-2.6-omap-h63xx.git twl4030-gpio: beagle pull up/down init Better TWL init on Beagle: use the setup() callback to learn IRQ assignments; and configure pullups/pulldowns. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index aa5e9a60bb6..98bdaf29f54 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -114,15 +114,31 @@ static struct twl4030_usb_data beagle_usb_data = { .usb_mode = T2_USB_MODE_ULPI, }; +static int beagle_twl_gpio_setup(struct device *dev, + unsigned gpio, unsigned ngpio) +{ + /* request_gpio(gpio + 0, "mmc0_cd"); + * gpio_direction_input(gpio + 0); + */ + + gpio_request(gpio + 1, "EHCI_nOC"); + gpio_direction_input(gpio + 1); + + /* gpio + 18 + 0 == ledA, nEN_USB_PWR (out) + * gpio + 18 + 1 == ledB, PMU_STAT (out, a LED) + */ + + return 0; +} + static struct twl4030_gpio_platform_data beagle_gpio_data = { .gpio_base = OMAP_MAX_GPIO_LINES, .irq_base = TWL4030_GPIO_IRQ_BASE, .irq_end = TWL4030_GPIO_IRQ_END, - - /* REVISIT: setup() should use twl gpio index - * - 0 as MMC card detect, - * - 1 as EHCI port overcurrent (active low) - */ + .pullups = BIT(1), + .pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13) + | BIT(15) | BIT(16) | BIT(17), + .setup = beagle_twl_gpio_setup, }; static struct twl4030_platform_data beagle_twldata = {