summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMallikarjun Kasoju <mkasoju@nvidia.com>2014-04-09 15:43:31 +0530
committerLaxman Dewangan <ldewangan@nvidia.com>2014-04-09 21:42:41 -0700
commitdc2438866c8b961da5c93328a7b1966b80c4e42f (patch)
tree37713e1301cd6994564a1288e2e3be89530cae54 /drivers/mfd
parent95fe1e01264bc124b5a60ca6f26261f2660a686e (diff)
mfd: palmas: add LDOUSB input selection driver
Palmas ldousb rail has two input, ldousb-in1 and ldousb-in2. Add driver name in list of palmas subdriver to have the in1 or in2 to be selected dynamically. Bug 1451748 Change-Id: I4c45431d97cb8f7989f0a6a8fdf5058952de1d4f Signed-off-by: Mallikarjun Kasoju <mkasoju@nvidia.com> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/394187 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/palmas.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 480cefb149f1..66629ef2578c 100644
--- a/drivers/mfd/palmas.c
+++ b/drivers/mfd/palmas.c
@@ -70,6 +70,7 @@ enum palmas_ids {
PALMAS_SIM_ID,
PALMAS_PM_ID,
PALMAS_THERM_ID,
+ PALMAS_LDOUSB_IN_ID,
};
static struct resource palmas_rtc_resources[] = {
@@ -87,7 +88,8 @@ static struct resource palmas_rtc_resources[] = {
BIT(PALMAS_GPADC_ID) | BIT(PALMAS_RESOURCE_ID) | \
BIT(PALMAS_CLK_ID) | BIT(PALMAS_PWM_ID) | \
BIT(PALMAS_USB_ID) | BIT(PALMAS_EXTCON_ID) | \
- BIT(PALMAS_PM_ID) | BIT(PALMAS_THERM_ID))
+ BIT(PALMAS_PM_ID) | BIT(PALMAS_THERM_ID) | \
+ BIT(PALMAS_LDOUSB_IN_ID))
#define TPS80036_SUB_MODULE (TPS65913_SUB_MODULE | \
BIT(PALMAS_BATTERY_GAUGE_ID) | BIT(PALMAS_CHARGER_ID) | \
@@ -180,6 +182,10 @@ static const struct mfd_cell palmas_children[] = {
.resources = thermal_resource,
.id = PALMAS_THERM_ID,
},
+ {
+ .name = "palmas-ldousb-in",
+ .id = PALMAS_LDOUSB_IN_ID,
+ },
};
static bool is_volatile_palmas_func_reg(struct device *dev, unsigned int reg)