linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Liu Gang <Gang.Liu@freescale.com>
To: <linuxppc-dev@lists.ozlabs.org>
Cc: Jin Qing <b24347@freescale.com>,
	r58472@freescale.com, r61911@freescale.com,
	linux-kernel@vger.kernel.org, Liu Gang <Gang.Liu@freescale.com>,
	akpm@linux-foundation.org, B11780@freescale.com
Subject: [PATCH 3/4] p4080ds-dts: Add two rapidio ports and message units support
Date: Thu, 29 Sep 2011 10:29:00 +0800	[thread overview]
Message-ID: <1317263341-19010-3-git-send-email-Gang.Liu@freescale.com> (raw)
In-Reply-To: <1317263341-19010-1-git-send-email-Gang.Liu@freescale.com>

Add two message units and number of ports according to the p4080 reference manual.

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Jin Qing <b24347@freescale.com>
Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
---
 arch/powerpc/boot/dts/p4080ds.dts  |    4 +-
 arch/powerpc/boot/dts/p4080si.dtsi |   37 +++++++++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts
index eb11098..94a0cd4 100644
--- a/arch/powerpc/boot/dts/p4080ds.dts
+++ b/arch/powerpc/boot/dts/p4080ds.dts
@@ -101,9 +101,9 @@
 		};
 	};
 
-	rapidio0: rapidio@ffe0c0000 {
+	rapidio: rapidio@ffe0c0000 {
 		reg = <0xf 0xfe0c0000 0 0x20000>;
-		ranges = <0 0 0xc 0x20000000 0 0x01000000>;
+		ranges = <0 0 0xc 0x20000000 0 0x20000000>;
 	};
 
 	localbus@ffe124000 {
diff --git a/arch/powerpc/boot/dts/p4080si.dtsi b/arch/powerpc/boot/dts/p4080si.dtsi
index b71051f..816a629 100644
--- a/arch/powerpc/boot/dts/p4080si.dtsi
+++ b/arch/powerpc/boot/dts/p4080si.dtsi
@@ -69,8 +69,9 @@
 		rtic_c = &rtic_c;
 		rtic_d = &rtic_d;
 		sec_mon = &sec_mon;
+		rmu = &rmu;
 
-		rio0 = &rapidio0;
+		rio = &rapidio;
 	};
 
 	cpus {
@@ -555,20 +556,38 @@
 			interrupt-parent = <&mpic>;
 			interrupts = <93 2 0 0>;
 		};
+
+		rmu: rmu@d3000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "fsl,rmu";
+			reg = <0xd3000 0x200>;
+
+			message-unit@0 {
+				reg = <0x0 0x100>;
+				interrupts = <
+						60 2 0 0  /* msg1_tx_irq */
+						61 2 0 0>;/* msg1_rx_irq */
+			};
+			message-unit@1 {
+				reg = <0x100 0x100>;
+				interrupts = <
+						62 2 0 0  /* msg2_tx_irq */
+						63 2 0 0>;/* msg2_rx_irq */
+			};
+		};
 	};
 
-	rapidio0: rapidio@ffe0c0000 {
+	rapidio: rapidio@ffe0c0000 {
 		#address-cells = <2>;
 		#size-cells = <2>;
 		compatible = "fsl,rapidio-delta";
 		interrupts = <
-			16 2 1 11 /* err_irq */
-			56 2 0 0  /* bell_outb_irq */
-			57 2 0 0  /* bell_inb_irq */
-			60 2 0 0  /* msg1_tx_irq */
-			61 2 0 0  /* msg1_rx_irq */
-			62 2 0 0  /* msg2_tx_irq */
-			63 2 0 0>; /* msg2_rx_irq */
+				16 2 1 11 /* err_irq */
+				56 2 0 0  /* bell_outb_irq */
+				57 2 0 0>;/* bell_inb_irq */
+		fsl,rio-num-ports = <2>;
+		rmu-handle = <&rmu>;
 	};
 
 	localbus@ffe124000 {
-- 
1.7.3.1

  parent reply	other threads:[~2011-09-29  2:30 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-29  2:28 [PATCH 1/4] fsl-rio: Split rio driver into two parts, RapidIO endpoint and RapidIO message unit Liu Gang
2011-09-29  2:28 ` [PATCH 2/4] fsl-rio: Add two ports and rapidio message units support Liu Gang
2011-09-29  2:29 ` Liu Gang [this message]
2011-09-29 14:22   ` [PATCH 3/4] p4080ds-dts: Add two rapidio ports and " Kumar Gala
2011-09-29 14:23   ` Kumar Gala
2011-09-29  2:29 ` [PATCH 4/4] powerpc/fsl: Document rapidio node binding-information Liu Gang
2011-09-29 14:20   ` Kumar Gala
2011-09-30  7:35     ` Liu Gang-B34182
2011-09-29 14:21 ` [PATCH 1/4] fsl-rio: Split rio driver into two parts, RapidIO endpoint and RapidIO message unit Kumar Gala

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1317263341-19010-3-git-send-email-Gang.Liu@freescale.com \
    --to=gang.liu@freescale.com \
    --cc=B11780@freescale.com \
    --cc=akpm@linux-foundation.org \
    --cc=b24347@freescale.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=r58472@freescale.com \
    --cc=r61911@freescale.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).