diff options
author | Robert Jarzmik <robert.jarzmik@free.fr> | 2009-01-30 14:48:24 -0500 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2009-03-13 05:10:44 -0400 |
commit | 689b4febeca7e98ad1986cf5b036539649cc1a0c (patch) | |
tree | 544788b86133ba03ab82ff0e46f93573d6e21d84 /arch/arm/mach-pxa | |
parent | 3b31fabfe258ecc1ffccd01dd186a534d5c804b3 (diff) |
[ARM] pxa/MioA701: add gpio_vbus driver
Add gpio vbus detection to udc driver, by taking advantage
of the new gpio_vbus driver.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/mioa701.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index e77c95ca67f0..735cb94c4a1e 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include <linux/power_supply.h> | 36 | #include <linux/power_supply.h> |
37 | #include <linux/wm97xx_batt.h> | 37 | #include <linux/wm97xx_batt.h> |
38 | #include <linux/mtd/physmap.h> | 38 | #include <linux/mtd/physmap.h> |
39 | #include <linux/usb/gpio_vbus.h> | ||
39 | 40 | ||
40 | #include <asm/mach-types.h> | 41 | #include <asm/mach-types.h> |
41 | #include <asm/mach/arch.h> | 42 | #include <asm/mach/arch.h> |
@@ -452,6 +453,12 @@ static void udc_exit(void) | |||
452 | mio_gpio_free(ARRAY_AND_SIZE(udc_gpios)); | 453 | mio_gpio_free(ARRAY_AND_SIZE(udc_gpios)); |
453 | } | 454 | } |
454 | 455 | ||
456 | struct gpio_vbus_mach_info gpio_vbus_data = { | ||
457 | .gpio_vbus = GPIO13_nUSB_DETECT, | ||
458 | .gpio_vbus_inverted = 1, | ||
459 | .gpio_pullup = -1, | ||
460 | }; | ||
461 | |||
455 | /* | 462 | /* |
456 | * SDIO/MMC Card controller | 463 | * SDIO/MMC Card controller |
457 | */ | 464 | */ |
@@ -790,6 +797,7 @@ MIO_SIMPLE_DEV(pxa2xx_ac97, "pxa2xx-ac97", NULL) | |||
790 | MIO_PARENT_DEV(mio_wm9713_codec, "wm9713-codec", &pxa2xx_ac97.dev, NULL) | 797 | MIO_PARENT_DEV(mio_wm9713_codec, "wm9713-codec", &pxa2xx_ac97.dev, NULL) |
791 | MIO_SIMPLE_DEV(mioa701_sound, "mioa701-wm9713", NULL) | 798 | MIO_SIMPLE_DEV(mioa701_sound, "mioa701-wm9713", NULL) |
792 | MIO_SIMPLE_DEV(mioa701_board, "mioa701-board", NULL) | 799 | MIO_SIMPLE_DEV(mioa701_board, "mioa701-board", NULL) |
800 | MIO_SIMPLE_DEV(gpio_vbus, "gpio-vbus", &gpio_vbus_data); | ||
793 | 801 | ||
794 | static struct platform_device *devices[] __initdata = { | 802 | static struct platform_device *devices[] __initdata = { |
795 | &mioa701_gpio_keys, | 803 | &mioa701_gpio_keys, |
@@ -801,7 +809,8 @@ static struct platform_device *devices[] __initdata = { | |||
801 | &mioa701_sound, | 809 | &mioa701_sound, |
802 | &power_dev, | 810 | &power_dev, |
803 | &strataflash, | 811 | &strataflash, |
804 | &mioa701_board | 812 | &gpio_vbus, |
813 | &mioa701_board, | ||
805 | }; | 814 | }; |
806 | 815 | ||
807 | static void mioa701_machine_exit(void); | 816 | static void mioa701_machine_exit(void); |