diff options
| author | jacmet@sunsite.dk <jacmet@sunsite.dk> | 2007-09-28 16:21:14 +0200 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-09-28 10:26:35 -0500 |
| commit | 39db0fd9db6caea8887f61fee4a0e53c6f8fec5e (patch) | |
| tree | c5307378b10eee745d71601183d44b21428d5930 /arch | |
| parent | d214602804a85e5da68b745ae69d9beaa5bedc93 (diff) | |
| download | kernel_samsung_smdk4412-39db0fd9db6caea8887f61fee4a0e53c6f8fec5e.zip kernel_samsung_smdk4412-39db0fd9db6caea8887f61fee4a0e53c6f8fec5e.tar.gz kernel_samsung_smdk4412-39db0fd9db6caea8887f61fee4a0e53c6f8fec5e.tar.bz2 | |
[POWERPC] Fix mpc834x USB-MPH configuration.
mpc834x USB-MPH configuration got broken by commit
6f442560021aecf08658e26ed9a37e6928ef0fa1. The selection bits in SICRL
should be cleared rather than set to configure the USB MUXes for the MPH.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/83xx/usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c index e7fdf01..eafe760 100644 --- a/arch/powerpc/platforms/83xx/usb.c +++ b/arch/powerpc/platforms/83xx/usb.c @@ -76,14 +76,14 @@ int mpc834x_usb_cfg(void) if (port0_is_dr) printk(KERN_WARNING "834x USB port0 can't be used by both DR and MPH!\n"); - sicrl |= MPC834X_SICRL_USB0; + sicrl &= ~MPC834X_SICRL_USB0; } prop = of_get_property(np, "port1", NULL); if (prop) { if (port1_is_dr) printk(KERN_WARNING "834x USB port1 can't be used by both DR and MPH!\n"); - sicrl |= MPC834X_SICRL_USB1; + sicrl &= ~MPC834X_SICRL_USB1; } of_node_put(np); } |