projects/linux·commit d00b7461

Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topic/twl' into regulator-next

d00b7461 · Mark Brown <[email protected]> · 2016-12-12 12:17:31 +00:00

Commit
d00b74613fb18dfd0a5aa99270ee2e72d5c808d7
Parents
56e3d92d · f8192880 · 3498c5e1

Merge commit. Changes below are compared with the first parent: 56e3d92d.

Changes

5 files changed · +815 −657

FileStatusAddDelContent
MAINTAINERSmodified+1−0View file
drivers/regulator/Makefilemodified+1−1View file
drivers/regulator/tps65086-regulator.cmodified+2−1View file
drivers/regulator/twl-regulator.cmodified+18−655View file
drivers/regulator/twl6030-regulator.cadded+793−0View file

Only the first 600 diff lines are shown. Download the complete patch.

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index 63cefa6..9bf5aa6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8748,6 +8748,7 @@ F: drivers/regulator/tps65217-regulator.c
F: drivers/regulator/tps65218-regulator.c
F: drivers/regulator/tps65910-regulator.c
F: drivers/regulator/twl-regulator.c
+F: drivers/regulator/twl6030-regulator.c
F: include/linux/i2c-omap.h
OMAP DEVICE TREE SUPPORT

drivers/regulator/Makefile

View file
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 2142a5d..1429469 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -104,7 +104,7 @@ obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o
obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
-obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
+obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o twl6030-regulator.o
obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress-regulator.o
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o

drivers/regulator/tps65086-regulator.c

View file
diff --git a/drivers/regulator/tps65086-regulator.c b/drivers/regulator/tps65086-regulator.c
index caf174f..ecb0371 100644
--- a/drivers/regulator/tps65086-regulator.c
+++ b/drivers/regulator/tps65086-regulator.c
@@ -77,7 +77,8 @@ static const struct regulator_linear_range tps65086_10mv_ranges[] = {
};
static const struct regulator_linear_range tps65086_buck126_25mv_ranges[] = {
- REGULATOR_LINEAR_RANGE(1000000, 0x0, 0x18, 0),
+ REGULATOR_LINEAR_RANGE(0, 0x0, 0x0, 0),
+ REGULATOR_LINEAR_RANGE(1000000, 0x1, 0x18, 0),
REGULATOR_LINEAR_RANGE(1025000, 0x19, 0x7F, 25000),
};

drivers/regulator/twl-regulator.c

View file
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 210681d..6c9ec84 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -24,7 +24,7 @@
#include <linux/delay.h>
/*
- * The TWL4030/TW5030/TPS659x0/TWL6030 family chips include power management, a
+ * The TWL4030/TW5030/TPS659x0 family chips include power management, a
* USB OTG transceiver, an RTC, ADC, PWM, and lots more. Some versions
* include an audio codec, battery charger, and more voltage regulators.
* These chips are often used in OMAP-based systems.
@@ -48,25 +48,12 @@ struct twlreg_info {
/* State REMAP default configuration */
u8 remap;
- /* chip constraints on regulator behavior */
- u16 min_mV;
- u16 max_mV;
-
- u8 flags;
-
/* used by regulator core */
struct regulator_desc desc;
/* chip specific features */
unsigned long features;
- /*
- * optional override functions for voltage set/get
- * these are currently only used for SMPS regulators
- */
- int (*get_voltage)(void *data);
- int (*set_voltage)(void *data, int target_uV);
-
/* data passed from board for external get/set voltage */
void *data;
};
@@ -88,33 +75,6 @@ struct twlreg_info {
#define VREG_STATE 2
#define VREG_VOLTAGE 3
#define VREG_VOLTAGE_SMPS 4
-/* 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
-
-/* TWL6030 LDO register values for CFG_STATE */
-#define TWL6030_CFG_STATE_OFF 0x00
-#define TWL6030_CFG_STATE_ON 0x01
-#define TWL6030_CFG_STATE_OFF2 0x02
-#define TWL6030_CFG_STATE_SLEEP 0x03
-#define TWL6030_CFG_STATE_GRP_SHIFT 5
-#define TWL6030_CFG_STATE_APP_SHIFT 2
-#define TWL6030_CFG_STATE_APP_MASK (0x03 << TWL6030_CFG_STATE_APP_SHIFT)
-#define TWL6030_CFG_STATE_APP(v) (((v) & TWL6030_CFG_STATE_APP_MASK) >>\
- TWL6030_CFG_STATE_APP_SHIFT)
-
-/* Flags for SMPS Voltage reading */
-#define SMPS_OFFSET_EN BIT(0)
-#define SMPS_EXTENDED_EN BIT(1)
-
-/* twl6032 SMPS EPROM values */
-#define TWL6030_SMPS_OFFSET 0xB0
-#define TWL6030_SMPS_MULT 0xB3
-#define SMPS_MULTOFFSET_SMPS4 BIT(0)
-#define SMPS_MULTOFFSET_VIO BIT(1)
-#define SMPS_MULTOFFSET_SMPS3 BIT(6)
static inline int
twlreg_read(struct twlreg_info *info, unsigned slave_subgp, unsigned offset)
@@ -168,26 +128,6 @@ static int twl4030reg_is_enabled(struct regulator_dev *rdev)
return state & P1_GRP_4030;
}
-static int twl6030reg_is_enabled(struct regulator_dev *rdev)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
- int grp = 0, val;
-
- if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS))) {
- grp = twlreg_grp(rdev);
- if (grp < 0)
- return grp;
- grp &= P1_GRP_6030;
- } else {
- grp = 1;
- }
-
- val = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_STATE);
- val = TWL6030_CFG_STATE_APP(val);
-
- return grp && (val == TWL6030_CFG_STATE_ON);
-}
-
#define PB_I2C_BUSY BIT(0)
#define PB_I2C_BWEN BIT(1)
@@ -273,23 +213,6 @@ static int twl4030reg_enable(struct regulator_dev *rdev)
return ret;
}
-static int twl6030reg_enable(struct regulator_dev *rdev)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
- int grp = 0;
- int ret;
-
- if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS)))
- grp = twlreg_grp(rdev);
- if (grp < 0)
- return grp;
-
- ret = twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_STATE,
- grp << TWL6030_CFG_STATE_GRP_SHIFT |
- TWL6030_CFG_STATE_ON);
- return ret;
-}
-
static int twl4030reg_disable(struct regulator_dev *rdev)
{
struct twlreg_info *info = rdev_get_drvdata(rdev);
@@ -307,23 +230,6 @@ static int twl4030reg_disable(struct regulator_dev *rdev)
return ret;
}
-static int twl6030reg_disable(struct regulator_dev *rdev)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
- int grp = 0;
- int ret;
-
- if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS)))
- grp = P1_GRP_6030 | P2_GRP_6030 | P3_GRP_6030;
-
- /* For 6030, set the off state for all grps enabled */
- ret = twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_STATE,
- (grp) << TWL6030_CFG_STATE_GRP_SHIFT |
- TWL6030_CFG_STATE_OFF);
-
- return ret;
-}
-
static int twl4030reg_get_status(struct regulator_dev *rdev)
{
int state = twlreg_grp(rdev);
@@ -340,33 +246,6 @@ static int twl4030reg_get_status(struct regulator_dev *rdev)
: REGULATOR_STATUS_STANDBY;
}
-static int twl6030reg_get_status(struct regulator_dev *rdev)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
- int val;
-
- val = twlreg_grp(rdev);
- if (val < 0)
- return val;
-
- val = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_STATE);
-
- switch (TWL6030_CFG_STATE_APP(val)) {
- case TWL6030_CFG_STATE_ON:
- return REGULATOR_STATUS_NORMAL;
-
- case TWL6030_CFG_STATE_SLEEP:
- return REGULATOR_STATUS_STANDBY;
-
- case TWL6030_CFG_STATE_OFF:
- case TWL6030_CFG_STATE_OFF2:
- default:
- break;
- }
-
- return REGULATOR_STATUS_OFF;
-}
-
static int twl4030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
{
struct twlreg_info *info = rdev_get_drvdata(rdev);
@@ -399,36 +278,6 @@ static inline unsigned int twl4030reg_map_mode(unsigned int mode)
}
}
-static int twl6030reg_set_mode(struct regulator_dev *rdev, unsigned mode)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
- int grp = 0;
- int val;
-
- if (!(twl_class_is_6030() && (info->features & TWL6032_SUBCLASS)))
- grp = twlreg_grp(rdev);
-
- if (grp < 0)
- return grp;
-
- /* Compose the state register settings */
- val = grp << TWL6030_CFG_STATE_GRP_SHIFT;
- /* We can only set the mode through state machine commands... */
- switch (mode) {
- case REGULATOR_MODE_NORMAL:
- val |= TWL6030_CFG_STATE_ON;
- break;
- case REGULATOR_MODE_STANDBY:
- val |= TWL6030_CFG_STATE_SLEEP;
- break;
-
- default:
- return -EINVAL;
- }
-
- return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_STATE, val);
-}
-
/*----------------------------------------------------------------------*/
/*
@@ -565,12 +414,7 @@ twl4030smps_set_voltage(struct regulator_dev *rdev, int min_uV, int max_uV,
struct twlreg_info *info = rdev_get_drvdata(rdev);
int vsel = DIV_ROUND_UP(min_uV - 600000, 12500);
- if (info->set_voltage) {
- return info->set_voltage(info->data, min_uV);
- } else {
- twlreg_write(info, TWL_MODULE_PM_RECEIVER,
- VREG_VOLTAGE_SMPS_4030, vsel);
- }
+ twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE_SMPS_4030, vsel);
return 0;
}
@@ -580,9 +424,6 @@ static int twl4030smps_get_voltage(struct regulator_dev *rdev)
struct twlreg_info *info = rdev_get_drvdata(rdev);
int vsel;
- if (info->get_voltage)
- return info->get_voltage(info->data);
-
vsel = twlreg_read(info, TWL_MODULE_PM_RECEIVER,
VREG_VOLTAGE_SMPS_4030);
@@ -594,85 +435,6 @@ static struct regulator_ops twl4030smps_ops = {
.get_voltage = twl4030smps_get_voltage,
};
-static int twl6030coresmps_set_voltage(struct regulator_dev *rdev, int min_uV,
- int max_uV, unsigned *selector)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
-
- if (info->set_voltage)
- return info->set_voltage(info->data, min_uV);
-
- return -ENODEV;
-}
-
-static int twl6030coresmps_get_voltage(struct regulator_dev *rdev)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
-
- if (info->get_voltage)
- return info->get_voltage(info->data);
-
- return -ENODEV;
-}
-
-static struct regulator_ops twl6030coresmps_ops = {
- .set_voltage = twl6030coresmps_set_voltage,
- .get_voltage = twl6030coresmps_get_voltage,
-};
-
-static int twl6030ldo_list_voltage(struct regulator_dev *rdev, unsigned sel)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
-
- switch (sel) {
- case 0:
- return 0;
- case 1 ... 24:
- /* Linear mapping from 00000001 to 00011000:
- * Absolute voltage value = 1.0 V + 0.1 V × (sel – 00000001)
- */
- return (info->min_mV + 100 * (sel - 1)) * 1000;
- case 25 ... 30:
- return -EINVAL;
- case 31:
- return 2750000;
- default:
- return -EINVAL;
- }
-}
-
-static int
-twl6030ldo_set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
-
- return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE,
- selector);
-}
-
-static int twl6030ldo_get_voltage_sel(struct regulator_dev *rdev)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
- int vsel = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE);
-
- return vsel;
-}
-
-static struct regulator_ops twl6030ldo_ops = {
- .list_voltage = twl6030ldo_list_voltage,
-
- .set_voltage_sel = twl6030ldo_set_voltage_sel,
- .get_voltage_sel = twl6030ldo_get_voltage_sel,
-
- .enable = twl6030reg_enable,
- .disable = twl6030reg_disable,
- .is_enabled = twl6030reg_is_enabled,
-
- .set_mode = twl6030reg_set_mode,
-
- .get_status = twl6030reg_get_status,
-};
-
/*----------------------------------------------------------------------*/
static struct regulator_ops twl4030fixed_ops = {
@@ -687,226 +449,8 @@ static struct regulator_ops twl4030fixed_ops = {
.get_status = twl4030reg_get_status,
};
-static struct regulator_ops twl6030fixed_ops = {
- .list_voltage = regulator_list_voltage_linear,
-
- .enable = twl6030reg_enable,
- .disable = twl6030reg_disable,
- .is_enabled = twl6030reg_is_enabled,
-
- .set_mode = twl6030reg_set_mode,
-
- .get_status = twl6030reg_get_status,
-};
-
-/*
- * SMPS status and control
- */
-
-static int twl6030smps_list_voltage(struct regulator_dev *rdev, unsigned index)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
-
- int voltage = 0;
-
- switch (info->flags) {
- case SMPS_OFFSET_EN:
- voltage = 100000;
- /* fall through */
- case 0:
- switch (index) {
- case 0:
- voltage = 0;
- break;
- case 58:
- voltage = 1350 * 1000;
- break;
- case 59:
- voltage = 1500 * 1000;
- break;
- case 60:
- voltage = 1800 * 1000;
- break;
- case 61:
- voltage = 1900 * 1000;
- break;
- case 62:
- voltage = 2100 * 1000;
- break;
- default:
- voltage += (600000 + (12500 * (index - 1)));
- }
- break;
- case SMPS_EXTENDED_EN:
- switch (index) {
- case 0:
- voltage = 0;
- break;
- case 58:
- voltage = 2084 * 1000;
- break;
- case 59:
- voltage = 2315 * 1000;
- break;
- case 60:
- voltage = 2778 * 1000;
- break;
- case 61:
- voltage = 2932 * 1000;
- break;
- case 62:
- voltage = 3241 * 1000;
- break;
- default:
- voltage = (1852000 + (38600 * (index - 1)));
- }
- break;
- case SMPS_OFFSET_EN | SMPS_EXTENDED_EN:
- switch (index) {
- case 0:
- voltage = 0;
- break;
- case 58:
- voltage = 4167 * 1000;
- break;
- case 59:
- voltage = 2315 * 1000;
- break;
- case 60:
- voltage = 2778 * 1000;
- break;
- case 61:
- voltage = 2932 * 1000;
- break;
- case 62:
- voltage = 3241 * 1000;
- break;
- default:
- voltage = (2161000 + (38600 * (index - 1)));
- }
- break;
- }
-
- return voltage;
-}
-
-static int twl6030smps_map_voltage(struct regulator_dev *rdev, int min_uV,
- int max_uV)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
- int vsel = 0;
-
- switch (info->flags) {
- case 0:
- if (min_uV == 0)
- vsel = 0;
- else if ((min_uV >= 600000) && (min_uV <= 1300000)) {
- vsel = DIV_ROUND_UP(min_uV - 600000, 12500);
- vsel++;
- }
- /* Values 1..57 for vsel are linear and can be calculated
- * values 58..62 are non linear.
- */
- else if ((min_uV > 1900000) && (min_uV <= 2100000))
- vsel = 62;
- else if ((min_uV > 1800000) && (min_uV <= 1900000))
- vsel = 61;
- else if ((min_uV > 1500000) && (min_uV <= 1800000))
- vsel = 60;
- else if ((min_uV > 1350000) && (min_uV <= 1500000))
- vsel = 59;
- else if ((min_uV > 1300000) && (min_uV <= 1350000))
- vsel = 58;
- else
- return -EINVAL;
- break;
- case SMPS_OFFSET_EN:
- if (min_uV == 0)
- vsel = 0;
- else if ((min_uV >= 700000) && (min_uV <= 1420000)) {
- vsel = DIV_ROUND_UP(min_uV - 700000, 12500);
- vsel++;
- }
- /* Values 1..57 for vsel are linear and can be calculated
- * values 58..62 are non linear.
- */
- else if ((min_uV > 1900000) && (min_uV <= 2100000))
- vsel = 62;
- else if ((min_uV > 1800000) && (min_uV <= 1900000))
- vsel = 61;
- else if ((min_uV > 1350000) && (min_uV <= 1800000))
- vsel = 60;
- else if ((min_uV > 1350000) && (min_uV <= 1500000))
- vsel = 59;
- else if ((min_uV > 1300000) && (min_uV <= 1350000))
- vsel = 58;
- else
- return -EINVAL;
- break;
- case SMPS_EXTENDED_EN:
- if (min_uV == 0) {
- vsel = 0;
- } else if ((min_uV >= 1852000) && (max_uV <= 4013600)) {
- vsel = DIV_ROUND_UP(min_uV - 1852000, 38600);
- vsel++;
- }
- break;
- case SMPS_OFFSET_EN|SMPS_EXTENDED_EN:
- if (min_uV == 0) {
- vsel = 0;
- } else if ((min_uV >= 2161000) && (min_uV <= 4321000)) {
- vsel = DIV_ROUND_UP(min_uV - 2161000, 38600);
- vsel++;
- }
- break;
- }
-
- return vsel;
-}
-
-static int twl6030smps_set_voltage_sel(struct regulator_dev *rdev,
- unsigned int selector)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
-
- return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE_SMPS,
- selector);
-}
-
-static int twl6030smps_get_voltage_sel(struct regulator_dev *rdev)
-{
- struct twlreg_info *info = rdev_get_drvdata(rdev);
-
- return twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_VOLTAGE_SMPS);
-}
-
-static struct regulator_ops twlsmps_ops = {
- .list_voltage = twl6030smps_list_voltage,
- .map_voltage = twl6030smps_map_voltage,
-
- .set_voltage_sel = twl6030smps_set_voltage_sel,
- .get_voltage_sel = twl6030smps_get_voltage_sel,
-
- .enable = twl6030reg_enable,
- .disable = twl6030reg_disable,
- .is_enabled = twl6030reg_is_enabled,
-
- .set_mode = twl6030reg_set_mode,
-
- .get_status = twl6030reg_get_status,
-};
-
/*----------------------------------------------------------------------*/
-#define TWL4030_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
- remap_conf) \
- TWL_FIXED_LDO(label, offset, mVolts, num, turnon_delay, \
- remap_conf, TWL4030, twl4030fixed_ops, \
- twl4030reg_map_mode)
-#define TWL6030_FIXED_LDO(label, offset, mVolts, turnon_delay) \
- TWL_FIXED_LDO(label, offset, mVolts, 0x0, turnon_delay, \
- 0x0, TWL6030, twl6030fixed_ops, NULL)
-
#define TWL4030_ADJUSTABLE_LDO(label, offset, num, turnon_delay, remap_conf) \
static const struct twlreg_info TWL4030_INFO_##label = { \
.base = offset, \
@@ -942,79 +486,22 @@ static const struct twlreg_info TWL4030_INFO_##label = { \
}, \
}
-#define TWL6030_ADJUSTABLE_SMPS(label) \

This diff is incomplete. Download the complete patch.

drivers/regulator/twl6030-regulator.c

View file

This diff is incomplete. Download the complete patch.