diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:39 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:39 +0000 |
| commit | f8843c91c60ed744cc7dd6326e44ddb91250ab35 (patch) | |
| tree | 80bd1bec879b8c3aa845e19873ae1cd98e15310b /arch/arm/mach-pxa | |
| parent | f0fab49461c819817d57c145832aa263226c36a8 (diff) | |
| parent | 053fe0f166e540a9766548572eccfc18c21ff353 (diff) | |
| download | linux-f8843c91c60ed744cc7dd6326e44ddb91250ab35.tar.gz linux-f8843c91c60ed744cc7dd6326e44ddb91250ab35.tar.bz2 linux-f8843c91c60ed744cc7dd6326e44ddb91250ab35.zip | |
Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 616cb87b6179..69985b06c0da 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c @@ -53,17 +53,25 @@ static unsigned long ac97_reset_config[] = { GPIO95_AC97_nRESET, }; -void pxa27x_assert_ac97reset(int reset_gpio, int on) +void pxa27x_configure_ac97reset(int reset_gpio, bool to_gpio) { + /* + * This helper function is used to work around a bug in the pxa27x's + * ac97 controller during a warm reset. The configuration of the + * reset_gpio is changed as follows: + * to_gpio == true: configured to generic output gpio and driven high + * to_gpio == false: configured to ac97 controller alt fn AC97_nRESET + */ + if (reset_gpio == 113) - pxa2xx_mfp_config(on ? &ac97_reset_config[0] : - &ac97_reset_config[1], 1); + pxa2xx_mfp_config(to_gpio ? &ac97_reset_config[0] : + &ac97_reset_config[1], 1); if (reset_gpio == 95) - pxa2xx_mfp_config(on ? &ac97_reset_config[2] : - &ac97_reset_config[3], 1); + pxa2xx_mfp_config(to_gpio ? &ac97_reset_config[2] : + &ac97_reset_config[3], 1); } -EXPORT_SYMBOL_GPL(pxa27x_assert_ac97reset); +EXPORT_SYMBOL_GPL(pxa27x_configure_ac97reset); /* Crystal clock: 13MHz */ #define BASE_CLK 13000000 |