Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'regulator-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"Fixes for the merge window
A set of small fixes for issues noticed during the merge window, all
very much non-invasive"
* tag 'regulator-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
MAINTAINERS: Update git repository
regulator: max8997: Fix a trivial typo in documentation
regulator: s5m8767: Fix a trivial typo in documentation
regulator: s2mps11: Convert ramp rate to uV/us and set default ramp rate
regulator: s5m8767: Update s5m8767-regulator bindings document
+16
-10
+1
-1
Documentation/devicetree/bindings/regulator/max8997-regulator.txt
+1
-1
Documentation/devicetree/bindings/regulator/max8997-regulator.txt
···
1
1
* Maxim MAX8997 Voltage and Current Regulator
2
2
3
-
The Maxim MAX8997 is a multi-function device which includes volatage and
3
+
The Maxim MAX8997 is a multi-function device which includes voltage and
4
4
current regulators, rtc, charger controller and other sub-blocks. It is
5
5
interfaced to the host controller using a i2c interface. Each sub-block is
6
6
addressed by the host system using different i2c slave address. This document
+7
-7
Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
+7
-7
Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
···
1
1
* Samsung S5M8767 Voltage and Current Regulator
2
2
3
-
The Samsung S5M8767 is a multi-function device which includes volatage and
3
+
The Samsung S5M8767 is a multi-function device which includes voltage and
4
4
current regulators, rtc, charger controller and other sub-blocks. It is
5
5
interfaced to the host controller using a i2c interface. Each sub-block is
6
6
addressed by the host system using different i2c slave address. This document
···
103
103
104
104
s5m8767,pmic-buck-default-dvs-idx = <0>;
105
105
106
-
s5m8767,pmic-buck-dvs-gpios = <&gpx0 0 1 0 0>, /* DVS1 */
107
-
<&gpx0 1 1 0 0>, /* DVS2 */
108
-
<&gpx0 2 1 0 0>; /* DVS3 */
106
+
s5m8767,pmic-buck-dvs-gpios = <&gpx0 0 0>, /* DVS1 */
107
+
<&gpx0 1 0>, /* DVS2 */
108
+
<&gpx0 2 0>; /* DVS3 */
109
109
110
-
s5m8767,pmic-buck-ds-gpios = <&gpx2 3 1 0 0>, /* SET1 */
111
-
<&gpx2 4 1 0 0>, /* SET2 */
112
-
<&gpx2 5 1 0 0>; /* SET3 */
110
+
s5m8767,pmic-buck-ds-gpios = <&gpx2 3 0>, /* SET1 */
111
+
<&gpx2 4 0>, /* SET2 */
112
+
<&gpx2 5 0>; /* SET3 */
113
113
114
114
s5m8767,pmic-buck2-dvs-voltage = <1350000>, <1300000>,
115
115
<1250000>, <1200000>,
+1
-1
MAINTAINERS
+1
-1
MAINTAINERS
···
8976
8976
M: Mark Brown <broonie@kernel.org>
8977
8977
W: http://opensource.wolfsonmicro.com/node/15
8978
8978
W: http://www.slimlogic.co.uk/?p=48
8979
-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git
8979
+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
8980
8980
S: Supported
8981
8981
F: drivers/regulator/
8982
8982
F: include/linux/regulator/
+6
-1
drivers/regulator/s2mps11.c
+6
-1
drivers/regulator/s2mps11.c
···
42
42
{
43
43
unsigned char cnt = 0;
44
44
45
-
ramp_delay /= 6;
45
+
ramp_delay /= 6250;
46
46
47
47
while (true) {
48
48
ramp_delay = ramp_delay >> 1;
···
113
113
.min_uV = S2MPS11_BUCK_MIN1, \
114
114
.uV_step = S2MPS11_BUCK_STEP1, \
115
115
.n_voltages = S2MPS11_BUCK_N_VOLTAGES, \
116
+
.ramp_delay = S2MPS11_RAMP_DELAY, \
116
117
.vsel_reg = S2MPS11_REG_B1CTRL2 + (num - 1) * 2, \
117
118
.vsel_mask = S2MPS11_BUCK_VSEL_MASK, \
118
119
.enable_reg = S2MPS11_REG_B1CTRL1 + (num - 1) * 2, \
···
129
128
.min_uV = S2MPS11_BUCK_MIN1, \
130
129
.uV_step = S2MPS11_BUCK_STEP1, \
131
130
.n_voltages = S2MPS11_BUCK_N_VOLTAGES, \
131
+
.ramp_delay = S2MPS11_RAMP_DELAY, \
132
132
.vsel_reg = S2MPS11_REG_B5CTRL2, \
133
133
.vsel_mask = S2MPS11_BUCK_VSEL_MASK, \
134
134
.enable_reg = S2MPS11_REG_B5CTRL1, \
···
145
143
.min_uV = S2MPS11_BUCK_MIN1, \
146
144
.uV_step = S2MPS11_BUCK_STEP1, \
147
145
.n_voltages = S2MPS11_BUCK_N_VOLTAGES, \
146
+
.ramp_delay = S2MPS11_RAMP_DELAY, \
148
147
.vsel_reg = S2MPS11_REG_B6CTRL2 + (num - 6) * 2, \
149
148
.vsel_mask = S2MPS11_BUCK_VSEL_MASK, \
150
149
.enable_reg = S2MPS11_REG_B6CTRL1 + (num - 6) * 2, \
···
161
158
.min_uV = S2MPS11_BUCK_MIN3, \
162
159
.uV_step = S2MPS11_BUCK_STEP3, \
163
160
.n_voltages = S2MPS11_BUCK_N_VOLTAGES, \
161
+
.ramp_delay = S2MPS11_RAMP_DELAY, \
164
162
.vsel_reg = S2MPS11_REG_B9CTRL2, \
165
163
.vsel_mask = S2MPS11_BUCK_VSEL_MASK, \
166
164
.enable_reg = S2MPS11_REG_B9CTRL1, \
···
177
173
.min_uV = S2MPS11_BUCK_MIN2, \
178
174
.uV_step = S2MPS11_BUCK_STEP2, \
179
175
.n_voltages = S2MPS11_BUCK_N_VOLTAGES, \
176
+
.ramp_delay = S2MPS11_RAMP_DELAY, \
180
177
.vsel_reg = S2MPS11_REG_B10CTRL2, \
181
178
.vsel_mask = S2MPS11_BUCK_VSEL_MASK, \
182
179
.enable_reg = S2MPS11_REG_B10CTRL1, \
+1
include/linux/mfd/samsung/s2mps11.h
+1
include/linux/mfd/samsung/s2mps11.h
···
189
189
#define S2MPS11_ENABLE_SHIFT 0x06
190
190
#define S2MPS11_LDO_N_VOLTAGES (S2MPS11_LDO_VSEL_MASK + 1)
191
191
#define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1)
192
+
#define S2MPS11_RAMP_DELAY 25000 /* uV/us */
192
193
193
194
#define S2MPS11_PMIC_EN_SHIFT 6
194
195
#define S2MPS11_REGULATOR_MAX (S2MPS11_REG_MAX - 3)