| @@ -36,13 +36,12 @@ static const struct regulator_ops wm8400_ldo_ops = { · 35 unmodified lines |
| 36 | 36 | |
| 37 | 37 | static unsigned int wm8400_dcdc_get_mode(struct regulator_dev *dev) |
| 38 | 38 | { |
| 39 | | − struct wm8400 *wm8400 = rdev_get_drvdata(dev); |
| 39 | + struct regmap *rmap = rdev_get_regmap(dev); |
| 40 | 40 | int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2; |
| 41 | 41 | u16 data[2]; |
| 42 | 42 | int ret; |
| 43 | 43 | |
| 44 | | − ret = wm8400_block_read(wm8400, WM8400_DCDC1_CONTROL_1 + offset, 2, |
| 45 | | − data); |
| 44 | + ret = regmap_bulk_read(rmap, WM8400_DCDC1_CONTROL_1 + offset, data, 2); |
| 46 | 45 | if (ret != 0) |
| 47 | 46 | return 0; |
| 48 | 47 | |
| @@ -63,36 +62,36 @@ static unsigned int wm8400_dcdc_get_mode(struct regulator_dev *dev) · 14 unmodified lines |
| 63 | 62 | |
| 64 | 63 | static int wm8400_dcdc_set_mode(struct regulator_dev *dev, unsigned int mode) |
| 65 | 64 | { |
| 66 | | − struct wm8400 *wm8400 = rdev_get_drvdata(dev); |
| 65 | + struct regmap *rmap = rdev_get_regmap(dev); |
| 67 | 66 | int offset = (rdev_get_id(dev) - WM8400_DCDC1) * 2; |
| 68 | 67 | int ret; |
| 69 | 68 | |
| 70 | 69 | switch (mode) { |
| 71 | 70 | case REGULATOR_MODE_FAST: |
| 72 | 71 | /* Datasheet: active with force PWM */ |
| 73 | | − ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_2 + offset, |
| 72 | + ret = regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_2 + offset, |
| 74 | 73 | WM8400_DC1_FRC_PWM, WM8400_DC1_FRC_PWM); |
| 75 | 74 | if (ret != 0) |
| 76 | 75 | return ret; |
| 77 | 76 | |
| 78 | | − return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset, |
| 77 | + return regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_1 + offset, |
| 79 | 78 | WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP, |
| 80 | 79 | WM8400_DC1_ACTIVE); |
| 81 | 80 | |
| 82 | 81 | case REGULATOR_MODE_NORMAL: |
| 83 | 82 | /* Datasheet: active */ |
| 84 | | − ret = wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_2 + offset, |
| 83 | + ret = regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_2 + offset, |
| 85 | 84 | WM8400_DC1_FRC_PWM, 0); |
| 86 | 85 | if (ret != 0) |
| 87 | 86 | return ret; |
| 88 | 87 | |
| 89 | | − return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset, |
| 88 | + return regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_1 + offset, |
| 90 | 89 | WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP, |
| 91 | 90 | WM8400_DC1_ACTIVE); |
| 92 | 91 | |
| 93 | 92 | case REGULATOR_MODE_IDLE: |
| 94 | 93 | /* Datasheet: standby */ |
| 95 | | − return wm8400_set_bits(wm8400, WM8400_DCDC1_CONTROL_1 + offset, |
| 94 | + return regmap_update_bits(rmap, WM8400_DCDC1_CONTROL_1 + offset, |
| 96 | 95 | WM8400_DC1_ACTIVE | WM8400_DC1_SLEEP, 0); |
| 97 | 96 | default: |
| 98 | 97 | return -EINVAL; |