diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-27 22:16:05 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-27 22:16:05 +0000 |
| commit | 00e4acb1e2352477e4d0a19dcbff2af870e8b401 (patch) | |
| tree | d6481ecd452d1a491f996cd897251f2b3a92c2d9 /arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | |
| parent | b04da8bfdfbbd79544cab2fadfdc12e87eb01600 (diff) | |
| parent | cf11052a95275c942c1f45ea5fde43ce45bbba6d (diff) | |
| download | op-kernel-dev-00e4acb1e2352477e4d0a19dcbff2af870e8b401.zip op-kernel-dev-00e4acb1e2352477e4d0a19dcbff2af870e8b401.tar.gz | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch/arm/mach-kirkwood/rd88f6192-nas-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c index 8bf4153..3bf6304 100644 --- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c @@ -13,6 +13,7 @@ #include <linux/platform_device.h> #include <linux/ata_platform.h> #include <linux/mv643xx_eth.h> +#include <linux/gpio.h> #include <linux/spi/flash.h> #include <linux/spi/spi.h> #include <linux/spi/orion_spi.h> @@ -53,6 +54,11 @@ static void __init rd88f6192_init(void) */ kirkwood_init(); + orion_gpio_set_valid(RD88F6192_GPIO_USB_VBUS, 1); + if (gpio_request(RD88F6192_GPIO_USB_VBUS, "USB VBUS") != 0 || + gpio_direction_output(RD88F6192_GPIO_USB_VBUS, 1) != 0) + pr_err("RD-88F6192-NAS: failed to setup USB VBUS GPIO\n"); + kirkwood_ehci_init(); kirkwood_ge00_init(&rd88f6192_ge00_data); kirkwood_sata_init(&rd88f6192_sata_data); |
