Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 735eb93ae267f0b5638045b86dbc1e0b7019e3e8

Authored by Alberto Panizzo
Committed by Liam Girdwood
1 parent eb143ac1b9
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

regulator: mc13783-regulator: correct the probing time. 

When the mc13783-regulator driver is built in kernel, probing it during
the regulator subsystem initialisation result in a fault.

That is because regulator subsystem is planned to be initialised very early
in the boot process, before the mfd subsystem initialisation.

The mc12783-regulator probing process need to access to the mc13783-core
functionality to read/write mc13783 registers and so must be called after
the mc13783-core driver initialisation.

The way to do this is to let the kernel probe the mc13783-regulator driver when
mc13783-core register his regulator subdevice.

Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

Showing 1 changed file with 2 additions and 2 deletions Inline Diff

drivers/regulator/mc13783-regulator.c
Diff comments   View file @ 735eb93
1 /* 1 /*
2 * Regulator Driver for Freescale MC13783 PMIC 2 * Regulator Driver for Freescale MC13783 PMIC
3 * 3 *
4 * Copyright (C) 2008 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de> 4 * Copyright (C) 2008 Sascha Hauer, Pengutronix <s.hauer@pengutronix.de>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as 7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation. 8 * published by the Free Software Foundation.
9 */ 9 */
10 10
11 #include <linux/mfd/mc13783.h> 11 #include <linux/mfd/mc13783.h>
12 #include <linux/regulator/machine.h> 12 #include <linux/regulator/machine.h>
13 #include <linux/regulator/driver.h> 13 #include <linux/regulator/driver.h>
14 #include <linux/platform_device.h> 14 #include <linux/platform_device.h>
15 #include <linux/kernel.h> 15 #include <linux/kernel.h>
16 #include <linux/init.h> 16 #include <linux/init.h>
17 #include <linux/err.h> 17 #include <linux/err.h>
18 18
19 #define MC13783_REG_SWITCHERS4 28 19 #define MC13783_REG_SWITCHERS4 28
20 #define MC13783_REG_SWITCHERS4_PLLEN (1 << 18) 20 #define MC13783_REG_SWITCHERS4_PLLEN (1 << 18)
21 21
22 #define MC13783_REG_SWITCHERS5 29 22 #define MC13783_REG_SWITCHERS5 29
23 #define MC13783_REG_SWITCHERS5_SW3EN (1 << 20) 23 #define MC13783_REG_SWITCHERS5_SW3EN (1 << 20)
24 24
25 #define MC13783_REG_REGULATORMODE0 32 25 #define MC13783_REG_REGULATORMODE0 32
26 #define MC13783_REG_REGULATORMODE0_VAUDIOEN (1 << 0) 26 #define MC13783_REG_REGULATORMODE0_VAUDIOEN (1 << 0)
27 #define MC13783_REG_REGULATORMODE0_VIOHIEN (1 << 3) 27 #define MC13783_REG_REGULATORMODE0_VIOHIEN (1 << 3)
28 #define MC13783_REG_REGULATORMODE0_VIOLOEN (1 << 6) 28 #define MC13783_REG_REGULATORMODE0_VIOLOEN (1 << 6)
29 #define MC13783_REG_REGULATORMODE0_VDIGEN (1 << 9) 29 #define MC13783_REG_REGULATORMODE0_VDIGEN (1 << 9)
30 #define MC13783_REG_REGULATORMODE0_VGENEN (1 << 12) 30 #define MC13783_REG_REGULATORMODE0_VGENEN (1 << 12)
31 #define MC13783_REG_REGULATORMODE0_VRFDIGEN (1 << 15) 31 #define MC13783_REG_REGULATORMODE0_VRFDIGEN (1 << 15)
32 #define MC13783_REG_REGULATORMODE0_VRFREFEN (1 << 18) 32 #define MC13783_REG_REGULATORMODE0_VRFREFEN (1 << 18)
33 #define MC13783_REG_REGULATORMODE0_VRFCPEN (1 << 21) 33 #define MC13783_REG_REGULATORMODE0_VRFCPEN (1 << 21)
34 34
35 #define MC13783_REG_REGULATORMODE1 33 35 #define MC13783_REG_REGULATORMODE1 33
36 #define MC13783_REG_REGULATORMODE1_VSIMEN (1 << 0) 36 #define MC13783_REG_REGULATORMODE1_VSIMEN (1 << 0)
37 #define MC13783_REG_REGULATORMODE1_VESIMEN (1 << 3) 37 #define MC13783_REG_REGULATORMODE1_VESIMEN (1 << 3)
38 #define MC13783_REG_REGULATORMODE1_VCAMEN (1 << 6) 38 #define MC13783_REG_REGULATORMODE1_VCAMEN (1 << 6)
39 #define MC13783_REG_REGULATORMODE1_VRFBGEN (1 << 9) 39 #define MC13783_REG_REGULATORMODE1_VRFBGEN (1 << 9)
40 #define MC13783_REG_REGULATORMODE1_VVIBEN (1 << 11) 40 #define MC13783_REG_REGULATORMODE1_VVIBEN (1 << 11)
41 #define MC13783_REG_REGULATORMODE1_VRF1EN (1 << 12) 41 #define MC13783_REG_REGULATORMODE1_VRF1EN (1 << 12)
42 #define MC13783_REG_REGULATORMODE1_VRF2EN (1 << 15) 42 #define MC13783_REG_REGULATORMODE1_VRF2EN (1 << 15)
43 #define MC13783_REG_REGULATORMODE1_VMMC1EN (1 << 18) 43 #define MC13783_REG_REGULATORMODE1_VMMC1EN (1 << 18)
44 #define MC13783_REG_REGULATORMODE1_VMMC2EN (1 << 21) 44 #define MC13783_REG_REGULATORMODE1_VMMC2EN (1 << 21)
45 45
46 #define MC13783_REG_POWERMISC 34 46 #define MC13783_REG_POWERMISC 34
47 #define MC13783_REG_POWERMISC_GPO1EN (1 << 6) 47 #define MC13783_REG_POWERMISC_GPO1EN (1 << 6)
48 #define MC13783_REG_POWERMISC_GPO2EN (1 << 8) 48 #define MC13783_REG_POWERMISC_GPO2EN (1 << 8)
49 #define MC13783_REG_POWERMISC_GPO3EN (1 << 10) 49 #define MC13783_REG_POWERMISC_GPO3EN (1 << 10)
50 #define MC13783_REG_POWERMISC_GPO4EN (1 << 12) 50 #define MC13783_REG_POWERMISC_GPO4EN (1 << 12)
51 51
52 struct mc13783_regulator { 52 struct mc13783_regulator {
53 struct regulator_desc desc; 53 struct regulator_desc desc;
54 int reg; 54 int reg;
55 int enable_bit; 55 int enable_bit;
56 }; 56 };
57 57
58 static struct regulator_ops mc13783_regulator_ops; 58 static struct regulator_ops mc13783_regulator_ops;
59 59
60 #define MC13783_DEFINE(prefix, _name, _reg) \ 60 #define MC13783_DEFINE(prefix, _name, _reg) \
61 [MC13783_ ## prefix ## _ ## _name] = { \ 61 [MC13783_ ## prefix ## _ ## _name] = { \
62 .desc = { \ 62 .desc = { \
63 .name = #prefix "_" #_name, \ 63 .name = #prefix "_" #_name, \
64 .ops = &mc13783_regulator_ops, \ 64 .ops = &mc13783_regulator_ops, \
65 .type = REGULATOR_VOLTAGE, \ 65 .type = REGULATOR_VOLTAGE, \
66 .id = MC13783_ ## prefix ## _ ## _name, \ 66 .id = MC13783_ ## prefix ## _ ## _name, \
67 .owner = THIS_MODULE, \ 67 .owner = THIS_MODULE, \
68 }, \ 68 }, \
69 .reg = MC13783_REG_ ## _reg, \ 69 .reg = MC13783_REG_ ## _reg, \
70 .enable_bit = MC13783_REG_ ## _reg ## _ ## _name ## EN, \ 70 .enable_bit = MC13783_REG_ ## _reg ## _ ## _name ## EN, \
71 } 71 }
72 72
73 #define MC13783_DEFINE_SW(_name, _reg) MC13783_DEFINE(SW, _name, _reg) 73 #define MC13783_DEFINE_SW(_name, _reg) MC13783_DEFINE(SW, _name, _reg)
74 #define MC13783_DEFINE_REGU(_name, _reg) MC13783_DEFINE(REGU, _name, _reg) 74 #define MC13783_DEFINE_REGU(_name, _reg) MC13783_DEFINE(REGU, _name, _reg)
75 75
76 static struct mc13783_regulator mc13783_regulators[] = { 76 static struct mc13783_regulator mc13783_regulators[] = {
77 MC13783_DEFINE_SW(SW3, SWITCHERS5), 77 MC13783_DEFINE_SW(SW3, SWITCHERS5),
78 MC13783_DEFINE_SW(PLL, SWITCHERS4), 78 MC13783_DEFINE_SW(PLL, SWITCHERS4),
79 79
80 MC13783_DEFINE_REGU(VAUDIO, REGULATORMODE0), 80 MC13783_DEFINE_REGU(VAUDIO, REGULATORMODE0),
81 MC13783_DEFINE_REGU(VIOHI, REGULATORMODE0), 81 MC13783_DEFINE_REGU(VIOHI, REGULATORMODE0),
82 MC13783_DEFINE_REGU(VIOLO, REGULATORMODE0), 82 MC13783_DEFINE_REGU(VIOLO, REGULATORMODE0),
83 MC13783_DEFINE_REGU(VDIG, REGULATORMODE0), 83 MC13783_DEFINE_REGU(VDIG, REGULATORMODE0),
84 MC13783_DEFINE_REGU(VGEN, REGULATORMODE0), 84 MC13783_DEFINE_REGU(VGEN, REGULATORMODE0),
85 MC13783_DEFINE_REGU(VRFDIG, REGULATORMODE0), 85 MC13783_DEFINE_REGU(VRFDIG, REGULATORMODE0),
86 MC13783_DEFINE_REGU(VRFREF, REGULATORMODE0), 86 MC13783_DEFINE_REGU(VRFREF, REGULATORMODE0),
87 MC13783_DEFINE_REGU(VRFCP, REGULATORMODE0), 87 MC13783_DEFINE_REGU(VRFCP, REGULATORMODE0),
88 MC13783_DEFINE_REGU(VSIM, REGULATORMODE1), 88 MC13783_DEFINE_REGU(VSIM, REGULATORMODE1),
89 MC13783_DEFINE_REGU(VESIM, REGULATORMODE1), 89 MC13783_DEFINE_REGU(VESIM, REGULATORMODE1),
90 MC13783_DEFINE_REGU(VCAM, REGULATORMODE1), 90 MC13783_DEFINE_REGU(VCAM, REGULATORMODE1),
91 MC13783_DEFINE_REGU(VRFBG, REGULATORMODE1), 91 MC13783_DEFINE_REGU(VRFBG, REGULATORMODE1),
92 MC13783_DEFINE_REGU(VVIB, REGULATORMODE1), 92 MC13783_DEFINE_REGU(VVIB, REGULATORMODE1),
93 MC13783_DEFINE_REGU(VRF1, REGULATORMODE1), 93 MC13783_DEFINE_REGU(VRF1, REGULATORMODE1),
94 MC13783_DEFINE_REGU(VRF2, REGULATORMODE1), 94 MC13783_DEFINE_REGU(VRF2, REGULATORMODE1),
95 MC13783_DEFINE_REGU(VMMC1, REGULATORMODE1), 95 MC13783_DEFINE_REGU(VMMC1, REGULATORMODE1),
96 MC13783_DEFINE_REGU(VMMC2, REGULATORMODE1), 96 MC13783_DEFINE_REGU(VMMC2, REGULATORMODE1),
97 MC13783_DEFINE_REGU(GPO1, POWERMISC), 97 MC13783_DEFINE_REGU(GPO1, POWERMISC),
98 MC13783_DEFINE_REGU(GPO2, POWERMISC), 98 MC13783_DEFINE_REGU(GPO2, POWERMISC),
99 MC13783_DEFINE_REGU(GPO3, POWERMISC), 99 MC13783_DEFINE_REGU(GPO3, POWERMISC),
100 MC13783_DEFINE_REGU(GPO4, POWERMISC), 100 MC13783_DEFINE_REGU(GPO4, POWERMISC),
101 }; 101 };
102 102
103 struct mc13783_regulator_priv { 103 struct mc13783_regulator_priv {
104 struct mc13783 *mc13783; 104 struct mc13783 *mc13783;
105 struct regulator_dev *regulators[]; 105 struct regulator_dev *regulators[];
106 }; 106 };
107 107
108 static int mc13783_regulator_enable(struct regulator_dev *rdev) 108 static int mc13783_regulator_enable(struct regulator_dev *rdev)
109 { 109 {
110 struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); 110 struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev);
111 int id = rdev_get_id(rdev); 111 int id = rdev_get_id(rdev);
112 int ret; 112 int ret;
113 113
114 dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); 114 dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
115 115
116 mc13783_lock(priv->mc13783); 116 mc13783_lock(priv->mc13783);
117 ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].reg, 117 ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].reg,
118 mc13783_regulators[id].enable_bit, 118 mc13783_regulators[id].enable_bit,
119 mc13783_regulators[id].enable_bit); 119 mc13783_regulators[id].enable_bit);
120 mc13783_unlock(priv->mc13783); 120 mc13783_unlock(priv->mc13783);
121 121
122 return ret; 122 return ret;
123 } 123 }
124 124
125 static int mc13783_regulator_disable(struct regulator_dev *rdev) 125 static int mc13783_regulator_disable(struct regulator_dev *rdev)
126 { 126 {
127 struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); 127 struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev);
128 int id = rdev_get_id(rdev); 128 int id = rdev_get_id(rdev);
129 int ret; 129 int ret;
130 130
131 dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id); 131 dev_dbg(rdev_get_dev(rdev), "%s id: %d\n", __func__, id);
132 132
133 mc13783_lock(priv->mc13783); 133 mc13783_lock(priv->mc13783);
134 ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].reg, 134 ret = mc13783_reg_rmw(priv->mc13783, mc13783_regulators[id].reg,
135 mc13783_regulators[id].enable_bit, 0); 135 mc13783_regulators[id].enable_bit, 0);
136 mc13783_unlock(priv->mc13783); 136 mc13783_unlock(priv->mc13783);
137 137
138 return ret; 138 return ret;
139 } 139 }
140 140
141 static int mc13783_regulator_is_enabled(struct regulator_dev *rdev) 141 static int mc13783_regulator_is_enabled(struct regulator_dev *rdev)
142 { 142 {
143 struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev); 143 struct mc13783_regulator_priv *priv = rdev_get_drvdata(rdev);
144 int ret, id = rdev_get_id(rdev); 144 int ret, id = rdev_get_id(rdev);
145 unsigned int val; 145 unsigned int val;
146 146
147 mc13783_lock(priv->mc13783); 147 mc13783_lock(priv->mc13783);
148 ret = mc13783_reg_read(priv->mc13783, mc13783_regulators[id].reg, &val); 148 ret = mc13783_reg_read(priv->mc13783, mc13783_regulators[id].reg, &val);
149 mc13783_unlock(priv->mc13783); 149 mc13783_unlock(priv->mc13783);
150 150
151 if (ret) 151 if (ret)
152 return ret; 152 return ret;
153 153
154 return (val & mc13783_regulators[id].enable_bit) != 0; 154 return (val & mc13783_regulators[id].enable_bit) != 0;
155 } 155 }
156 156
157 static struct regulator_ops mc13783_regulator_ops = { 157 static struct regulator_ops mc13783_regulator_ops = {
158 .enable = mc13783_regulator_enable, 158 .enable = mc13783_regulator_enable,
159 .disable = mc13783_regulator_disable, 159 .disable = mc13783_regulator_disable,
160 .is_enabled = mc13783_regulator_is_enabled, 160 .is_enabled = mc13783_regulator_is_enabled,
161 }; 161 };
162 162
163 static int __devinit mc13783_regulator_probe(struct platform_device *pdev) 163 static int __devinit mc13783_regulator_probe(struct platform_device *pdev)
164 { 164 {
165 struct mc13783_regulator_priv *priv; 165 struct mc13783_regulator_priv *priv;
166 struct mc13783 *mc13783 = dev_get_drvdata(pdev->dev.parent); 166 struct mc13783 *mc13783 = dev_get_drvdata(pdev->dev.parent);
167 struct mc13783_regulator_platform_data *pdata = 167 struct mc13783_regulator_platform_data *pdata =
168 dev_get_platdata(&pdev->dev); 168 dev_get_platdata(&pdev->dev);
169 struct mc13783_regulator_init_data *init_data; 169 struct mc13783_regulator_init_data *init_data;
170 int i, ret; 170 int i, ret;
171 171
172 dev_dbg(&pdev->dev, "mc13783_regulator_probe id %d\n", pdev->id); 172 dev_dbg(&pdev->dev, "mc13783_regulator_probe id %d\n", pdev->id);
173 173
174 priv = kzalloc(sizeof(*priv) + 174 priv = kzalloc(sizeof(*priv) +
175 pdata->num_regulators * sizeof(priv->regulators[0]), 175 pdata->num_regulators * sizeof(priv->regulators[0]),
176 GFP_KERNEL); 176 GFP_KERNEL);
177 if (!priv) 177 if (!priv)
178 return -ENOMEM; 178 return -ENOMEM;
179 179
180 priv->mc13783 = mc13783; 180 priv->mc13783 = mc13783;
181 181
182 for (i = 0; i < pdata->num_regulators; i++) { 182 for (i = 0; i < pdata->num_regulators; i++) {
183 init_data = &pdata->regulators[i]; 183 init_data = &pdata->regulators[i];
184 priv->regulators[i] = regulator_register( 184 priv->regulators[i] = regulator_register(
185 &mc13783_regulators[init_data->id].desc, 185 &mc13783_regulators[init_data->id].desc,
186 &pdev->dev, init_data->init_data, priv); 186 &pdev->dev, init_data->init_data, priv);
187 187
188 if (IS_ERR(priv->regulators[i])) { 188 if (IS_ERR(priv->regulators[i])) {
189 dev_err(&pdev->dev, "failed to register regulator %s\n", 189 dev_err(&pdev->dev, "failed to register regulator %s\n",
190 mc13783_regulators[i].desc.name); 190 mc13783_regulators[i].desc.name);
191 ret = PTR_ERR(priv->regulators[i]); 191 ret = PTR_ERR(priv->regulators[i]);
192 goto err; 192 goto err;
193 } 193 }
194 } 194 }
195 195
196 platform_set_drvdata(pdev, priv); 196 platform_set_drvdata(pdev, priv);
197 197
198 return 0; 198 return 0;
199 err: 199 err:
200 while (--i >= 0) 200 while (--i >= 0)
201 regulator_unregister(priv->regulators[i]); 201 regulator_unregister(priv->regulators[i]);
202 202
203 kfree(priv); 203 kfree(priv);
204 204
205 return ret; 205 return ret;
206 } 206 }
207 207
208 static int __devexit mc13783_regulator_remove(struct platform_device *pdev) 208 static int __devexit mc13783_regulator_remove(struct platform_device *pdev)
209 { 209 {
210 struct mc13783_regulator_priv *priv = platform_get_drvdata(pdev); 210 struct mc13783_regulator_priv *priv = platform_get_drvdata(pdev);
211 struct mc13783_regulator_platform_data *pdata = 211 struct mc13783_regulator_platform_data *pdata =
212 dev_get_platdata(&pdev->dev); 212 dev_get_platdata(&pdev->dev);
213 int i; 213 int i;
214 214
215 for (i = 0; i < pdata->num_regulators; i++) 215 for (i = 0; i < pdata->num_regulators; i++)
216 regulator_unregister(priv->regulators[i]); 216 regulator_unregister(priv->regulators[i]);
217 217
218 return 0; 218 return 0;
219 } 219 }
220 220
221 static struct platform_driver mc13783_regulator_driver = { 221 static struct platform_driver mc13783_regulator_driver = {
222 .driver = { 222 .driver = {
223 .name = "mc13783-regulator", 223 .name = "mc13783-regulator",
224 .owner = THIS_MODULE, 224 .owner = THIS_MODULE,
225 }, 225 },
226 .remove = __devexit_p(mc13783_regulator_remove), 226 .remove = __devexit_p(mc13783_regulator_remove),
227 .probe = mc13783_regulator_probe,
227 }; 228 };
228 229
229 static int __init mc13783_regulator_init(void) 230 static int __init mc13783_regulator_init(void)
230 { 231 {
231 return platform_driver_probe(&mc13783_regulator_driver, 232 return platform_driver_register(&mc13783_regulator_driver);
232 mc13783_regulator_probe);
233 } 233 }
234 subsys_initcall(mc13783_regulator_init); 234 subsys_initcall(mc13783_regulator_init);
235 235
236 static void __exit mc13783_regulator_exit(void) 236 static void __exit mc13783_regulator_exit(void)
237 { 237 {
238 platform_driver_unregister(&mc13783_regulator_driver); 238 platform_driver_unregister(&mc13783_regulator_driver);
239 } 239 }
240 module_exit(mc13783_regulator_exit); 240 module_exit(mc13783_regulator_exit);
241 241
242 MODULE_LICENSE("GPL v2"); 242 MODULE_LICENSE("GPL v2");
243 MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de"); 243 MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de");
244 MODULE_DESCRIPTION("Regulator Driver for Freescale MC13783 PMIC"); 244 MODULE_DESCRIPTION("Regulator Driver for Freescale MC13783 PMIC");
245 MODULE_ALIAS("platform:mc13783-regulator"); 245 MODULE_ALIAS("platform:mc13783-regulator");