linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Anatolij Gustschin <agust@denx.de>
To: linuxppc-dev@ozlabs.org
Cc: Anatolij Gustschin <agust@denx.de>,
	wd@denx.de, dzu@denx.de, Piotr Ziecik <kosmo@semihalf.com>
Subject: [PATCH 10/11] powerpc/mpc5121: update mpc5121ads DTS
Date: Tue, 19 Jan 2010 21:24:12 +0100	[thread overview]
Message-ID: <1263932653-3634-11-git-send-email-agust@denx.de> (raw)
In-Reply-To: <1263932653-3634-1-git-send-email-agust@denx.de>

Collects several changes needed after applying
previous mpc5121 platform and driver patches:

- Add mpc5121 reset module node
- Clean up and fix NAND description, remove unused properties
  here and correct NAND flash chip size.
- Add I2C RTC node for m41t80 RTC
- Fix compatible property in DMA node
- Remove unused cell-index properties from CAN nodes
- Fix compatible property in DIU node
- USB node changes:
    - remove 'port0/1' properties as these are only used
      for multi-port host(MHP) module which is not available
      on MPC5121.
    - MPC5121 Rev 2.0 EHCI registers are big endian.
      'big-endian-regs' property in USB node indicates
      this now.
    - use 'invert-drvvbus' and 'invert-pwr-fault' in
      USB node for internal PHY to specify polarities
      of appropriate port pins.

Signed-off-by: Piotr Ziecik <kosmo@semihalf.com>
Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Detlev Zundel <dzu@denx.de>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
---
 arch/powerpc/boot/dts/mpc5121ads.dts |   35 +++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
index c353dac..22c107f 100644
--- a/arch/powerpc/boot/dts/mpc5121ads.dts
+++ b/arch/powerpc/boot/dts/mpc5121ads.dts
@@ -62,17 +62,12 @@
 		interrupt-parent = < &ipic >;
 		#address-cells = <1>;
 		#size-cells = <1>;
-		bank-width = <1>;
 		// ADS has two Hynix 512MB Nand flash chips in a single
-		// stacked package .
+		// stacked package.
 		chips = <2>;
-		nand0@0 {
-			label = "nand0";
-			reg = <0x00000000 0x02000000>; 	// first 32 MB of chip 0
-		};
-		nand1@20000000 {
-			label = "nand1";
-			reg = <0x20000000 0x02000000>; 	// first 32 MB of chip 1
+		nand@0 {
+			label = "nand";
+			reg = <0x00000000 0x40000000>;	// 512MB + 512MB
 		};
 	};
 
@@ -166,6 +161,11 @@
 			interrupt-parent = < &ipic >;
 		};
 
+		reset@e00 {	// Reset module
+			compatible = "fsl,mpc5121-reset";
+			reg = <0xe00 0x100>;
+		};
+
 		clock@f00 {	// Clock control
 			compatible = "fsl,mpc5121-clock";
 			reg = <0xf00 0x100>;
@@ -187,7 +187,6 @@
 
 		mscan@1300 {
 			compatible = "fsl,mpc5121-mscan";
-			cell-index = <0>;
 			interrupts = <12 0x8>;
 			interrupt-parent = < &ipic >;
 			reg = <0x1300 0x80>;
@@ -195,7 +194,6 @@
 
 		mscan@1380 {
 			compatible = "fsl,mpc5121-mscan";
-			cell-index = <1>;
 			interrupts = <13 0x8>;
 			interrupt-parent = < &ipic >;
 			reg = <0x1380 0x80>;
@@ -219,6 +217,11 @@
 			reg = <0x1720 0x20>;
 			interrupts = <10 0x8>;
 			interrupt-parent = < &ipic >;
+
+			rtc@68 {
+				compatible = "stm,m41t80";
+				reg = <0x68>;
+			};
 		};
 
 		i2c@1740 {
@@ -244,7 +247,7 @@
 		};
 
 		display@2100 {
-			compatible = "fsl,mpc5121-diu", "fsl-diu";
+			compatible = "fsl,mpc5121-diu", "fsl,diu";
 			reg = <0x2100 0x100>;
 			interrupts = <64 0x8>;
 			interrupt-parent = < &ipic >;
@@ -285,7 +288,7 @@
 		//	interrupts = <43 0x8>;
 		//	dr_mode = "otg";
 		//	phy_type = "ulpi";
-		//	port1;
+		//	big-endian-regs;
 		//};
 
 		// USB0 using internal UTMI PHY
@@ -298,7 +301,9 @@
 			interrupts = <44 0x8>;
 			dr_mode = "otg";
 			phy_type = "utmi_wide";
-			port0;
+			big-endian-regs;
+			invert-drvvbus;
+			invert-pwr-fault;
 		};
 
 		// IO control
@@ -365,7 +370,7 @@
 		};
 
 		dma@14000 {
-			compatible = "fsl,mpc5121-dma2";
+			compatible = "fsl,mpc5121-dma";
 			reg = <0x14000 0x1800>;
 			interrupts = <65 0x8>;
 			interrupt-parent = < &ipic >;
-- 
1.5.6.3

  parent reply	other threads:[~2010-01-19 20:24 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-19 20:24 [PATCH 0/11] Update support for MPC512x Anatolij Gustschin
2010-01-19 20:24 ` [PATCH 01/11] fs_enet: Add support for MPC512x to fs_enet driver Anatolij Gustschin
2010-01-19 20:48   ` Scott Wood
2010-01-20 11:20     ` Anatolij Gustschin
2010-01-20 17:02       ` Scott Wood
2010-01-19 20:24 ` [PATCH 02/11] fs_enet: Add FEC TX Alignment workaround for MPC5121 Anatolij Gustschin
2010-01-19 20:37   ` David Miller
2010-01-19 23:42     ` Stephen Rothwell
2010-01-20  4:04       ` David Miller
2010-01-20 10:22   ` Wolfram Sang
2010-01-19 20:24 ` [PATCH 03/11] powerpc/mpc5121: Add machine restart support Anatolij Gustschin
2010-01-20 11:28   ` Wolfram Sang
2010-01-26  7:53     ` Anatolij Gustschin
2010-01-19 20:24 ` [PATCH 04/11] i2c-mpc: Add MPC5121 I2C bus support Anatolij Gustschin
2010-01-21 17:12   ` Grant Likely
2010-01-22 12:15     ` Wolfgang Grandegger
2010-01-19 20:24 ` [PATCH 05/11] rtc: Add MPC5121 Real time clock driver Anatolij Gustschin
2010-01-20 11:01   ` Wolfram Sang
2010-01-20 22:19   ` [rtc-linux] " Alessandro Zummo
2010-01-19 20:24 ` [PATCH 06/11] mtd: Add MPC5121 NAND Flash Controller driver Anatolij Gustschin
2010-01-20 10:49   ` Wolfram Sang
2010-01-25 15:56     ` Anatolij Gustschin
2010-01-19 20:24 ` [PATCH 07/11] dma: Add MPC512x DMA driver Anatolij Gustschin
2010-01-21 17:22   ` Grant Likely
2010-01-26  8:03     ` Anatolij Gustschin
2010-01-19 20:24 ` [PATCH 08/11] powerpc/mpc5121: add USB host support Anatolij Gustschin
2010-01-21 17:43   ` Grant Likely
2010-01-25 17:00     ` Anatolij Gustschin
2010-01-27 16:52       ` Grant Likely
2010-01-19 20:24 ` [PATCH 09/11] powerpc/mpc512x: shared DIU framebuffer support Anatolij Gustschin
2010-01-19 20:24 ` Anatolij Gustschin [this message]
2010-01-19 20:24 ` [PATCH 11/11] powerpc/mpc5121: Add default config for MPC5121ADS Anatolij Gustschin
2010-01-21 17:47   ` Grant Likely
2010-01-20 11:22 ` [PATCH 0/11] Update support for MPC512x Wolfram Sang
2010-01-26  8:06   ` Anatolij Gustschin
2010-01-26 12:16     ` Wolfram Sang

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=1263932653-3634-11-git-send-email-agust@denx.de \
    --to=agust@denx.de \
    --cc=dzu@denx.de \
    --cc=kosmo@semihalf.com \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=wd@denx.de \
    /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).