lkml.org 
[lkml]   [2013]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[v2 PATCH] regulator: palmas: Store pdata pointer in palmas struct
Date
Store a pointer to the pdata so that if it needs to be used after
probe it can be. In the case of booting from DeviceTree, the
dev.platform_data may be null, so we need to store this pointer
explicitly.

Based on work by Joseph Lo.

Cc: Joseph Lo <josephl@nvidia.com>
Signed-off-by: Rhyland Klein <rklein@nvidia.com>
---

v2:
- Renamed patch from "regulator: palmas: fix pdata ptr not be updated
after it has been allocated" to be appropriate to the current change.
- Instead of updating dev.platform_data, store the pdata pointer in the
pmic struct which we already have access to via drvdata.

drivers/regulator/palmas-regulator.c | 2 +-
include/linux/mfd/palmas.h | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index d0c8785..750ce55 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -761,7 +761,6 @@ static void palmas_dt_to_pdata(struct device *dev,
pdata->ldo6_vibrator = of_property_read_bool(node, "ti,ldo6-vibrator");
}

-
static int palmas_regulators_probe(struct platform_device *pdev)
{
struct palmas *palmas = dev_get_drvdata(pdev->dev.parent);
@@ -789,6 +788,7 @@ static int palmas_regulators_probe(struct platform_device *pdev)

pmic->dev = &pdev->dev;
pmic->palmas = palmas;
+ pmic->pdata = pdata;
palmas->pmic = pmic;
platform_set_drvdata(pdev, pmic);

diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 1a8dd7a..1703f18 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -352,6 +352,8 @@ struct palmas_pmic {
struct regulator_dev *rdev[PALMAS_NUM_REGS];
struct mutex mutex;

+ struct palmas_pmic_platform_data *pdata;
+
int smps123;
int smps457;

--
1.7.9.5


\
 
 \ /
  Last update: 2013-07-25 20:01    [W:0.034 / U:0.296 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site