From: Rajendra Nayak <rnayak@xxxxxx>
This version of patch series enables RUN TIME selection of TWL4030 or TWL6030.
This patch updates the regulator driver to add support
for TWL6030 PMIC specific LDO regulators.
SMPS resources are not yet supported for TWL6030 and
also .set_mode and .get_status for LDO's are yet to
be implemented for TWL6030.
Signed-off-by: Rajendra Nayak <rnayak@xxxxxx>
---
drivers/mfd/twl-core.c | 3 +-
drivers/regulator/Kconfig | 6 +-
drivers/regulator/Makefile | 2 +-
drivers/regulator/twl-regulator.c | 134 +++++++++++++++++++++++++++++++------
include/linux/i2c/twl.h | 37 ++++++++++
5 files changed, 155 insertions(+), 27 deletions(-)
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 78109ca..f505537 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -126,7 +126,7 @@
#define REG_SUB_CHIP_ID SUB_CHIP_ID3
/* Last - for index max*/
-#define TWL4030_MODULE_LAST TWL4030_MODULE_SECURED_REG
+#define TWL4030_MODULE_LAST TWL_MODULE_PM_SLAVE_LDO
#define TWL_MODULE_LAST TWL4030_MODULE_LAST
/* Base Address defns for twl4030_map[] */
@@ -277,6 +277,7 @@ static struct twl_mapping twl4030_map[TWL4030_MODULE_LAST + 1] = {
{ 3, TWL4030_BASEADD_PM_RECEIVER },
{ 3, TWL4030_BASEADD_RTC },
{ 3, TWL4030_BASEADD_SECURED_REG },
+ { 3, TWL4030_BASEADD_PM_RECEIVER },
};
static struct twl_mapping twl6030_map[] = {
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index f431779..7f5987e 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -75,9 +75,9 @@ config REGULATOR_MAX1586
regulator via I2C bus. The provided regulator is suitable
for PXA27x chips to control VCC_CORE and VCC_USIM voltages.
-config REGULATOR_TWL4030
- bool "TI TWL4030/TWL5030/TPS695x0 PMIC"
- depends on TWL4030_CORE
+config REGULATOR_TWL
+ bool "TI TWL4030/TWL5030/TWL6030/TPS695x0 PMIC"
+ depends on TWL_CORE
help
This driver supports the voltage regulators provided by
this family of companion chips.
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 0653ce8..712f733 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUMER) += userspace-consumer.o
obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o
obj-$(CONFIG_REGULATOR_MAX1586) += max1586.o
-obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
+obj-$(CONFIG_REGULATOR_TWL) += twl-regulator.o
obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
obj-$(CONFIG_REGULATOR_DA903X) += da903x.o
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index d01aa4e..8182290 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -52,27 +52,38 @@ struct twlreg_info {
* The first three registers of all power resource banks help hardware to
* manage the various resource groups.
*/
+/* Common offset in TWL4030/6030 */
#define VREG_GRP 0
+/* TWL4030 register offsets */
#define VREG_TYPE 1
#define VREG_REMAP 2
-#define VREG_DEDICATED 3 /* LDO control */
-
+#define VREG_DEDICATED 3
+/* TWL6030 register offsets */
+#define VREG_TRANS 1
+#define VREG_STATE 2
+#define VREG_VOLTAGE 3
+/* TWL6030 Misc register offsets */
+#define VREG_BC_ALL 1
+#define VREG_BC_REF 2
+#define VREG_BC_PROC 3
+#define VREG_BC_CLK_RST 4
static inline int
-twlreg_read(struct twlreg_info *info, unsigned offset)
+twlreg_read(struct twlreg_info *info, unsigned slave_subgp, unsigned offset)
{
u8 value;
int status;
- status = twl_i2c_read_u8(TWL_MODULE_PM_RECEIVER,
+ status = twl_i2c_read_u8(slave_subgp,
&value, info->base + offset);
return (status < 0) ? status : value;
}
static inline int
-twlreg_write(struct twlreg_info *info, unsigned offset, u8 value)
+twlreg_write(struct twlreg_info *info, unsigned slave_subgp, unsigned offset,
+ u8 value)
{
- return twl_i2c_write_u8(TWL_MODULE_PM_RECEIVER,
+ return twl_i2c_write_u8(slave_subgp,
value, info->base + offset);
}
@@ -82,17 +93,22 @@ twlreg_write(struct twlreg_info *info, unsigned offset, u8 value)
static int twlreg_grp(struct regulator_dev *rdev)
{
- return twlreg_read(rdev_get_drvdata(rdev), VREG_GRP);
+ return twlreg_read(rdev_get_drvdata(rdev), TWL_MODULE_PM_SLAVE_LDO,
+ VREG_GRP);
}
/*
* Enable/disable regulators by joining/leaving the P1 (processor) group.
* We assume nobody else is updating the DEV_GRP registers.
*/
-
-#define P3_GRP BIT(7) /* "peripherals" */
-#define P2_GRP BIT(6) /* secondary processor, modem, etc */
-#define P1_GRP BIT(5) /* CPU/Linux */
+/* definition for 4030 family */
+#define P3_GRP_4030 BIT(7) /* "peripherals" */
+#define P2_GRP_4030 BIT(6) /* secondary processor, modem, etc */
+#define P1_GRP_4030 BIT(5) /* CPU/Linux */
+/* definition for 6030 family */
+#define P3_GRP_6030 BIT(2) /* secondary processor, modem, etc */
+#define P2_GRP_6030 BIT(1) /* "peripherals" */
+#define P1_GRP_6030 BIT(0) /* CPU/Linux */
static int twlreg_is_enabled(struct regulator_dev *rdev)
{
@@ -101,7 +117,11 @@ static int twlreg_is_enabled(struct regulator_dev *rdev)
if (state < 0)
return state;
- return (state & P1_GRP) != 0;
+ if (is_class_twl4030())
+ state &= P1_GRP_4030;
+ else
+ state &= P1_GRP_6030;
+ return state;
}
static int twlreg_enable(struct regulator_dev *rdev)
@@ -109,12 +129,16 @@ static int twlreg_enable(struct regulator_dev *rdev)
struct twlreg_info *info = rdev_get_drvdata(rdev);
int grp;
- grp = twlreg_read(info, VREG_GRP);
+ grp = twlreg_read(info, TWL_MODULE_PM_SLAVE_LDO, VREG_GRP);
if (grp < 0)
return grp;
- grp |= P1_GRP;
- return twlreg_write(info, VREG_GRP, grp);
+ if (is_class_twl4030())
+ grp |= P1_GRP_4030;
+ else
+ grp |= P1_GRP_6030;
+
+ return twlreg_write(info, TWL_MODULE_PM_SLAVE_LDO, VREG_GRP, grp);
}
static int twlreg_disable(struct regulator_dev *rdev)
@@ -122,18 +146,25 @@ static int twlreg_disable(struct regulator_dev *rdev)
struct twlreg_info *info = rdev_get_drvdata(rdev);
int grp;
- grp = twlreg_read(info, VREG_GRP);
+ grp = twlreg_read(info, TWL_MODULE_PM_SLAVE_LDO, VREG_GRP);
if (grp < 0)
return grp;
- grp &= ~P1_GRP;
- return twlreg_write(info, VREG_GRP, grp);
+ if (is_class_twl4030())
+ grp &= ~P1_GRP_4030;
+ else
+ grp &= ~P1_GRP_6030;
+
+ return twlreg_write(info, TWL_MODULE_PM_SLAVE_LDO, VREG_GRP, grp);
}
static int twlreg_get_status(struct regulator_dev *rdev)
{
int state = twlreg_grp(rdev);
+ if (is_class_twl6030())
+ return 0; /* FIXME return for 6030 regulator */
+
if (state < 0)
return state;
state &= 0x0f;
@@ -152,6 +183,9 @@ static int twlreg_set_mode(struct regulator_dev *rdev, unsigned mode)
unsigned message;
int status;
+ if (is_class_twl6030())
+ return 0; /* FIXME return for 6030 regulator */
+
/* We can only set the mode through state machine commands... */
switch (mode) {
case REGULATOR_MODE_NORMAL:
@@ -168,7 +202,13 @@ static int twlreg_set_mode(struct regulator_dev *rdev, unsigned mode)
status = twlreg_grp(rdev);
if (status < 0)
return status;
- if (!(status & (P3_GRP | P2_GRP | P1_GRP)))
+
+ if (is_class_twl4030())
+ status = !(status & (P3_GRP_4030 | P2_GRP_4030 | P1_GRP_4030));
+ else
+ status = !(status & (P3_GRP_6030 | P2_GRP_6030 | P1_GRP_6030));
+
+ if (status)
return -EACCES;
status = twl_i2c_write_u8(TWL_MODULE_PM_MASTER,
@@ -260,7 +300,29 @@ static const u16 VSIM_VSEL_table[] = {
static const u16 VDAC_VSEL_table[] = {
1200, 1300, 1800, 1800,
};
-
+static const u16 VAUX1_6030_VSEL_table[] = {
+ 1000, 1300, 1800, 2500,
+ 2800, 2900, 3000, 3000,
+};
+static const u16 VAUX2_6030_VSEL_table[] = {
+ 1200, 1800, 2500, 2750,
+ 2800, 2800, 2800, 2800,
+};
+static const u16 VAUX3_6030_VSEL_table[] = {
+ 1000, 1200, 1300, 1800,
+ 2500, 2800, 3000, 3000,
+};
+static const u16 VMMC_VSEL_table[] = {
+ 1200, 1800, 2800, 2900,
+ 3000, 3000, 3000, 3000,
+};
+static const u16 VPP_VSEL_table[] = {
+ 1800, 1900, 2000, 2100,
+ 2200, 2300, 2400, 2500,
+};
+static const u16 VUSIM_VSEL_table[] = {
+ 1200, 1800, 2500, 2900,
+};
static int twlldo_list_voltage(struct regulator_dev *rdev, unsigned index)
{
@@ -288,7 +350,8 @@ twlldo_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV)
/* use the first in-range value */
if (min_uV <= uV && uV <= max_uV)
- return twlreg_write(info, VREG_DEDICATED, vsel);
+ return twlreg_write(info, TWL_MODULE_PM_SLAVE_LDO,
+ VREG_VOLTAGE, vsel);
}
return -EDOM;
@@ -297,7 +360,8 @@ twlldo_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV)
static int twlldo_get_voltage(struct regulator_dev *rdev)
{
struct twlreg_info *info = rdev_get_drvdata(rdev);
- int vsel = twlreg_read(info, VREG_DEDICATED);
+ int vsel = twlreg_read(info, TWL_MODULE_PM_SLAVE_LDO,
+ VREG_VOLTAGE);
if (vsel < 0)
return vsel;
@@ -360,6 +424,10 @@ static struct regulator_ops twlfixed_ops = {
TWL_ADJUSTABLE_LDO(label, offset, num, TWL4030)
#define TWL4030_FIXED_LDO(label, offset, mVolts, num) \
TWL_FIXED_LDO(label, offset, mVolts, num, TWL4030)
+#define TWL6030_ADJUSTABLE_LDO(label, offset, num) \
+ TWL_ADJUSTABLE_LDO(label, offset, num, TWL6030)
+#define TWL6030_FIXED_LDO(label, offset, mVolts, num) \
+ TWL_FIXED_LDO(label, offset, mVolts, num, TWL6030)
#define TWL_ADJUSTABLE_LDO(label, offset, num, family) { \
.base = offset, \
@@ -420,6 +488,28 @@ static struct twlreg_info twl_regs[] = {
TWL4030_FIXED_LDO(VUSB1V8, 0x74, 1800, 18),
TWL4030_FIXED_LDO(VUSB3V1, 0x77, 3100, 19),
/* VUSBCP is managed *only* by the USB subchip */
+ TWL6030_ADJUSTABLE_LDO(VAUX1_6030, 0x84, 1),
+ TWL6030_ADJUSTABLE_LDO(VAUX2_6030, 0x88, 2),
+ TWL6030_ADJUSTABLE_LDO(VAUX3_6030, 0x8c, 3),
+ TWL6030_ADJUSTABLE_LDO(VMMC, 0x98, 4),
+ TWL6030_ADJUSTABLE_LDO(VPP, 0x9c, 5),
+ /*
+ TWL6030_ADJUSTABLE_LDO(VRTC, 0x00, 6),
+ */
+ TWL6030_ADJUSTABLE_LDO(VUSIM, 0xa4, 7),
+ /* SMPS
+ TWL6030_SMPS(VDD1, 0x4b, 8),
+ TWL6030_SMPS(VDD2, 0x55, 9),
+ TWL6030_SMPS(VDD3, 0x63, 10),
+ TWL6030_SMPS(VMEM, 0x00, 11),
+ TWL6030_SMPS(V1V29, 0x00, 12),
+ TWL6030_SMPS(V1V8, 0x00, 13),
+ TWL6030_SMPS(V2V1, 0x00, 14),
+ */
+ TWL6030_FIXED_LDO(VANA, 0x80, 2100, 15),
+ TWL6030_FIXED_LDO(VCXIO, 0x90, 1800, 16),
+ TWL6030_FIXED_LDO(VDAC, 0x94, 1800, 17),
+ TWL6030_FIXED_LDO(VUSB, 0xa0, 3300, 18)
};
static int twlreg_probe(struct platform_device *pdev)
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index 987472f..53d9360 100644
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -65,6 +65,8 @@
#define TWL4030_MODULE_PM_RECEIVER 0x13
#define TWL4030_MODULE_RTC 0x14
#define TWL4030_MODULE_SECURED_REG 0x15
+#define TWL4030_MODULE_PM_SLAVE_LDO 0x16
+
/* FIXME define TWL4030_MODULE_* until all drivers are modified*/
#define TWL_MODULE_USB TWL4030_MODULE_USB
@@ -89,6 +91,7 @@
#define TWL_MODULE_PM_RECEIVER TWL4030_MODULE_PM_RECEIVER
#define TWL_MODULE_RTC TWL4030_MODULE_RTC
#define TWL_MODULE_SECURED_REG TWL4030_MODULE_SECURED_REG
+#define TWL_MODULE_PM_SLAVE_LDO TWL4030_MODULE_PM_SLAVE_LDO
#define GPIO_INTR_OFFSET 0
#define KEYPAD_INTR_OFFSET 1
@@ -350,6 +353,12 @@ int twl_i2c_read(u8 mod_no, u8 *value, u8 reg, unsigned num_bytes);
#define MSG_SINGULAR(devgrp, id, state) \
((devgrp) << 13 | 0 << 12 | (id) << 4 | (state))
+#define MSG_BROADCAST_ALL(devgrp, state) \
+ ((devgrp) << 5 | (state))
+
+#define MSG_BROADCAST_REF MSG_BROADCAST_ALL
+#define MSG_BROADCAST_PROV MSG_BROADCAST_ALL
+#define MSG_BROADCAST__CLK_RST MSG_BROADCAST_ALL
/*----------------------------------------------------------------------*/
struct twl_bci_platform_data {
@@ -460,6 +469,7 @@ int twl4030_sih_setup(int module);
* VIO is generally fixed.
*/
+/* TWL4030 SMPS/LDO's */
/* EXTERNAL dc-to-dc buck converters */
#define TWL4030_REG_VDD1 0
#define TWL4030_REG_VDD2 1
@@ -486,6 +496,33 @@ int twl4030_sih_setup(int module);
#define TWL4030_REG_VUSB1V8 18
#define TWL4030_REG_VUSB3V1 19
+/* TWL6030 SMPS/LDO's */
+/* EXTERNAL dc-to-dc buck convertor contollable via SR */
+#define TWL6030_REG_VDD1 0
+#define TWL6030_REG_VDD2 1
+#define TWL6030_REG_VDD3 2
+
+/* Non SR compliant dc-to-dc buck convertors */
+#define TWL6030_REG_VMEM 3
+#define TWL6030_REG_V2V1 4
+#define TWL6030_REG_V1V29 5
+#define TWL6030_REG_V1V8 6
+
+/* EXTERNAL LDOs */
+#define TWL6030_REG_VAUX1_6030 7
+#define TWL6030_REG_VAUX2_6030 8
+#define TWL6030_REG_VAUX3_6030 9
+#define TWL6030_REG_VMMC 10
+#define TWL6030_REG_VPP 11
+#define TWL6030_REG_VUSIM 12
+#define TWL6030_REG_VANA 13
+#define TWL6030_REG_VCXIO 14
+#define TWL6030_REG_VDAC 15
+#define TWL6030_REG_VUSB 16
+
+/* INTERNAL LDOs */
+#define TWL6030_REG_VRTC 17
+
int twl_int_mask_reset(u8 bit_mask, u8 offset);
int twl_int_mask_set(u8 bit_mask, u8 offset);
int twl4030_init_irq(int irq_num, unsigned irq_base, unsigned irq_end);
--
1.5.4.7
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
