[PATCH v2 10/15] ARM: highbank: convert to twd_local_timer_register() interface

On Fri, Jan 13, 2012 at 01:07:23PM -0600, Rob Herring wrote:

On 01/13/2012 12:28 PM, Marc Zyngier wrote:

quoted

Add support for the new smp_twd runtime registration interface
to the highbank platforms, and remove the old compile-time support.

The highbank DTS file is updated to match the TWD DT documentation.

Cc: Rob Herring <redacted>
Signed-off-by: Marc Zyngier <redacted>

A couple of minor things below. Otherwise,

Acked-by: Rob Herring <redacted>

quoted

---
 arch/arm/boot/dts/highbank.dts      |    4 +-
 arch/arm/mach-highbank/Makefile     |    1 -
 arch/arm/mach-highbank/highbank.c   |    5 ++++
 arch/arm/mach-highbank/localtimer.c |   40 -----------------------------------
 4 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 100644 arch/arm/mach-highbank/localtimer.c

diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts
index 305635b..661373a 100644
--- a/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts

@@ -72,13 +72,13 @@
 		ranges;
 
 		timer at fff10600 {
-			compatible = "arm,smp-twd";
+			compatible = "arm,cortex-a9-twd-timer";
 			reg = <0xfff10600 0x20>;
 			interrupts = <1 13 0xf04>;

Would you mind fixing these to be edge triggered.

This would just be an indication, since not only SGI but also PPI has
a read-only Interrupt Configuration Register.  So does the patch below
make sense?

diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index b2dc2dd..23a075f 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c

@@ -186,8 +186,8 @@ static int gic_set_type(struct irq_data *d, unsigned int type)
        bool enabled = false;
        u32 val;

-       /* Interrupt configuration for SGIs can't be changed */
-       if (gicirq < 16)
+       /* Interrupt configuration for SGIs and PPIs can't be changed */
+       if (gicirq < 32)
                return -EINVAL;

        if (type != IRQ_TYPE_LEVEL_HIGH && type != IRQ_TYPE_EDGE_RISING)

-- 
Regards,
Shawn