diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-22 10:47:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-22 10:47:29 -0700 |
| commit | 4f92f0e25a48212ae06e0761504ee0c9c23776ee (patch) | |
| tree | 547fb6a55a48c9180bbcf0fe6240ac27f855f3b1 | |
| parent | 8d829b9bb878904f3419af8003176a12910b94e8 (diff) | |
| parent | 9e69672e90ccff10dab6f0c9545226a886e5973c (diff) | |
| download | linux-4.12.y-4f92f0e25a48212ae06e0761504ee0c9c23776ee.tar.gz | |
Merge tag 'mfd-fixes-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD fixes from Lee Jones:
- arizona: use address passed in, rather than hard coded value
- correct STM32 clock-names value in DT binding documentation
* tag 'mfd-fixes-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
dt-bindings: mfd: Update STM32 timers clock names
mfd: arizona: Fix typo using hard-coded register
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/stm32-timers.txt | 2 | ||||
| -rw-r--r-- | drivers/mfd/arizona-core.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/mfd/stm32-timers.txt b/Documentation/devicetree/bindings/mfd/stm32-timers.txt index bbd083f5600a78..1db6e0057a638e 100644 --- a/Documentation/devicetree/bindings/mfd/stm32-timers.txt +++ b/Documentation/devicetree/bindings/mfd/stm32-timers.txt @@ -31,7 +31,7 @@ Example: compatible = "st,stm32-timers"; reg = <0x40010000 0x400>; clocks = <&rcc 0 160>; - clock-names = "clk_int"; + clock-names = "int"; pwm { compatible = "st,stm32-pwm"; diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 75488e65cd96cf..8d46e3ad9529d4 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -245,8 +245,7 @@ static int arizona_poll_reg(struct arizona *arizona, int ret; ret = regmap_read_poll_timeout(arizona->regmap, - ARIZONA_INTERRUPT_RAW_STATUS_5, val, - ((val & mask) == target), + reg, val, ((val & mask) == target), ARIZONA_REG_POLL_DELAY_US, timeout_ms * 1000); if (ret) |