History

Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next

Mark Brown committed 13 years ago

Commit 43bcb402 parents 7254a22 ed6a2772 files · +24 −15Browse files

Unified · Split

2 files
  1. Documentation/devicetree/bindings/sound/wm8994.txt +4 −0
  2. sound/soc/codecs/wm8994.c +20 −15
Documentation/devicetree/bindings/sound/wm8994.txt+4−0
@@ -32,6 +32,10 @@ Optional properties: · 31 unmodified lines
3232 The second cell is the flags, encoded as the trigger masks from
3333 Documentation/devicetree/bindings/interrupts.txt
3434
35+ - clocks : A list of up to two phandle and clock specifier pairs
36+ - clock-names : A list of clock names sorted in the same order as clocks.
37+ Valid clock names are "MCLK1" and "MCLK2".
38+
3539 - wlf,gpio-cfg : A list of GPIO configuration register values. If absent,
3640 no configuration of these registers is performed. If any value is
3741 over 0xffff then the register will be left as default. If present 11
sound/soc/codecs/wm8994.c+20−15
@@ -819,8 +819,9 @@ static int clk_sys_event(struct snd_soc_dapm_widget *w, · 818 unmodified lines
819819 * don't want false reports.
820820 */
821821 if (wm8994->jackdet && !wm8994->clk_has_run) {
822− schedule_delayed_work(&wm8994->jackdet_bootstrap,
823− msecs_to_jiffies(1000));
822+ queue_delayed_work(system_power_efficient_wq,
823+ &wm8994->jackdet_bootstrap,
824+ msecs_to_jiffies(1000));
824825 wm8994->clk_has_run = true;
825826 }
826827 break;
@@ -1432,7 +1433,7 @@ SOC_DAPM_SINGLE("AIF1.1 Switch", WM8994_DAC2_RIGHT_MIXER_ROUTING, · 605 unmodified lines
14321433
14331434 #define WM8994_CLASS_W_SWITCH(xname, reg, shift, max, invert) \
14341435 SOC_SINGLE_EXT(xname, reg, shift, max, invert, \
1435− snd_soc_get_volsw, wm8994_put_class_w)
1436+ snd_soc_dapm_get_volsw, wm8994_put_class_w)
14361437
14371438 static int wm8994_put_class_w(struct snd_kcontrol *kcontrol,
14381439 struct snd_ctl_elem_value *ucontrol)
@@ -3485,7 +3486,8 @@ static irqreturn_t wm8994_mic_irq(int irq, void *data) · 2046 unmodified lines
34853486
34863487 pm_wakeup_event(codec->dev, 300);
34873488
3488− schedule_delayed_work(&priv->mic_work, msecs_to_jiffies(250));
3489+ queue_delayed_work(system_power_efficient_wq,
3490+ &priv->mic_work, msecs_to_jiffies(250));
34893491
34903492 return IRQ_HANDLED;
34913493 }
@@ -3573,8 +3575,9 @@ static void wm8958_mic_id(void *data, u16 status) · 81 unmodified lines
35733575 /* If nothing present then clear our statuses */
35743576 dev_dbg(codec->dev, "Detected open circuit\n");
35753577
3576− schedule_delayed_work(&wm8994->open_circuit_work,
3577− msecs_to_jiffies(2500));
3578+ queue_delayed_work(system_power_efficient_wq,
3579+ &wm8994->open_circuit_work,
3580+ msecs_to_jiffies(2500));
35783581 return;
35793582 }
35803583
@@ -3688,8 +3691,9 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) · 107 unmodified lines
36883691 WM1811_JACKDET_DB, 0);
36893692
36903693 delay = control->pdata.micdet_delay;
3691− schedule_delayed_work(&wm8994->mic_work,
3692− msecs_to_jiffies(delay));
3694+ queue_delayed_work(system_power_efficient_wq,
3695+ &wm8994->mic_work,
3696+ msecs_to_jiffies(delay));
36933697 } else {
36943698 dev_dbg(codec->dev, "Jack not detected\n");
36953699
@@ -3934,8 +3938,9 @@ static irqreturn_t wm8958_mic_irq(int irq, void *data) · 238 unmodified lines
39343938 id_delay = wm8994->wm8994->pdata.mic_id_delay;
39353939
39363940 if (wm8994->mic_detecting)
3937− schedule_delayed_work(&wm8994->mic_complete_work,
3938− msecs_to_jiffies(id_delay));
3941+ queue_delayed_work(system_power_efficient_wq,
3942+ &wm8994->mic_complete_work,
3943+ msecs_to_jiffies(id_delay));
39393944 else
39403945 wm8958_button_det(codec, reg);
39413946
@@ -4008,9 +4013,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) · 66 unmodified lines
40084013
40094014 wm8994->micdet_irq = control->pdata.micdet_irq;
40104015
4011− pm_runtime_enable(codec->dev);
4012− pm_runtime_idle(codec->dev);
4013−
40144016 /* By default use idle_bias_off, will override for WM8994 */
40154017 codec->dapm.idle_bias_off = 1;
40164018
@@ -4383,8 +4385,6 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec) · 366 unmodified lines
43834385
43844386 wm8994_set_bias_level(codec, SND_SOC_BIAS_OFF);
43854387
4386− pm_runtime_disable(codec->dev);
4387−
43884388 for (i = 0; i < ARRAY_SIZE(wm8994->fll_locked); i++)
43894389 wm8994_free_irq(wm8994->wm8994, WM8994_IRQ_FLL1_LOCK + i,
43904390 &wm8994->fll_locked[i]);
@@ -4443,6 +4443,9 @@ static int wm8994_probe(struct platform_device *pdev) · 52 unmodified lines
44434443
44444444 wm8994->wm8994 = dev_get_drvdata(pdev->dev.parent);
44454445
4446+ pm_runtime_enable(&pdev->dev);
4447+ pm_runtime_idle(&pdev->dev);
4448+
44464449 return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_wm8994,
44474450 wm8994_dai, ARRAY_SIZE(wm8994_dai));
44484451 }
@@ -4450,6 +4453,8 @@ static int wm8994_probe(struct platform_device *pdev) · 1 unmodified line
44504453 static int wm8994_remove(struct platform_device *pdev)
44514454 {
44524455 snd_soc_unregister_codec(&pdev->dev);
4456+ pm_runtime_disable(&pdev->dev);
4457+
44534458 return 0;
44544459 }
44554460

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t