Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / r8a7740.dtsi

diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 83c1c3c..d847144 100644 (file)
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -67,7 +67,7 @@
        };
 
        /* irqpin0: IRQ0 - IRQ7 */
-       irqpin0: irqpin@e6900000 {
+       irqpin0: interrupt-controller@e6900000 {
                compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
                #interrupt-cells = <2>;
                interrupt-controller;
@@ -89,7 +89,7 @@
        };
 
        /* irqpin1: IRQ8 - IRQ15 */
-       irqpin1: irqpin@e6900004 {
+       irqpin1: interrupt-controller@e6900004 {
                compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
                #interrupt-cells = <2>;
                interrupt-controller;
@@ -111,7 +111,7 @@
        };
 
        /* irqpin2: IRQ16 - IRQ23 */
-       irqpin2: irqpin@e6900008 {
+       irqpin2: interrupt-controller@e6900008 {
                compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
                #interrupt-cells = <2>;
                interrupt-controller;
@@ -133,7 +133,7 @@
        };
 
        /* irqpin3: IRQ24 - IRQ31 */
-       irqpin3: irqpin@e690000c {
+       irqpin3: interrupt-controller@e690000c {
                compatible = "renesas,intc-irqpin-r8a7740", "renesas,intc-irqpin";
                #interrupt-cells = <2>;
                interrupt-controller;
@@ -275,7 +275,7 @@
                status = "disabled";
        };
 
-       scifb8: serial@e6c30000 {
+       scifb: serial@e6c30000 {
                compatible = "renesas,scifb-r8a7740", "renesas,scifb";
                reg = <0xe6c30000 0x100>;
                interrupts = <0 108 IRQ_TYPE_LEVEL_HIGH>;