diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-11-04 10:01:20 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-11-04 10:01:20 -0800 |
| commit | 49bd04cb11e57c4cd4d2c00feca898537dd6db1f (patch) | |
| tree | 846c594b2b1d2f203c24ff32569b6c615822a5dc /arch/arm/boot/dts/rk3288.dtsi | |
| parent | 260409578ecbf7ce1725b85f9c082312bff808c0 (diff) | |
| parent | 12ba397b828b7e7f5d28a73e9a2ee14470b7edc7 (diff) | |
Merge tag 'v4.1.12-rt12' of git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel into v4.1/topic/rtv4.1/topic/rt
v4.1.12-rt12
Diffstat (limited to 'arch/arm/boot/dts/rk3288.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/rk3288.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 165968d51d8f..8eca5878a877 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -584,7 +584,7 @@ compatible = "rockchip,rk3288-wdt", "snps,dw-wdt"; reg = <0xff800000 0x100>; clocks = <&cru PCLK_WDT>; - interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; }; |