Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f7246b2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'vexpress/fixes-for-3.9' of... 

Merge tag 'vexpress/fixes-for-3.9' of git://git.linaro.org/people/pawelmoll/linux into next/fixes-non-critical

From Pawel Moll:
Versatile Express related fixes for 3.9
* Correct interrupt definitions for WDT node in
  V2P-CA15 and V2P-CA15_A7 Device Trees

* tag 'vexpress/fixes-for-3.9' of git://git.linaro.org/people/pawelmoll/linux

:
  ARM: vexpress: Fix wdt interrupt in ca15{-tc1,_a7} dts

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c51cdd9b aab7da70

arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
		compatible = "arm,sp805", "arm,primecell";

		status = "disabled";

		reg = <0 0x2b060000 0 0x1000>;

		interrupts = <98>;

		interrupts = <0 98 4>;

		clocks = <&oscclk7>;

		clock-names = "apb_pclk";

	};

arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
	wdt@2a490000 {

		compatible = "arm,sp805", "arm,primecell";

		reg = <0 0x2a490000 0 0x1000>;

		interrupts = <98>;

		interrupts = <0 98 4>;

		clocks = <&oscclk6a>, <&oscclk6a>;

		clock-names = "wdogclk", "apb_pclk";

	};