Merge branch 'sti-dt-for-v4.11-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt

* 'sti-dt-for-v4.11-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: dts: STiH407-family: Add missing pwm irq

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-01-29 21:01:23 -08:00
commit b7441582a3

View File

@ -688,6 +688,7 @@
compatible = "st,sti-pwm";
#pwm-cells = <2>;
reg = <0x9510000 0x68>;
interrupts = <GIC_SPI 131 IRQ_TYPE_NONE>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm1_chan0_default
&pinctrl_pwm1_chan1_default