aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2013-03-20 09:56:37 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-27 20:26:04 -0400
commit504382c99d346c7443664dbc21b61101ccce078d (patch)
tree428835808dc24b3c98dc2addadc30705c0855460
parent574651f0f8eac83ef4cded056272dcb97333aa68 (diff)
regulator: palmas: add input supply names
Palmas regulator support the different input supply pins for each of the rails. Fill the regulator info data with their input supply pin names. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/regulator/palmas-regulator.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
index 3bd61bd02a46..24bbd620d933 100644
--- a/drivers/regulator/palmas-regulator.c
+++ b/drivers/regulator/palmas-regulator.c
@@ -28,6 +28,7 @@
28 28
29struct regs_info { 29struct regs_info {
30 char *name; 30 char *name;
31 char *sname;
31 u8 vsel_addr; 32 u8 vsel_addr;
32 u8 ctrl_addr; 33 u8 ctrl_addr;
33 u8 tstep_addr; 34 u8 tstep_addr;
@@ -36,110 +37,131 @@ struct regs_info {
36static const struct regs_info palmas_regs_info[] = { 37static const struct regs_info palmas_regs_info[] = {
37 { 38 {
38 .name = "SMPS12", 39 .name = "SMPS12",
40 .sname = "smps1-in",
39 .vsel_addr = PALMAS_SMPS12_VOLTAGE, 41 .vsel_addr = PALMAS_SMPS12_VOLTAGE,
40 .ctrl_addr = PALMAS_SMPS12_CTRL, 42 .ctrl_addr = PALMAS_SMPS12_CTRL,
41 .tstep_addr = PALMAS_SMPS12_TSTEP, 43 .tstep_addr = PALMAS_SMPS12_TSTEP,
42 }, 44 },
43 { 45 {
44 .name = "SMPS123", 46 .name = "SMPS123",
47 .sname = "smps1-in",
45 .vsel_addr = PALMAS_SMPS12_VOLTAGE, 48 .vsel_addr = PALMAS_SMPS12_VOLTAGE,
46 .ctrl_addr = PALMAS_SMPS12_CTRL, 49 .ctrl_addr = PALMAS_SMPS12_CTRL,
47 .tstep_addr = PALMAS_SMPS12_TSTEP, 50 .tstep_addr = PALMAS_SMPS12_TSTEP,
48 }, 51 },
49 { 52 {
50 .name = "SMPS3", 53 .name = "SMPS3",
54 .sname = "smps3-in",
51 .vsel_addr = PALMAS_SMPS3_VOLTAGE, 55 .vsel_addr = PALMAS_SMPS3_VOLTAGE,
52 .ctrl_addr = PALMAS_SMPS3_CTRL, 56 .ctrl_addr = PALMAS_SMPS3_CTRL,
53 }, 57 },
54 { 58 {
55 .name = "SMPS45", 59 .name = "SMPS45",
60 .sname = "smps4-in",
56 .vsel_addr = PALMAS_SMPS45_VOLTAGE, 61 .vsel_addr = PALMAS_SMPS45_VOLTAGE,
57 .ctrl_addr = PALMAS_SMPS45_CTRL, 62 .ctrl_addr = PALMAS_SMPS45_CTRL,
58 .tstep_addr = PALMAS_SMPS45_TSTEP, 63 .tstep_addr = PALMAS_SMPS45_TSTEP,
59 }, 64 },
60 { 65 {
61 .name = "SMPS457", 66 .name = "SMPS457",
67 .sname = "smps4-in",
62 .vsel_addr = PALMAS_SMPS45_VOLTAGE, 68 .vsel_addr = PALMAS_SMPS45_VOLTAGE,
63 .ctrl_addr = PALMAS_SMPS45_CTRL, 69 .ctrl_addr = PALMAS_SMPS45_CTRL,
64 .tstep_addr = PALMAS_SMPS45_TSTEP, 70 .tstep_addr = PALMAS_SMPS45_TSTEP,
65 }, 71 },
66 { 72 {
67 .name = "SMPS6", 73 .name = "SMPS6",
74 .sname = "smps6-in",
68 .vsel_addr = PALMAS_SMPS6_VOLTAGE, 75 .vsel_addr = PALMAS_SMPS6_VOLTAGE,
69 .ctrl_addr = PALMAS_SMPS6_CTRL, 76 .ctrl_addr = PALMAS_SMPS6_CTRL,
70 .tstep_addr = PALMAS_SMPS6_TSTEP, 77 .tstep_addr = PALMAS_SMPS6_TSTEP,
71 }, 78 },
72 { 79 {
73 .name = "SMPS7", 80 .name = "SMPS7",
81 .sname = "smps7-in",
74 .vsel_addr = PALMAS_SMPS7_VOLTAGE, 82 .vsel_addr = PALMAS_SMPS7_VOLTAGE,
75 .ctrl_addr = PALMAS_SMPS7_CTRL, 83 .ctrl_addr = PALMAS_SMPS7_CTRL,
76 }, 84 },
77 { 85 {
78 .name = "SMPS8", 86 .name = "SMPS8",
87 .sname = "smps8-in",
79 .vsel_addr = PALMAS_SMPS8_VOLTAGE, 88 .vsel_addr = PALMAS_SMPS8_VOLTAGE,
80 .ctrl_addr = PALMAS_SMPS8_CTRL, 89 .ctrl_addr = PALMAS_SMPS8_CTRL,
81 .tstep_addr = PALMAS_SMPS8_TSTEP, 90 .tstep_addr = PALMAS_SMPS8_TSTEP,
82 }, 91 },
83 { 92 {
84 .name = "SMPS9", 93 .name = "SMPS9",
94 .sname = "smps9-in",
85 .vsel_addr = PALMAS_SMPS9_VOLTAGE, 95 .vsel_addr = PALMAS_SMPS9_VOLTAGE,
86 .ctrl_addr = PALMAS_SMPS9_CTRL, 96 .ctrl_addr = PALMAS_SMPS9_CTRL,
87 }, 97 },
88 { 98 {
89 .name = "SMPS10", 99 .name = "SMPS10",
100 .sname = "smps10-in",
90 }, 101 },
91 { 102 {
92 .name = "LDO1", 103 .name = "LDO1",
104 .sname = "ldo1-in",
93 .vsel_addr = PALMAS_LDO1_VOLTAGE, 105 .vsel_addr = PALMAS_LDO1_VOLTAGE,
94 .ctrl_addr = PALMAS_LDO1_CTRL, 106 .ctrl_addr = PALMAS_LDO1_CTRL,
95 }, 107 },
96 { 108 {
97 .name = "LDO2", 109 .name = "LDO2",
110 .sname = "ldo2-in",
98 .vsel_addr = PALMAS_LDO2_VOLTAGE, 111 .vsel_addr = PALMAS_LDO2_VOLTAGE,
99 .ctrl_addr = PALMAS_LDO2_CTRL, 112 .ctrl_addr = PALMAS_LDO2_CTRL,
100 }, 113 },
101 { 114 {
102 .name = "LDO3", 115 .name = "LDO3",
116 .sname = "ldo3-in",
103 .vsel_addr = PALMAS_LDO3_VOLTAGE, 117 .vsel_addr = PALMAS_LDO3_VOLTAGE,
104 .ctrl_addr = PALMAS_LDO3_CTRL, 118 .ctrl_addr = PALMAS_LDO3_CTRL,
105 }, 119 },
106 { 120 {
107 .name = "LDO4", 121 .name = "LDO4",
122 .sname = "ldo4-in",
108 .vsel_addr = PALMAS_LDO4_VOLTAGE, 123 .vsel_addr = PALMAS_LDO4_VOLTAGE,
109 .ctrl_addr = PALMAS_LDO4_CTRL, 124 .ctrl_addr = PALMAS_LDO4_CTRL,
110 }, 125 },
111 { 126 {
112 .name = "LDO5", 127 .name = "LDO5",
128 .sname = "ldo5-in",
113 .vsel_addr = PALMAS_LDO5_VOLTAGE, 129 .vsel_addr = PALMAS_LDO5_VOLTAGE,
114 .ctrl_addr = PALMAS_LDO5_CTRL, 130 .ctrl_addr = PALMAS_LDO5_CTRL,
115 }, 131 },
116 { 132 {
117 .name = "LDO6", 133 .name = "LDO6",
134 .sname = "ldo6-in",
118 .vsel_addr = PALMAS_LDO6_VOLTAGE, 135 .vsel_addr = PALMAS_LDO6_VOLTAGE,
119 .ctrl_addr = PALMAS_LDO6_CTRL, 136 .ctrl_addr = PALMAS_LDO6_CTRL,
120 }, 137 },
121 { 138 {
122 .name = "LDO7", 139 .name = "LDO7",
140 .sname = "ldo7-in",
123 .vsel_addr = PALMAS_LDO7_VOLTAGE, 141 .vsel_addr = PALMAS_LDO7_VOLTAGE,
124 .ctrl_addr = PALMAS_LDO7_CTRL, 142 .ctrl_addr = PALMAS_LDO7_CTRL,
125 }, 143 },
126 { 144 {
127 .name = "LDO8", 145 .name = "LDO8",
146 .sname = "ldo8-in",
128 .vsel_addr = PALMAS_LDO8_VOLTAGE, 147 .vsel_addr = PALMAS_LDO8_VOLTAGE,
129 .ctrl_addr = PALMAS_LDO8_CTRL, 148 .ctrl_addr = PALMAS_LDO8_CTRL,
130 }, 149 },
131 { 150 {
132 .name = "LDO9", 151 .name = "LDO9",
152 .sname = "ldo9-in",
133 .vsel_addr = PALMAS_LDO9_VOLTAGE, 153 .vsel_addr = PALMAS_LDO9_VOLTAGE,
134 .ctrl_addr = PALMAS_LDO9_CTRL, 154 .ctrl_addr = PALMAS_LDO9_CTRL,
135 }, 155 },
136 { 156 {
137 .name = "LDOLN", 157 .name = "LDOLN",
158 .sname = "ldoln-in",
138 .vsel_addr = PALMAS_LDOLN_VOLTAGE, 159 .vsel_addr = PALMAS_LDOLN_VOLTAGE,
139 .ctrl_addr = PALMAS_LDOLN_CTRL, 160 .ctrl_addr = PALMAS_LDOLN_CTRL,
140 }, 161 },
141 { 162 {
142 .name = "LDOUSB", 163 .name = "LDOUSB",
164 .sname = "ldousb-in",
143 .vsel_addr = PALMAS_LDOUSB_VOLTAGE, 165 .vsel_addr = PALMAS_LDOUSB_VOLTAGE,
144 .ctrl_addr = PALMAS_LDOUSB_CTRL, 166 .ctrl_addr = PALMAS_LDOUSB_CTRL,
145 }, 167 },
@@ -709,6 +731,7 @@ static int palmas_regulators_probe(struct platform_device *pdev)
709 else 731 else
710 config.init_data = NULL; 732 config.init_data = NULL;
711 733
734 pmic->desc[id].supply_name = palmas_regs_info[id].sname;
712 config.of_node = palmas_matches[id].of_node; 735 config.of_node = palmas_matches[id].of_node;
713 736
714 rdev = regulator_register(&pmic->desc[id], &config); 737 rdev = regulator_register(&pmic->desc[id], &config);
@@ -755,6 +778,7 @@ static int palmas_regulators_probe(struct platform_device *pdev)
755 else 778 else
756 config.init_data = NULL; 779 config.init_data = NULL;
757 780
781 pmic->desc[id].supply_name = palmas_regs_info[id].sname;
758 config.of_node = palmas_matches[id].of_node; 782 config.of_node = palmas_matches[id].of_node;
759 783
760 rdev = regulator_register(&pmic->desc[id], &config); 784 rdev = regulator_register(&pmic->desc[id], &config);