diff mbox

MIPS: devicetree: fix cpu interrupt controller node-names

Message ID 1464003540-13009-1-git-send-email-antonynpavlov@gmail.com
State Not Applicable, archived
Headers show

Commit Message

Antony Pavlov May 23, 2016, 11:39 a.m. UTC
Here is the quote from [1]:

    The unit-address must match the first address specified
    in the reg property of the node. If the node has no reg property,
    the @ and unit-address must be omitted and the node-name alone
    differentiates the node from other nodes at the same level

This patch adjusts MIPS dts-files and devicetree binding
documentation in accordance with [1].

    [1] Power.org(tm) Standard for Embedded Power Architecture(tm)
        Platform Requirements (ePAPR). Version 1.1 – 08 April 2011.
        Chapter 2.2.1.1 Node Name Requirements

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 Documentation/devicetree/bindings/mips/cpu_irq.txt | 2 +-
 arch/mips/boot/dts/ingenic/jz4740.dtsi             | 2 +-
 arch/mips/boot/dts/ralink/mt7620a.dtsi             | 2 +-
 arch/mips/boot/dts/ralink/rt2880.dtsi              | 2 +-
 arch/mips/boot/dts/ralink/rt3050.dtsi              | 2 +-
 arch/mips/boot/dts/ralink/rt3883.dtsi              | 2 +-
 arch/mips/boot/dts/xilfpga/nexys4ddr.dts           | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

Comments

Rob Herring May 23, 2016, 3:47 p.m. UTC | #1
On Mon, May 23, 2016 at 6:39 AM, Antony Pavlov <antonynpavlov@gmail.com> wrote:
> Here is the quote from [1]:
>
>     The unit-address must match the first address specified
>     in the reg property of the node. If the node has no reg property,
>     the @ and unit-address must be omitted and the node-name alone
>     differentiates the node from other nodes at the same level
>
> This patch adjusts MIPS dts-files and devicetree binding
> documentation in accordance with [1].
>
>     [1] Power.org(tm) Standard for Embedded Power Architecture(tm)
>         Platform Requirements (ePAPR). Version 1.1 – 08 April 2011.
>         Chapter 2.2.1.1 Node Name Requirements

FYI, you can reference "the Devicetree Spec" now: devicetree.org

Acked-by: Rob Herring <robh@kernel.org>

> Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Paul Burton <paul.burton@imgtec.com>
> Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Pawel Moll <pawel.moll@arm.com>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
> Cc: Kumar Gala <galak@codeaurora.org>
> Cc: linux-mips@linux-mips.org
> Cc: devicetree@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> ---
>  Documentation/devicetree/bindings/mips/cpu_irq.txt | 2 +-
>  arch/mips/boot/dts/ingenic/jz4740.dtsi             | 2 +-
>  arch/mips/boot/dts/ralink/mt7620a.dtsi             | 2 +-
>  arch/mips/boot/dts/ralink/rt2880.dtsi              | 2 +-
>  arch/mips/boot/dts/ralink/rt3050.dtsi              | 2 +-
>  arch/mips/boot/dts/ralink/rt3883.dtsi              | 2 +-
>  arch/mips/boot/dts/xilfpga/nexys4ddr.dts           | 2 +-
>  7 files changed, 7 insertions(+), 7 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Antony Pavlov May 24, 2016, 11:43 a.m. UTC | #2
On Mon, 23 May 2016 10:47:16 -0500
Rob Herring <robh+dt@kernel.org> wrote:

> On Mon, May 23, 2016 at 6:39 AM, Antony Pavlov <antonynpavlov@gmail.com> wrote:
> > Here is the quote from [1]:
> >
> >     The unit-address must match the first address specified
> >     in the reg property of the node. If the node has no reg property,
> >     the @ and unit-address must be omitted and the node-name alone
> >     differentiates the node from other nodes at the same level
> >
> > This patch adjusts MIPS dts-files and devicetree binding
> > documentation in accordance with [1].
> >
> >     [1] Power.org(tm) Standard for Embedded Power Architecture(tm)
> >         Platform Requirements (ePAPR). Version 1.1 – 08 April 2011.
> >         Chapter 2.2.1.1 Node Name Requirements
> 
> FYI, you can reference "the Devicetree Spec" now: devicetree.org

Thanks for your note! Last time I visited devicetree.org in Jan 2015.
Now I see that the devicetree.org site has changed dramaticaly,
e.g. it does not use Mediawiki anymore.

Alas some important links from the http://www.devicetree.org/specifications/ page are broken:

   * http://www.devicetree.org/specifications-pdf
   * https://github.com/devicetree-org/devicetree-specification-released

Anyway I have got a prerelease specification version from github:

    https://raw.githubusercontent.com/devicetree-org/devicetree-specification-released/master/prerelease/devicetree-specification-v0.1-pre1-20160429.pdf


> Acked-by: Rob Herring <robh@kernel.org>
> 
> > Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
> > Cc: Ralf Baechle <ralf@linux-mips.org>
> > Cc: Paul Burton <paul.burton@imgtec.com>
> > Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
> > Cc: Rob Herring <robh+dt@kernel.org>
> > Cc: Pawel Moll <pawel.moll@arm.com>
> > Cc: Mark Rutland <mark.rutland@arm.com>
> > Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
> > Cc: Kumar Gala <galak@codeaurora.org>
> > Cc: linux-mips@linux-mips.org
> > Cc: devicetree@vger.kernel.org
> > Cc: linux-kernel@vger.kernel.org
> > ---
> >  Documentation/devicetree/bindings/mips/cpu_irq.txt | 2 +-
> >  arch/mips/boot/dts/ingenic/jz4740.dtsi             | 2 +-
> >  arch/mips/boot/dts/ralink/mt7620a.dtsi             | 2 +-
> >  arch/mips/boot/dts/ralink/rt2880.dtsi              | 2 +-
> >  arch/mips/boot/dts/ralink/rt3050.dtsi              | 2 +-
> >  arch/mips/boot/dts/ralink/rt3883.dtsi              | 2 +-
> >  arch/mips/boot/dts/xilfpga/nexys4ddr.dts           | 2 +-
> >  7 files changed, 7 insertions(+), 7 deletions(-)
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/mips/cpu_irq.txt b/Documentation/devicetree/bindings/mips/cpu_irq.txt
index fc149f3..f080f06 100644
--- a/Documentation/devicetree/bindings/mips/cpu_irq.txt
+++ b/Documentation/devicetree/bindings/mips/cpu_irq.txt
@@ -13,7 +13,7 @@  Required properties:
 - compatible : Should be "mti,cpu-interrupt-controller"
 
 Example devicetree:
-	cpu-irq: cpu-irq@0 {
+	cpu-irq: cpu-irq {
 		#address-cells = <0>;
 
 		interrupt-controller;
diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi
index 4a9c8f2..f6ae6ed 100644
--- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
@@ -5,7 +5,7 @@ 
 	#size-cells = <1>;
 	compatible = "ingenic,jz4740";
 
-	cpuintc: interrupt-controller@0 {
+	cpuintc: interrupt-controller {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
 		interrupt-controller;
diff --git a/arch/mips/boot/dts/ralink/mt7620a.dtsi b/arch/mips/boot/dts/ralink/mt7620a.dtsi
index 08bf24f..793c0c7 100644
--- a/arch/mips/boot/dts/ralink/mt7620a.dtsi
+++ b/arch/mips/boot/dts/ralink/mt7620a.dtsi
@@ -9,7 +9,7 @@ 
 		};
 	};
 
-	cpuintc: cpuintc@0 {
+	cpuintc: cpuintc {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
 		interrupt-controller;
diff --git a/arch/mips/boot/dts/ralink/rt2880.dtsi b/arch/mips/boot/dts/ralink/rt2880.dtsi
index 182afde..fb2faef 100644
--- a/arch/mips/boot/dts/ralink/rt2880.dtsi
+++ b/arch/mips/boot/dts/ralink/rt2880.dtsi
@@ -9,7 +9,7 @@ 
 		};
 	};
 
-	cpuintc: cpuintc@0 {
+	cpuintc: cpuintc {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
 		interrupt-controller;
diff --git a/arch/mips/boot/dts/ralink/rt3050.dtsi b/arch/mips/boot/dts/ralink/rt3050.dtsi
index e3203d4..d3cb57f 100644
--- a/arch/mips/boot/dts/ralink/rt3050.dtsi
+++ b/arch/mips/boot/dts/ralink/rt3050.dtsi
@@ -9,7 +9,7 @@ 
 		};
 	};
 
-	cpuintc: cpuintc@0 {
+	cpuintc: cpuintc {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
 		interrupt-controller;
diff --git a/arch/mips/boot/dts/ralink/rt3883.dtsi b/arch/mips/boot/dts/ralink/rt3883.dtsi
index 3b131dd..3d6fc9a 100644
--- a/arch/mips/boot/dts/ralink/rt3883.dtsi
+++ b/arch/mips/boot/dts/ralink/rt3883.dtsi
@@ -9,7 +9,7 @@ 
 		};
 	};
 
-	cpuintc: cpuintc@0 {
+	cpuintc: cpuintc {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
 		interrupt-controller;
diff --git a/arch/mips/boot/dts/xilfpga/nexys4ddr.dts b/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
index 686ebd1..48d2112 100644
--- a/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
+++ b/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
@@ -10,7 +10,7 @@ 
 		reg = <0x0 0x08000000>;
 	};
 
-	cpuintc: interrupt-controller@0 {
+	cpuintc: interrupt-controller {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
 		interrupt-controller;