diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-30 08:01:23 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-30 08:01:23 +0300 |
| commit | b7441582a3692a4002577021b2490a4cc9d8645a (patch) | |
| tree | 78d21a2bc28aa77e6f3a9aa805498bf91b9622bf | |
| parent | 2dcfbf13f460b445e34233eefabe010749b1e318 (diff) | |
| parent | c58736c160c1346bedda77d739f0f85710fa00cf (diff) | |
| download | linux-b7441582a3692a4002577021b2490a4cc9d8645a.tar.xz | |
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>
| -rw-r--r-- | arch/arm/boot/dts/stih407-family.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index 508895f3ef09..d771f006e1ed 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -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 |