From: grinberg@compulab•co.il (Igor Grinberg)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 3/3] ALSA: pxa27x: rename pxa27x_assert_ac97reset()
Date: Tue, 08 Jan 2013 10:36:52 +0200 [thread overview]
Message-ID: <50EBDAA4.3010105@compulab.co.il> (raw)
In-Reply-To: <1357595714-13698-4-git-send-email-mikedunn@newsguy.com>
On 01/07/13 23:55, Mike Dunn wrote:
> This patch does nothing functionally, it just gives the function a new name and
> modifies the prototype slightly in order to clarify what the function is doing
> (which is not necessarily asserting the reset).
> Some commentary also added.
>
> Tested on a palm treo 680 machine.
>
> Signed-off-by: Mike Dunn <mikedunn@newsguy•com>
Acked-by: Igor Grinberg <grinberg@compulab•co.il>
> ---
> arch/arm/mach-pxa/pxa27x.c | 20 ++++++++++++++------
> sound/arm/pxa2xx-ac97-lib.c | 8 ++++----
> 2 files changed, 18 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
> index 616cb87..69985b06 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
> diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
> index fff7753..e6f4633 100644
> --- a/sound/arm/pxa2xx-ac97-lib.c
> +++ b/sound/arm/pxa2xx-ac97-lib.c
> @@ -34,7 +34,7 @@ static struct clk *ac97_clk;
> static struct clk *ac97conf_clk;
> static int reset_gpio;
>
> -extern void pxa27x_assert_ac97reset(int reset_gpio, int on);
> +extern void pxa27x_configure_ac97reset(int reset_gpio, bool to_gpio);
>
> /*
> * Beware PXA27x bugs:
> @@ -140,10 +140,10 @@ static inline void pxa_ac97_warm_pxa27x(void)
> gsr_bits = 0;
>
> /* warm reset broken on Bulverde, so manually keep AC97 reset high */
> - pxa27x_assert_ac97reset(reset_gpio, 1);
> + pxa27x_configure_ac97reset(reset_gpio, true);
> udelay(10);
> GCR |= GCR_WARM_RST;
> - pxa27x_assert_ac97reset(reset_gpio, 0);
> + pxa27x_configure_ac97reset(reset_gpio, false);
> udelay(500);
> }
>
> @@ -358,7 +358,7 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev)
> __func__, ret);
> goto err_conf;
> }
> - pxa27x_assert_ac97reset(reset_gpio, 0);
> + pxa27x_configure_ac97reset(reset_gpio, false);
>
> ac97conf_clk = clk_get(&dev->dev, "AC97CONFCLK");
> if (IS_ERR(ac97conf_clk)) {
--
Regards,
Igor.
next prev parent reply other threads:[~2013-01-08 8:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-07 21:55 [PATCH 0/3] ALSA: pxa27x: ac97 reset fixes Mike Dunn
2013-01-07 21:55 ` [PATCH 1/3] ALSA: pxa27x: fix ac97 cold reset Mike Dunn
2013-01-08 8:17 ` Igor Grinberg
2013-01-07 21:55 ` [PATCH 2/3] ALSA: pxa27x: fix ac97 warm reset Mike Dunn
2013-01-08 8:36 ` Igor Grinberg
2013-01-07 21:55 ` [PATCH 3/3] ALSA: pxa27x: rename pxa27x_assert_ac97reset() Mike Dunn
2013-01-08 8:36 ` Igor Grinberg [this message]
2013-01-08 8:44 ` [PATCH 0/3] ALSA: pxa27x: ac97 reset fixes Igor Grinberg
2013-01-08 11:30 ` Mark Brown
2013-01-08 19:16 ` Robert Jarzmik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50EBDAA4.3010105@compulab.co.il \
--to=grinberg@compulab$(echo .)co.il \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox