diff options
author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-29 14:11:28 -0800 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:50:04 -0800 |
commit | 3e7081ba2b97e9cab4e446d5cf6e1676966021ed (patch) | |
tree | 1a57eb259b21b5a1ce5ac319858b13e91ff46985 | |
parent | eb3435a9e412f7bec4e4af39bb010d756df18691 (diff) |
3.0: mfd: mfd_data has been removed
Use platform_data instead
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Rebase-Id: R74c46fcb0c04961a8e91382da503679db2fede0b
-rw-r--r-- | arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c | 3 | ||||
-rw-r--r-- | drivers/regulator/max77663-regulator.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c b/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c index 789cb3d74012..b7679d4c8bcc 100644 --- a/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c +++ b/arch/arm/mach-tegra/board-cardhu-pm298-power-rails.c @@ -241,7 +241,8 @@ MAX77663_PDATA_INIT(ldo8, 800000, 3950000, NULL, 0, 0, 0, { \ .name = "max77663-regulator", \ .id = MAX77663_REGULATOR_ID_##_id, \ - .mfd_data = &max77663_regulator_pdata_##_data, \ + .platform_data = &max77663_regulator_pdata_##_data, \ + .pdata_size = sizeof(max77663_regulator_pdata_##_data), \ } #define MAX77663_RTC() \ diff --git a/drivers/regulator/max77663-regulator.c b/drivers/regulator/max77663-regulator.c index 56aba9071db5..bd64a405552d 100644 --- a/drivers/regulator/max77663-regulator.c +++ b/drivers/regulator/max77663-regulator.c @@ -833,7 +833,7 @@ static int max77663_regulator_probe(struct platform_device *pdev) rdesc = &max77663_rdesc[pdev->id]; reg = &max77663_regs[pdev->id]; reg->dev = &pdev->dev; - reg->pdata = mfd_get_data(pdev); + reg->pdata = dev_get_platdata(&pdev->dev); dev_dbg(&pdev->dev, "probe: name=%s\n", rdesc->name); |