Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+6 -1
+1 -1
arch/arm/boot/dts/socfpga.dtsi
··· 831 831 timer@fffec600 { 832 832 compatible = "arm,cortex-a9-twd-timer"; 833 833 reg = <0xfffec600 0x100>; 834 - interrupts = <1 13 0xf04>; 834 + interrupts = <1 13 0xf01>; 835 835 clocks = <&mpu_periph_clk>; 836 836 }; 837 837
+5
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
··· 100 100 101 101 &usb0 { 102 102 status = "okay"; 103 + disable-over-current; 104 + }; 105 + 106 + &watchdog0 { 107 + status = "okay"; 103 108 };