Commit 4f92f0e2 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 8d829b9b 9e69672e
...@@ -31,7 +31,7 @@ Example: ...@@ -31,7 +31,7 @@ Example:
compatible = "st,stm32-timers"; compatible = "st,stm32-timers";
reg = <0x40010000 0x400>; reg = <0x40010000 0x400>;
clocks = <&rcc 0 160>; clocks = <&rcc 0 160>;
clock-names = "clk_int"; clock-names = "int";
pwm { pwm {
compatible = "st,stm32-pwm"; compatible = "st,stm32-pwm";
......
...@@ -245,8 +245,7 @@ static int arizona_poll_reg(struct arizona *arizona, ...@@ -245,8 +245,7 @@ static int arizona_poll_reg(struct arizona *arizona,
int ret; int ret;
ret = regmap_read_poll_timeout(arizona->regmap, ret = regmap_read_poll_timeout(arizona->regmap,
ARIZONA_INTERRUPT_RAW_STATUS_5, val, reg, val, ((val & mask) == target),
((val & mask) == target),
ARIZONA_REG_POLL_DELAY_US, ARIZONA_REG_POLL_DELAY_US,
timeout_ms * 1000); timeout_ms * 1000);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment