tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'regulator-5.2' into regulator-linus

Mark Brown f0386617 6fbc7275

+22 -11
+18 -10
drivers/regulator/s2mps11.c
··· 269 269 .ops = &s2mps11_buck_ops, \ 270 270 .type = REGULATOR_VOLTAGE, \ 271 271 .owner = THIS_MODULE, \ 272 - .min_uV = MIN_600_MV, \ 272 + .min_uV = MIN_650_MV, \ 273 273 .uV_step = STEP_6_25_MV, \ 274 - .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ 274 + .linear_min_sel = 8, \ 275 + .n_voltages = S2MPS11_BUCK12346_N_VOLTAGES, \ 275 276 .ramp_delay = S2MPS11_RAMP_DELAY, \ 276 277 .vsel_reg = S2MPS11_REG_B1CTRL2 + (num - 1) * 2, \ 277 278 .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ ··· 286 285 .ops = &s2mps11_buck_ops, \ 287 286 .type = REGULATOR_VOLTAGE, \ 288 287 .owner = THIS_MODULE, \ 289 - .min_uV = MIN_600_MV, \ 288 + .min_uV = MIN_650_MV, \ 290 289 .uV_step = STEP_6_25_MV, \ 291 - .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ 290 + .linear_min_sel = 8, \ 291 + .n_voltages = S2MPS11_BUCK5_N_VOLTAGES, \ 292 292 .ramp_delay = S2MPS11_RAMP_DELAY, \ 293 293 .vsel_reg = S2MPS11_REG_B5CTRL2, \ 294 294 .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ ··· 297 295 .enable_mask = S2MPS11_ENABLE_MASK \ 298 296 } 299 297 300 - #define regulator_desc_s2mps11_buck67810(num, min, step) { \ 298 + #define regulator_desc_s2mps11_buck67810(num, min, step, min_sel, voltages) { \ 301 299 .name = "BUCK"#num, \ 302 300 .id = S2MPS11_BUCK##num, \ 303 301 .ops = &s2mps11_buck_ops, \ ··· 305 303 .owner = THIS_MODULE, \ 306 304 .min_uV = min, \ 307 305 .uV_step = step, \ 308 - .n_voltages = S2MPS11_BUCK_N_VOLTAGES, \ 306 + .linear_min_sel = min_sel, \ 307 + .n_voltages = voltages, \ 309 308 .ramp_delay = S2MPS11_RAMP_DELAY, \ 310 309 .vsel_reg = S2MPS11_REG_B6CTRL2 + (num - 6) * 2, \ 311 310 .vsel_mask = S2MPS11_BUCK_VSEL_MASK, \ ··· 374 371 regulator_desc_s2mps11_buck1_4(3), 375 372 regulator_desc_s2mps11_buck1_4(4), 376 373 regulator_desc_s2mps11_buck5, 377 - regulator_desc_s2mps11_buck67810(6, MIN_600_MV, STEP_6_25_MV), 378 - regulator_desc_s2mps11_buck67810(7, MIN_600_MV, STEP_12_5_MV), 379 - regulator_desc_s2mps11_buck67810(8, MIN_600_MV, STEP_12_5_MV), 374 + regulator_desc_s2mps11_buck67810(6, MIN_650_MV, STEP_6_25_MV, 8, 375 + S2MPS11_BUCK12346_N_VOLTAGES), 376 + regulator_desc_s2mps11_buck67810(7, MIN_750_MV, STEP_12_5_MV, 0, 377 + S2MPS11_BUCK7810_N_VOLTAGES), 378 + regulator_desc_s2mps11_buck67810(8, MIN_750_MV, STEP_12_5_MV, 0, 379 + S2MPS11_BUCK7810_N_VOLTAGES), 380 380 regulator_desc_s2mps11_buck9, 381 - regulator_desc_s2mps11_buck67810(10, MIN_750_MV, STEP_12_5_MV), 381 + regulator_desc_s2mps11_buck67810(10, MIN_750_MV, STEP_12_5_MV, 0, 382 + S2MPS11_BUCK7810_N_VOLTAGES), 382 383 }; 383 384 384 385 static const struct regulator_ops s2mps14_reg_ops; ··· 831 824 if (IS_ERR(gpio[reg])) { 832 825 dev_err(&pdev->dev, "Failed to get control GPIO for %d/%s\n", 833 826 reg, rdata[reg].name); 827 + gpio[reg] = NULL; 834 828 continue; 835 829 } 836 830 if (gpio[reg])
+1
include/linux/mfd/samsung/core.h
··· 20 20 #define MIN_850_MV 850000 21 21 #define MIN_800_MV 800000 22 22 #define MIN_750_MV 750000 23 + #define MIN_650_MV 650000 23 24 #define MIN_600_MV 600000 24 25 #define MIN_500_MV 500000 25 26
+3 -1
include/linux/mfd/samsung/s2mps11.h
··· 170 170 #define S2MPS11_ENABLE_MASK (0x03 << S2MPS11_ENABLE_SHIFT) 171 171 #define S2MPS11_ENABLE_SHIFT 0x06 172 172 #define S2MPS11_LDO_N_VOLTAGES (S2MPS11_LDO_VSEL_MASK + 1) 173 - #define S2MPS11_BUCK_N_VOLTAGES (S2MPS11_BUCK_VSEL_MASK + 1) 173 + #define S2MPS11_BUCK12346_N_VOLTAGES 153 174 + #define S2MPS11_BUCK5_N_VOLTAGES 216 175 + #define S2MPS11_BUCK7810_N_VOLTAGES 225 174 176 #define S2MPS11_BUCK9_N_VOLTAGES (S2MPS11_BUCK9_VSEL_MASK + 1) 175 177 #define S2MPS11_RAMP_DELAY 25000 /* uV/us */ 176 178