summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/devicetree/bindings/mfd/tps65910.txt25
-rw-r--r--drivers/regulator/tps65910-regulator.c36
-rw-r--r--include/linux/mfd/tps65910.h2
3 files changed, 63 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/mfd/tps65910.txt b/Documentation/devicetree/bindings/mfd/tps65910.txt
index b51d2066599c..31be5a3d9f76 100644
--- a/Documentation/devicetree/bindings/mfd/tps65910.txt
+++ b/Documentation/devicetree/bindings/mfd/tps65910.txt
@@ -32,6 +32,28 @@ Optional properties:
comparator. (see VMBCH_VSEL in TPS65910 datasheet)
- ti,en-gpio-sleep: enable sleep control for gpios
There should be 9 entries here, one for each gpio.
+- xxx-supply: Input voltage supply regulator.
+ Missing of these properties will be assume as there is no supply regulator
+ for that input pins and always powered on.
+ The valid input supply properties are:
+ tps65910:
+ vcc1-supply: VDD1 input.
+ vcc2-supply: VDD2 input.
+ vcc3-supply: VAUX33 and VMMC input.
+ vcc4-supply: VAUX1 and VAUX2 input.
+ vcc5-supply: VPLL and VDAC input.
+ vcc6-supply: VDIG1 and VDIG2 input.
+ vcc7-supply: VRTC input.
+ vccio-supply: VIO input.
+ tps65911:
+ vcc1-supply: VDD1 input.
+ vcc2-supply: VDD2 input.
+ vcc3-supply: LDO6, LDO7 and LDO8 input.
+ vcc4-supply: LDO5 input.
+ vcc5-supply: LDO3 and LDO4 input.
+ vcc6-supply: LDO1 and LDO2 input.
+ vcc7-supply: VRTC input.
+ vccio-supply: VIO input.
Regulator Optional properties:
- ti,regulator-ext-sleep-control: enable external sleep
@@ -57,6 +79,9 @@ Example:
ti,en-gpio-sleep = <0 0 1 0 0 0 0 0 0>;
+ vcc7-supply = <&reg_parent>;
+ vcc1-supply = <&reg_parent>;
+
regulators {
#address-cells = <1>;
#size-cells = <0>;
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c
index a534e0872006..e319d963fee6 100644
--- a/drivers/regulator/tps65910-regulator.c
+++ b/drivers/regulator/tps65910-regulator.c
@@ -85,6 +85,7 @@ static const unsigned int VMMC_VSEL_table[] = {
struct tps_info {
const char *name;
+ const char *vin_name;
u8 n_voltages;
const unsigned int *voltage_table;
int enable_time_us;
@@ -93,20 +94,24 @@ struct tps_info {
static struct tps_info tps65910_regs[] = {
{
.name = "vrtc",
+ .vin_name = "vcc7",
.enable_time_us = 2200,
},
{
.name = "vio",
+ .vin_name = "vccio",
.n_voltages = ARRAY_SIZE(VIO_VSEL_table),
.voltage_table = VIO_VSEL_table,
.enable_time_us = 350,
},
{
.name = "vdd1",
+ .vin_name = "vcc1",
.enable_time_us = 350,
},
{
.name = "vdd2",
+ .vin_name = "vcc2",
.enable_time_us = 350,
},
{
@@ -117,48 +122,56 @@ static struct tps_info tps65910_regs[] = {
},
{
.name = "vdig1",
+ .vin_name = "vcc6",
.n_voltages = ARRAY_SIZE(VDIG1_VSEL_table),
.voltage_table = VDIG1_VSEL_table,
.enable_time_us = 100,
},
{
.name = "vdig2",
+ .vin_name = "vcc6",
.n_voltages = ARRAY_SIZE(VDIG2_VSEL_table),
.voltage_table = VDIG2_VSEL_table,
.enable_time_us = 100,
},
{
.name = "vpll",
+ .vin_name = "vcc5",
.n_voltages = ARRAY_SIZE(VPLL_VSEL_table),
.voltage_table = VPLL_VSEL_table,
.enable_time_us = 100,
},
{
.name = "vdac",
+ .vin_name = "vcc5",
.n_voltages = ARRAY_SIZE(VDAC_VSEL_table),
.voltage_table = VDAC_VSEL_table,
.enable_time_us = 100,
},
{
.name = "vaux1",
+ .vin_name = "vcc4",
.n_voltages = ARRAY_SIZE(VAUX1_VSEL_table),
.voltage_table = VAUX1_VSEL_table,
.enable_time_us = 100,
},
{
.name = "vaux2",
+ .vin_name = "vcc4",
.n_voltages = ARRAY_SIZE(VAUX2_VSEL_table),
.voltage_table = VAUX2_VSEL_table,
.enable_time_us = 100,
},
{
.name = "vaux33",
+ .vin_name = "vcc3",
.n_voltages = ARRAY_SIZE(VAUX33_VSEL_table),
.voltage_table = VAUX33_VSEL_table,
.enable_time_us = 100,
},
{
.name = "vmmc",
+ .vin_name = "vcc3",
.n_voltages = ARRAY_SIZE(VMMC_VSEL_table),
.voltage_table = VMMC_VSEL_table,
.enable_time_us = 100,
@@ -168,21 +181,25 @@ static struct tps_info tps65910_regs[] = {
static struct tps_info tps65911_regs[] = {
{
.name = "vrtc",
+ .vin_name = "vcc7",
.enable_time_us = 2200,
},
{
.name = "vio",
+ .vin_name = "vccio",
.n_voltages = ARRAY_SIZE(VIO_VSEL_table),
.voltage_table = VIO_VSEL_table,
.enable_time_us = 350,
},
{
.name = "vdd1",
+ .vin_name = "vcc1",
.n_voltages = 73,
.enable_time_us = 350,
},
{
.name = "vdd2",
+ .vin_name = "vcc2",
.n_voltages = 73,
.enable_time_us = 350,
},
@@ -193,41 +210,49 @@ static struct tps_info tps65911_regs[] = {
},
{
.name = "ldo1",
+ .vin_name = "vcc6",
.n_voltages = 47,
.enable_time_us = 420,
},
{
.name = "ldo2",
+ .vin_name = "vcc6",
.n_voltages = 47,
.enable_time_us = 420,
},
{
.name = "ldo3",
+ .vin_name = "vcc5",
.n_voltages = 24,
.enable_time_us = 230,
},
{
.name = "ldo4",
+ .vin_name = "vcc5",
.n_voltages = 47,
.enable_time_us = 230,
},
{
.name = "ldo5",
+ .vin_name = "vcc4",
.n_voltages = 24,
.enable_time_us = 230,
},
{
.name = "ldo6",
+ .vin_name = "vcc3",
.n_voltages = 24,
.enable_time_us = 230,
},
{
.name = "ldo7",
+ .vin_name = "vcc3",
.n_voltages = 24,
.enable_time_us = 230,
},
{
.name = "ldo8",
+ .vin_name = "vcc3",
.n_voltages = 24,
.enable_time_us = 230,
},
@@ -1013,6 +1038,9 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
*tps65910_reg_matches = matches;
for (idx = 0; idx < count; idx++) {
+ struct tps_info *info = matches[idx].driver_data;
+ char in_supply[32]; /* 32 is max size of property name */
+
if (!matches[idx].init_data || !matches[idx].of_node)
continue;
@@ -1023,6 +1051,13 @@ static struct tps65910_board *tps65910_parse_dt_reg_data(
"ti,regulator-ext-sleep-control", &prop);
if (!ret)
pmic_plat_data->regulator_ext_sleep_control[idx] = prop;
+
+ if (info->vin_name) {
+ snprintf(in_supply, 32, "%s-supply", info->vin_name);
+ if (of_find_property(np, in_supply, 0))
+ pmic_plat_data->input_supply[idx] =
+ info->vin_name;
+ }
}
return pmic_plat_data;
@@ -1126,6 +1161,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
pmic->info[i] = info;
pmic->desc[i].name = info->name;
+ pmic->desc[i].supply_name = pmic_plat_data->input_supply[i];
pmic->desc[i].id = i;
pmic->desc[i].n_voltages = info->n_voltages;
pmic->desc[i].enable_time = info->enable_time_us;
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h
index dd8dc0a6c462..c5f806011b32 100644
--- a/include/linux/mfd/tps65910.h
+++ b/include/linux/mfd/tps65910.h
@@ -799,6 +799,7 @@ struct tps65910_sleep_keepon_data {
/**
* struct tps65910_board
* Board platform data may be used to initialize regulators.
+ * @input_supply: Name of input supply regulator.
*/
struct tps65910_board {
@@ -811,6 +812,7 @@ struct tps65910_board {
struct tps65910_sleep_keepon_data *slp_keepon;
bool en_gpio_sleep[TPS6591X_MAX_NUM_GPIO];
unsigned long regulator_ext_sleep_control[TPS65910_NUM_REGS];
+ const char *input_supply[TPS65910_NUM_REGS];
struct regulator_init_data *tps65910_pmic_init_data[TPS65910_NUM_REGS];
};
generated by cgit (git 2.34.1) at 2024-06-20 23:08:10 +0000