[PATCH 1/3] drivers: regulator: palmas: add an API to set/clear the switch bit on SMPS10

From: Kishon Vijay Abraham I
Date: Fri May 24 2013 - 10:32:31 EST


From: Graeme Gregory <gg@xxxxxxxxxxxxxxx>

Added an API to set/clear the switch bit on SMPS10 which can be used by
palmas usb. The switch bit should be set in order for palmas to
supply VBUS and is needed when OMAP is acting as USB HOST.

Signed-off-by: Graeme Gregory <gg@xxxxxxxxxxxxxxx>
Signed-off-by: Kishon Vijay Abraham I <kishon@xxxxxx>
---
drivers/regulator/palmas-regulator.c | 26 ++++++++++++++++++++++++++
include/linux/mfd/palmas.h | 2 ++
2 files changed, 28 insertions(+)

diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 92ceed0..d57ab55 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -465,6 +465,32 @@ static int palmas_smps_set_ramp_delay(struct regulator_dev *rdev,
return ret;
}

+/**
+ * palmas_set_switch_smps10() - set or clear the switch bit on SMPS10
+ * @param palmas pointer to the palmas mfd structure
+ * @param sw boolean to indicate switch status
+ *
+ * There is not a way to represent this function within the regulator
+ * framework. This sets/clears the switch of SMPS10 so SMPS10_OUT1 and
+ * SMPS10_OUT2 are shorted together.
+ */
+int palmas_set_switch_smps10(struct palmas *palmas, int sw)
+{
+ unsigned int reg;
+
+ palmas_smps_read(palmas, PALMAS_SMPS10_CTRL, &reg);
+
+ if (sw)
+ reg |= SMPS10_SWITCH_EN;
+ else
+ reg &= ~SMPS10_SWITCH_EN;
+
+ palmas_smps_write(palmas, PALMAS_SMPS10_CTRL, reg);
+
+ return 0;
+}
+EXPORT_SYMBOL(palmas_set_switch_smps10);
+
static struct regulator_ops palmas_ops_smps = {
.is_enabled = palmas_is_enabled_smps,
.enable = palmas_enable_smps,
diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 8f21daf..6df375d 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -404,6 +404,8 @@ enum usb_irq_events {
N_PALMAS_USB_VOTG_SESS_VLD,
};

+extern int palmas_set_switch_smps10(struct palmas *palmas, int sw);
+
/* defines so we can store the mux settings */
#define PALMAS_GPIO_0_MUXED (1 << 0)
#define PALMAS_GPIO_1_MUXED (1 << 1)
--
1.8.1.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/