aboutsummaryrefslogtreecommitdiffstats
path: root/sound/arm/pxa2xx-ac97-lib.c
diff options
context:
space:
mode:
authorMike Dunn <mikedunn@newsguy.com>2013-01-07 16:55:14 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-08 06:30:08 -0500
commit053fe0f166e540a9766548572eccfc18c21ff353 (patch)
treebed09d030aafa8913dbbb4b196b297dc51ff36b8 /sound/arm/pxa2xx-ac97-lib.c
parent07afa01813d547570a762034f0dce7fd8baa8b3d (diff)
ALSA: pxa27x: rename pxa27x_assert_ac97reset()
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> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/arm/pxa2xx-ac97-lib.c')
-rw-r--r--sound/arm/pxa2xx-ac97-lib.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index fff7753e35c1..e6f4633b8dd5 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -34,7 +34,7 @@ static struct clk *ac97_clk;
34static struct clk *ac97conf_clk; 34static struct clk *ac97conf_clk;
35static int reset_gpio; 35static int reset_gpio;
36 36
37extern void pxa27x_assert_ac97reset(int reset_gpio, int on); 37extern void pxa27x_configure_ac97reset(int reset_gpio, bool to_gpio);
38 38
39/* 39/*
40 * Beware PXA27x bugs: 40 * Beware PXA27x bugs:
@@ -140,10 +140,10 @@ static inline void pxa_ac97_warm_pxa27x(void)
140 gsr_bits = 0; 140 gsr_bits = 0;
141 141
142 /* warm reset broken on Bulverde, so manually keep AC97 reset high */ 142 /* warm reset broken on Bulverde, so manually keep AC97 reset high */
143 pxa27x_assert_ac97reset(reset_gpio, 1); 143 pxa27x_configure_ac97reset(reset_gpio, true);
144 udelay(10); 144 udelay(10);
145 GCR |= GCR_WARM_RST; 145 GCR |= GCR_WARM_RST;
146 pxa27x_assert_ac97reset(reset_gpio, 0); 146 pxa27x_configure_ac97reset(reset_gpio, false);
147 udelay(500); 147 udelay(500);
148} 148}
149 149
@@ -358,7 +358,7 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev)
358 __func__, ret); 358 __func__, ret);
359 goto err_conf; 359 goto err_conf;
360 } 360 }
361 pxa27x_assert_ac97reset(reset_gpio, 0); 361 pxa27x_configure_ac97reset(reset_gpio, false);
362 362
363 ac97conf_clk = clk_get(&dev->dev, "AC97CONFCLK"); 363 ac97conf_clk = clk_get(&dev->dev, "AC97CONFCLK");
364 if (IS_ERR(ac97conf_clk)) { 364 if (IS_ERR(ac97conf_clk)) {