linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] MIPS: devicetree: fix cpu interrupt controller node-names
@ 2016-05-23 11:39 Antony Pavlov
  2016-05-23 15:47 ` Rob Herring
  0 siblings, 1 reply; 3+ messages in thread
From: Antony Pavlov @ 2016-05-23 11:39 UTC (permalink / raw)
  To: linux-mips
  Cc: Ralf Baechle, Paul Burton, Zubair Lutfullah Kakakhel,
	Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
	devicetree, linux-kernel

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(-)

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;
-- 
2.7.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] MIPS: devicetree: fix cpu interrupt controller node-names
  2016-05-23 11:39 [PATCH] MIPS: devicetree: fix cpu interrupt controller node-names Antony Pavlov
@ 2016-05-23 15:47 ` Rob Herring
  2016-05-24 11:43   ` Antony Pavlov
  0 siblings, 1 reply; 3+ messages in thread
From: Rob Herring @ 2016-05-23 15:47 UTC (permalink / raw)
  To: Antony Pavlov
  Cc: Linux-MIPS, Ralf Baechle, Paul Burton, Zubair Lutfullah Kakakhel,
	Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, devicetree,
	linux-kernel

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(-)

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] MIPS: devicetree: fix cpu interrupt controller node-names
  2016-05-23 15:47 ` Rob Herring
@ 2016-05-24 11:43   ` Antony Pavlov
  0 siblings, 0 replies; 3+ messages in thread
From: Antony Pavlov @ 2016-05-24 11:43 UTC (permalink / raw)
  To: Rob Herring
  Cc: Linux-MIPS, Ralf Baechle, Paul Burton, Zubair Lutfullah Kakakhel,
	Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, devicetree,
	linux-kernel

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(-)


-- 
-- 
Best regards,
  Antony Pavlov

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-24 11:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-23 11:39 [PATCH] MIPS: devicetree: fix cpu interrupt controller node-names Antony Pavlov
2016-05-23 15:47 ` Rob Herring
2016-05-24 11:43   ` Antony Pavlov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).