diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 15:00:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 15:00:31 +0200 |
| commit | 38d03be7cb343364a05cf9523c7e261a15495682 (patch) | |
| tree | c2cc86a114a1a7bd957a4f4926a71c680c5cddf8 /arch/arm/boot | |
| parent | c3a694ac3bbf91dcc3adb0ae4e37331131bc8a75 (diff) | |
| parent | 6d97d5aba08b26108f95dc9fb7bbe4d9436c769c (diff) | |
| download | linux-38d03be7cb343364a05cf9523c7e261a15495682.tar.gz linux-38d03be7cb343364a05cf9523c7e261a15495682.tar.bz2 linux-38d03be7cb343364a05cf9523c7e261a15495682.zip | |
Merge tag 'socfpga_dts_for_v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt
Pull "SoCFPGA DTS updates for v4.17" from Dinh Nguyen:
- Fix GIC PPI warning
- Stratix10 platform updates
- Disable over-current for Arria10 devkit
- Enable watchdog timer
* tag 'socfpga_dts_for_v4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
arm: dts: socfpga: fix GIC PPI warning
arm64: dts: stratix10: disable false USB overcurrent on devkit
arm64: dts: stratix10: enable watchdog timer on the S10 devkit
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/socfpga.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index c42ca7022e8c..486d4e7433ed 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -831,7 +831,7 @@ timer@fffec600 { compatible = "arm,cortex-a9-twd-timer"; reg = <0xfffec600 0x100>; - interrupts = <1 13 0xf04>; + interrupts = <1 13 0xf01>; clocks = <&mpu_periph_clk>; }; |