Commit 38d03be7 authored Mar 27, 2018 by Arnd Bergmann

Merge tag 'socfpga_dts_for_v4.17' of...

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

parents c3a694ac 6d97d5ab

arch/arm/boot/dts/socfpga.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>;
		};

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

+5 −0

Original line number	Diff line number	Diff line
		@@ -100,4 +100,9 @@

		&usb0 {
		status = "okay";
		disable-over-current;
		};

		&watchdog0 {
		status = "okay";
		};