← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/regulator/mc13892-regulator.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/mc13892-regulator.c
15
15
#include <linux/regulator/driver.h>
16
16
#include <linux/platform_device.h>
17
17
#include <linux/kernel.h>
 
18
#include <linux/mfd/core.h>
18
19
#include <linux/slab.h>
19
20
#include <linux/init.h>
20
21
#include <linux/err.h>
520
521
{
521
522
        struct mc13xxx_regulator_priv *priv;
522
523
        struct mc13xxx *mc13892 = dev_get_drvdata(pdev->dev.parent);
523
 
        struct mc13xxx_regulator_platform_data *pdata =
524
 
                dev_get_platdata(&pdev->dev);
 
524
        struct mc13xxx_regulator_platform_data *pdata = mfd_get_data(pdev);
525
525
        struct mc13xxx_regulator_init_data *init_data;
526
526
        int i, ret;
527
527
        u32 val;
595
595
static int __devexit mc13892_regulator_remove(struct platform_device *pdev)
596
596
{
597
597
        struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev);
598
 
        struct mc13xxx_regulator_platform_data *pdata =
599
 
                dev_get_platdata(&pdev->dev);
 
598
        struct mc13xxx_regulator_platform_data *pdata = mfd_get_data(pdev);
600
599
        int i;
601
600
 
602
601
        platform_set_drvdata(pdev, NULL);