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

mfd: Correct WM835x ISINK ramp time defines

The constants used to specify ISINK ramp times for WM835x had the
wrong shifts so that the on times applied to the off ramp and vice
versa. The masks for the bitfields are correct.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

authored by

Mark Brown and committed by
Samuel Ortiz
9dffe2a3 7dc9c484

+14 -14
+14 -14
include/linux/mfd/wm8350/pmic.h
··· 666 666 #define WM8350_ISINK_FLASH_DUR_64MS (1 << 8) 667 667 #define WM8350_ISINK_FLASH_DUR_96MS (2 << 8) 668 668 #define WM8350_ISINK_FLASH_DUR_1024MS (3 << 8) 669 - #define WM8350_ISINK_FLASH_ON_INSTANT (0 << 4) 670 - #define WM8350_ISINK_FLASH_ON_0_25S (1 << 4) 671 - #define WM8350_ISINK_FLASH_ON_0_50S (2 << 4) 672 - #define WM8350_ISINK_FLASH_ON_1_00S (3 << 4) 673 - #define WM8350_ISINK_FLASH_ON_1_95S (1 << 4) 674 - #define WM8350_ISINK_FLASH_ON_3_91S (2 << 4) 675 - #define WM8350_ISINK_FLASH_ON_7_80S (3 << 4) 676 - #define WM8350_ISINK_FLASH_OFF_INSTANT (0 << 0) 677 - #define WM8350_ISINK_FLASH_OFF_0_25S (1 << 0) 678 - #define WM8350_ISINK_FLASH_OFF_0_50S (2 << 0) 679 - #define WM8350_ISINK_FLASH_OFF_1_00S (3 << 0) 680 - #define WM8350_ISINK_FLASH_OFF_1_95S (1 << 0) 681 - #define WM8350_ISINK_FLASH_OFF_3_91S (2 << 0) 682 - #define WM8350_ISINK_FLASH_OFF_7_80S (3 << 0) 669 + #define WM8350_ISINK_FLASH_ON_INSTANT (0 << 0) 670 + #define WM8350_ISINK_FLASH_ON_0_25S (1 << 0) 671 + #define WM8350_ISINK_FLASH_ON_0_50S (2 << 0) 672 + #define WM8350_ISINK_FLASH_ON_1_00S (3 << 0) 673 + #define WM8350_ISINK_FLASH_ON_1_95S (1 << 0) 674 + #define WM8350_ISINK_FLASH_ON_3_91S (2 << 0) 675 + #define WM8350_ISINK_FLASH_ON_7_80S (3 << 0) 676 + #define WM8350_ISINK_FLASH_OFF_INSTANT (0 << 4) 677 + #define WM8350_ISINK_FLASH_OFF_0_25S (1 << 4) 678 + #define WM8350_ISINK_FLASH_OFF_0_50S (2 << 4) 679 + #define WM8350_ISINK_FLASH_OFF_1_00S (3 << 4) 680 + #define WM8350_ISINK_FLASH_OFF_1_95S (1 << 4) 681 + #define WM8350_ISINK_FLASH_OFF_3_91S (2 << 4) 682 + #define WM8350_ISINK_FLASH_OFF_7_80S (3 << 4) 683 683 684 684 /* 685 685 * Regulator Interrupts.