Patchwork [1/3] powerpc/82xx: Fix BCSR bits for MPC8272ADS boards

login
register
mail settings
Submitter Anton Vorontsov
Date Aug. 18, 2009, 11:28 p.m.
Message ID <20090818232810.GA27907@oksana.dev.rtsoft.ru>
Download mbox | patch
Permalink /patch/31607/
State Accepted
Commit a70e88bc78d220a506394058d48cedd1c491a256
Delegated to: Kumar Gala
Headers show

Comments

Anton Vorontsov - Aug. 18, 2009, 11:28 p.m.
mpc8272_ads.c is using BCSR bits definitions from pq2ads.h, but
according to User's Guide the bits are wrong for MPC8272ADS boards
(I guess definitions from pq2ads should only be used for PQ2FADS
boards).

So, let's introduce our own definitions for MPC8272ADS, and don't
include pq2ads.h.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
 arch/powerpc/platforms/82xx/mpc8272_ads.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
Kumar Gala - Aug. 25, 2009, 2:44 p.m.
On Aug 18, 2009, at 6:28 PM, Anton Vorontsov wrote:

> mpc8272_ads.c is using BCSR bits definitions from pq2ads.h, but
> according to User's Guide the bits are wrong for MPC8272ADS boards
> (I guess definitions from pq2ads should only be used for PQ2FADS
> boards).
>
> So, let's introduce our own definitions for MPC8272ADS, and don't
> include pq2ads.h.
>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> ---
> arch/powerpc/platforms/82xx/mpc8272_ads.c |    8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)


applied to next.

- k

Patch

diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c
index 8054c68..67e2184 100644
--- a/arch/powerpc/platforms/82xx/mpc8272_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c
@@ -29,7 +29,6 @@ 
 #include <sysdev/fsl_soc.h>
 #include <sysdev/cpm2_pic.h>
 
-#include "pq2ads.h"
 #include "pq2.h"
 
 static void __init mpc8272_ads_pic_init(void)
@@ -144,6 +143,13 @@  static void __init mpc8272_ads_setup_arch(void)
 		return;
 	}
 
+#define BCSR1_FETHIEN		0x08000000
+#define BCSR1_FETH_RST		0x04000000
+#define BCSR1_RS232_EN1		0x02000000
+#define BCSR1_RS232_EN2		0x01000000
+#define BCSR3_FETHIEN2		0x10000000
+#define BCSR3_FETH2_RST		0x08000000
+
 	clrbits32(&bcsr[1], BCSR1_RS232_EN1 | BCSR1_RS232_EN2 | BCSR1_FETHIEN);
 	setbits32(&bcsr[1], BCSR1_FETH_RST);