projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23' and ...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
regulator
/
palmas-regulator.c
diff --git
a/drivers/regulator/palmas-regulator.c
b/drivers/regulator/palmas-regulator.c
index 9205f433573cc124bd84701f6ee6324969b093e9..18198316b6cf15c406c6f9eb243bc39601b97979 100644
(file)
--- a/
drivers/regulator/palmas-regulator.c
+++ b/
drivers/regulator/palmas-regulator.c
@@
-1572,6
+1572,10
@@
static int palmas_regulators_probe(struct platform_device *pdev)
if (!pmic)
return -ENOMEM;
if (!pmic)
return -ENOMEM;
+ if (of_device_is_compatible(node, "ti,tps659038-pmic"))
+ palmas_generic_regs_info[PALMAS_REG_REGEN2].ctrl_addr =
+ TPS659038_REGEN2_CTRL;
+
pmic->dev = &pdev->dev;
pmic->palmas = palmas;
palmas->pmic = pmic;
pmic->dev = &pdev->dev;
pmic->palmas = palmas;
palmas->pmic = pmic;