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

regulator: Only update [LDOx|DCx]_HIB_MODE bits in wm8350_[ldo|dcdc]_set_suspend_disable

What we want is to disable output by setting [LDOx|DCx]_HIB_MODE bits.
Current code also clears other bits in LDOx/DCDCx Low Power register.

R202 (CAh) LDO1 Low Power
BIT[13:12] LDO1 Hibernate behaviour:
00 = Select voltage image settings
01 = disable output
10 = reserved
11 = reserved

R182 (B6h) DCDC1 Low Power
BIT[14:12] DC-DC1 Hibernate behaviour:
000 = Use current settings (no change)
001 = Select voltage image settings
010 = Force standby mode
011 = Force standby mode and voltage image settings.
100 = Force LDO mode
101 = Force LDO mode and voltage image settings.
110 = Reserved.
111 = Disable output

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Axel Lin and committed by
Mark Brown
cee1a799 e841a36a

+5 -5
+5 -5
drivers/regulator/wm8350-regulator.c
··· 535 535 val = wm8350_reg_read(wm8350, WM8350_DCDC1_LOW_POWER); 536 536 wm8350->pmic.dcdc1_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK; 537 537 wm8350_reg_write(wm8350, WM8350_DCDC1_LOW_POWER, 538 - WM8350_DCDC_HIB_MODE_DIS); 538 + val | WM8350_DCDC_HIB_MODE_DIS); 539 539 break; 540 540 case WM8350_DCDC_3: 541 541 val = wm8350_reg_read(wm8350, WM8350_DCDC3_LOW_POWER); 542 542 wm8350->pmic.dcdc3_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK; 543 543 wm8350_reg_write(wm8350, WM8350_DCDC3_LOW_POWER, 544 - WM8350_DCDC_HIB_MODE_DIS); 544 + val | WM8350_DCDC_HIB_MODE_DIS); 545 545 break; 546 546 case WM8350_DCDC_4: 547 547 val = wm8350_reg_read(wm8350, WM8350_DCDC4_LOW_POWER); 548 548 wm8350->pmic.dcdc4_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK; 549 549 wm8350_reg_write(wm8350, WM8350_DCDC4_LOW_POWER, 550 - WM8350_DCDC_HIB_MODE_DIS); 550 + val | WM8350_DCDC_HIB_MODE_DIS); 551 551 break; 552 552 case WM8350_DCDC_6: 553 553 val = wm8350_reg_read(wm8350, WM8350_DCDC6_LOW_POWER); 554 554 wm8350->pmic.dcdc6_hib_mode = val & WM8350_DCDC_HIB_MODE_MASK; 555 555 wm8350_reg_write(wm8350, WM8350_DCDC6_LOW_POWER, 556 - WM8350_DCDC_HIB_MODE_DIS); 556 + val | WM8350_DCDC_HIB_MODE_DIS); 557 557 break; 558 558 case WM8350_DCDC_2: 559 559 case WM8350_DCDC_5: ··· 749 749 750 750 /* all LDOs have same mV bits */ 751 751 val = wm8350_reg_read(wm8350, volt_reg) & ~WM8350_LDO1_HIB_MODE_MASK; 752 - wm8350_reg_write(wm8350, volt_reg, WM8350_LDO1_HIB_MODE_DIS); 752 + wm8350_reg_write(wm8350, volt_reg, val | WM8350_LDO1_HIB_MODE_DIS); 753 753 return 0; 754 754 } 755 755