git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
52xx
/
mpc52xx_common.c
diff --git
a/arch/powerpc/platforms/52xx/mpc52xx_common.c
b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index
6e90531
..
41f3a7e
100644
(file)
--- a/
arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/
arch/powerpc/platforms/52xx/mpc52xx_common.c
@@
-325,12
+325,16
@@
int mpc5200_psc_ac97_gpio_reset(int psc_number)
clrbits32(&simple_gpio->simple_dvo, sync | out);
clrbits8(&wkup_gpio->wkup_dvo, reset);
clrbits32(&simple_gpio->simple_dvo, sync | out);
clrbits8(&wkup_gpio->wkup_dvo, reset);
- /* wait
at lease
1 us */
- udelay(
2
);
+ /* wait
for
1 us */
+ udelay(
1
);
/* Deassert reset */
setbits8(&wkup_gpio->wkup_dvo, reset);
/* Deassert reset */
setbits8(&wkup_gpio->wkup_dvo, reset);
+ /* wait at least 200ns */
+ /* 7 ~= (200ns * timebase) / ns2sec */
+ __delay(7);
+
/* Restore pin-muxing */
out_be32(&simple_gpio->port_config, mux);
/* Restore pin-muxing */
out_be32(&simple_gpio->port_config, mux);