Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93009286 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: Do proper shift to set correct bit for DC[2|5]_HIB_MODE setting 



DC[2|5]_HIB_MODE is BIT 12 of DCDC[2|5] Control register.
WM8350_DC2_HIB_MODE_ACTIVE/WM8350_DC2_HIB_MODE_DISABLE are defined as 1/0.
Thus we need to left shift WM8350_DC2_HIB_MODE_SHIFT bits.

Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent eb416815

drivers/regulator/wm8350-regulator.c

+6 −6
Original line number Diff line number Diff line
@@ -575,13 +575,13 @@ static int wm8350_dcdc25_set_suspend_enable(struct regulator_dev *rdev) 
		val = wm8350_reg_read(wm8350, WM8350_DCDC2_CONTROL)

		    & ~WM8350_DC2_HIB_MODE_MASK;

		wm8350_reg_write(wm8350, WM8350_DCDC2_CONTROL, val |

				 WM8350_DC2_HIB_MODE_ACTIVE);

		    (WM8350_DC2_HIB_MODE_ACTIVE << WM8350_DC2_HIB_MODE_SHIFT));

		break;

	case WM8350_DCDC_5:

		val = wm8350_reg_read(wm8350, WM8350_DCDC5_CONTROL)

		    & ~WM8350_DC2_HIB_MODE_MASK;

		    & ~WM8350_DC5_HIB_MODE_MASK;

		wm8350_reg_write(wm8350, WM8350_DCDC5_CONTROL, val |

				 WM8350_DC5_HIB_MODE_ACTIVE);

		    (WM8350_DC5_HIB_MODE_ACTIVE << WM8350_DC5_HIB_MODE_SHIFT));

		break;

	default:

		return -EINVAL;
@@ -600,13 +600,13 @@ static int wm8350_dcdc25_set_suspend_disable(struct regulator_dev *rdev) 
		val = wm8350_reg_read(wm8350, WM8350_DCDC2_CONTROL)

		    & ~WM8350_DC2_HIB_MODE_MASK;

		wm8350_reg_write(wm8350, WM8350_DCDC2_CONTROL, val |

				 WM8350_DC2_HIB_MODE_DISABLE);

		    (WM8350_DC2_HIB_MODE_DISABLE << WM8350_DC2_HIB_MODE_SHIFT));

		break;

	case WM8350_DCDC_5:

		val = wm8350_reg_read(wm8350, WM8350_DCDC5_CONTROL)

		    & ~WM8350_DC2_HIB_MODE_MASK;

		    & ~WM8350_DC5_HIB_MODE_MASK;

		wm8350_reg_write(wm8350, WM8350_DCDC5_CONTROL, val |

				 WM8350_DC2_HIB_MODE_DISABLE);

		    (WM8350_DC5_HIB_MODE_DISABLE << WM8350_DC5_HIB_MODE_SHIFT));

		break;

	default:

		return -EINVAL;