| From f8ed394e9078e30588639bb79d17be03e98a95e2 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Thu, 28 Nov 2013 08:15:04 +0900 |
| Subject: ARM: shmobile: Use r8a7740 suffix for INTC compat string |
| |
| Add "renesas,intc-irqpin-r8a7740" to the compatible string for the |
| IRQ pins in case of r8a7740 INTC. This makes the INTC irqpin follow |
| the same style as the other devices and also makes it more future proof. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 96327999805dfb5b6e91e6969311d9a77a0160cd) |
| (Queued by ARM-SoC for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7740.dtsi | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi |
| index 52255bf1e867..2782f642acfc 100644 |
| --- a/arch/arm/boot/dts/r8a7740.dtsi |
| +++ b/arch/arm/boot/dts/r8a7740.dtsi |
| @@ -41,7 +41,7 @@ |
| |
| /* irqpin0: IRQ0 - IRQ7 */ |
| irqpin0: irqpin@e6900000 { |
| - compatible = "renesas,intc-irqpin"; |
| + compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin"; |
| #interrupt-cells = <2>; |
| interrupt-controller; |
| reg = <0xe6900000 4>, |
| @@ -62,7 +62,7 @@ |
| |
| /* irqpin1: IRQ8 - IRQ15 */ |
| irqpin1: irqpin@e6900004 { |
| - compatible = "renesas,intc-irqpin"; |
| + compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin"; |
| #interrupt-cells = <2>; |
| interrupt-controller; |
| reg = <0xe6900004 4>, |
| @@ -83,7 +83,7 @@ |
| |
| /* irqpin2: IRQ16 - IRQ23 */ |
| irqpin2: irqpin@e6900008 { |
| - compatible = "renesas,intc-irqpin"; |
| + compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin"; |
| #interrupt-cells = <2>; |
| interrupt-controller; |
| reg = <0xe6900008 4>, |
| @@ -104,7 +104,7 @@ |
| |
| /* irqpin3: IRQ24 - IRQ31 */ |
| irqpin3: irqpin@e690000c { |
| - compatible = "renesas,intc-irqpin"; |
| + compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin"; |
| #interrupt-cells = <2>; |
| interrupt-controller; |
| reg = <0xe690000c 4>, |
| -- |
| 1.8.5.rc3 |
| |
