← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-linaro-u8500/precise

« back to all changes in this revision

Viewing changes to drivers/regulator/wm831x-ldo.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/regulator/wm831x-ldo.c
354
354
        }
355
355
 
356
356
        irq = platform_get_irq_byname(pdev, "UV");
357
 
        ret = wm831x_request_irq(wm831x, irq, wm831x_ldo_uv_irq,
358
 
                                 IRQF_TRIGGER_RISING, ldo->name,
359
 
                                 ldo);
 
357
        ret = request_threaded_irq(irq, NULL, wm831x_ldo_uv_irq,
 
358
                                   IRQF_TRIGGER_RISING, ldo->name,
 
359
                                   ldo);
360
360
        if (ret != 0) {
361
361
                dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
362
362
                        irq, ret);
377
377
static __devexit int wm831x_gp_ldo_remove(struct platform_device *pdev)
378
378
{
379
379
        struct wm831x_ldo *ldo = platform_get_drvdata(pdev);
380
 
        struct wm831x *wm831x = ldo->wm831x;
381
380
 
382
381
        platform_set_drvdata(pdev, NULL);
383
382
 
384
 
        wm831x_free_irq(wm831x, platform_get_irq_byname(pdev, "UV"), ldo);
 
383
        free_irq(platform_get_irq_byname(pdev, "UV"), ldo);
385
384
        regulator_unregister(ldo->regulator);
386
385
        kfree(ldo);
387
386
 
619
618
        }
620
619
 
621
620
        irq = platform_get_irq_byname(pdev, "UV");
622
 
        ret = wm831x_request_irq(wm831x, irq, wm831x_ldo_uv_irq,
623
 
                                 IRQF_TRIGGER_RISING, ldo->name,
624
 
                                 ldo);
 
621
        ret = request_threaded_irq(irq, NULL, wm831x_ldo_uv_irq,
 
622
                                   IRQF_TRIGGER_RISING, ldo->name, ldo);
625
623
        if (ret != 0) {
626
624
                dev_err(&pdev->dev, "Failed to request UV IRQ %d: %d\n",
627
625
                        irq, ret);
642
640
static __devexit int wm831x_aldo_remove(struct platform_device *pdev)
643
641
{
644
642
        struct wm831x_ldo *ldo = platform_get_drvdata(pdev);
645
 
        struct wm831x *wm831x = ldo->wm831x;
646
643
 
647
 
        wm831x_free_irq(wm831x, platform_get_irq_byname(pdev, "UV"), ldo);
 
644
        free_irq(platform_get_irq_byname(pdev, "UV"), ldo);
648
645
        regulator_unregister(ldo->regulator);
649
646
        kfree(ldo);
650
647