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

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

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

Documentation/devicetree/bindings/mfd/stm32-timers.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

drivers/mfd/arizona-core.c

+1 −2
Original line number Diff line number Diff line
@@ -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)