diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 11:16:05 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 11:16:05 +0100 |
| commit | 355532bdda14a7162cee55fdd67600bf9bc9a152 (patch) | |
| tree | 96c6e79c22ba65a47685097460b8e0168a2ff431 /arch/arm/mach-pxa/spitz.c | |
| parent | 2528ed119b8f4fc553f9d1e65719ae183ffa97f4 (diff) | |
| parent | 6ec04f434d29aed33608e0ca4d8b100190e71e96 (diff) | |
| download | linux-stable-355532bdda14a7162cee55fdd67600bf9bc9a152.tar.gz linux-stable-355532bdda14a7162cee55fdd67600bf9bc9a152.tar.bz2 linux-stable-355532bdda14a7162cee55fdd67600bf9bc9a152.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/spitz.c')
| -rw-r--r-- | arch/arm/mach-pxa/spitz.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index c18e34acafcb..5a45fe340a10 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -531,9 +531,15 @@ static int spitz_ohci_init(struct device *dev) return gpio_direction_output(SPITZ_GPIO_USB_HOST, 1); } +static void spitz_ohci_exit(struct device *dev) +{ + gpio_free(SPITZ_GPIO_USB_HOST); +} + static struct pxaohci_platform_data spitz_ohci_platform_data = { .port_mode = PMM_NPS_MODE, .init = spitz_ohci_init, + .exit = spitz_ohci_exit, .flags = ENABLE_PORT_ALL | NO_OC_PROTECTION, .power_budget = 150, }; @@ -731,7 +737,7 @@ static void spitz_restart(char mode, const char *cmd) static void __init common_init(void) { - init_gpio_reset(SPITZ_GPIO_ON_RESET, 1); + init_gpio_reset(SPITZ_GPIO_ON_RESET, 1, 0); pm_power_off = spitz_poweroff; arm_pm_restart = spitz_restart; |