From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liviu Dudau Subject: [PATCH v2] arm64: ARM: Fix the Generic Timers interrupt active level description Date: Thu, 27 Nov 2014 16:21:23 +0000 Message-ID: <1417105283-19575-1-git-send-email-Liviu.Dudau@arm.com> Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Arnd Bergmann , Marc Zyngier , Olof Johansson Cc: Mark Rutland , Rob Herring , Ian Campbell , Will Deacon , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org List-Id: devicetree@vger.kernel.org The Cortex-A5x TRM states in paragraph "9.2 Generic Timer functional description" that generic timers provide a level not edge interrupt output. Fix the device trees to correctly describe this. While doing this update the CPU mask to match the number of described CPUs as well as the DT bindings documentation for Generic Timers. Signed-off-by: Liviu Dudau --- Arnd, Olof: This is on top of linux-next/master as it patches Juno's as well as all the other ARM DTs. -- Documentation/devicetree/bindings/arm/arch_timer.txt | 8 ++++---- arch/arm64/boot/dts/arm/foundation-v8.dts | 8 ++++---- arch/arm64/boot/dts/arm/juno.dts | 8 ++++---- arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt index 37b2caf..6d2aa87 100644 --- a/Documentation/devicetree/bindings/arm/arch_timer.txt +++ b/Documentation/devicetree/bindings/arm/arch_timer.txt @@ -27,10 +27,10 @@ Example: timer { compatible = "arm,cortex-a15-timer", "arm,armv7-timer"; - interrupts = <1 13 0xf08>, - <1 14 0xf08>, - <1 11 0xf08>, - <1 10 0xf08>; + interrupts = <1 13 0xf04>, + <1 14 0xf04>, + <1 11 0xf04>, + <1 10 0xf04>; clock-frequency = <100000000>; }; diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dts b/arch/arm64/boot/dts/arm/foundation-v8.dts index 4a06090..8c0214e 100644 --- a/arch/arm64/boot/dts/arm/foundation-v8.dts +++ b/arch/arm64/boot/dts/arm/foundation-v8.dts @@ -78,10 +78,10 @@ timer { compatible = "arm,armv8-timer"; - interrupts = <1 13 0xff01>, - <1 14 0xff01>, - <1 11 0xff01>, - <1 10 0xff01>; + interrupts = <1 13 0xf04>, + <1 14 0xf04>, + <1 11 0xf04>, + <1 10 0xf04>; clock-frequency = <100000000>; }; diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts index 097ecc4..551a688 100644 --- a/arch/arm64/boot/dts/arm/juno.dts +++ b/arch/arm64/boot/dts/arm/juno.dts @@ -98,10 +98,10 @@ timer { compatible = "arm,armv8-timer"; - interrupts = , - , - , - ; + interrupts = , + , + , + ; }; pmu { diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts index 572005e..49d1b19 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts +++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts @@ -81,10 +81,10 @@ timer { compatible = "arm,armv8-timer"; - interrupts = <1 13 0xff01>, - <1 14 0xff01>, - <1 11 0xff01>, - <1 10 0xff01>; + interrupts = <1 13 0xf04>, + <1 14 0xf04>, + <1 11 0xf04>, + <1 10 0xf04>; clock-frequency = <100000000>; }; -- 2.1.3