85xx/p1_p2_rdb: Added RevD board version support

PATCH New Poonam Aggrwal 3 participants 4 messages Jun 22, 2010 – Jun 29, 2010

lore

Share & tools

lore

Poonam Aggrwal

author

2010-06-22 07:20 UTC #0 lore raw

PATCH 1/1 85xx/p1_p2_rdb: Added RevD board version support

- Also modified the code to use io accessors.

Signed-off-by Poonam Aggrwal <[email protected]>

Signed-off-by Dipen Dudhat <[email protected]>

---
Incorporated Wolfgang's comments on earlier patch

 board/freescale/p1_p2_rdb/p1_p2_rdb.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

board/freescale/p1_p2_rdb/p1_p2_rdb.c +13 -3

index 31cdf9a..fae31f2 100644
@@ -54,6 +54,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define BOARDREV_MASK	0x10100000
 #define BOARDREV_B	0x10100000
 #define BOARDREV_C	0x00100000
+#define BOARDREV_D	0x00000000
 
 #define SYSCLK_66	66666666
 #define SYSCLK_50	50000000

@@ -64,7 +65,7 @@ unsigned long get_board_sys_clk(ulong dummy)
 	volatile ccsr_gpio_t *pgpio = (void *)(CONFIG_SYS_MPC85xx_GPIO_ADDR);
 	u32 val_gpdat, sysclk_gpio, board_rev_gpio;
 
-	val_gpdat = pgpio->gpdat;
+	val_gpdat = in_be32(&pgpio->gpdat);
 	sysclk_gpio = val_gpdat & SYSCLK_MASK;
 	board_rev_gpio = val_gpdat & BOARDREV_MASK;
 	if (board_rev_gpio == BOARDREV_C) {

@@ -77,6 +78,11 @@ unsigned long get_board_sys_clk(ulong dummy)
 			return SYSCLK_66;
 		else
 			return SYSCLK_50;
+	} else if (board_rev_gpio == BOARDREV_D) {
+		if(sysclk_gpio == 0)
+			return SYSCLK_66;
+		else
+			return SYSCLK_100;
 	}
 	return 0;
 }

@@ -100,12 +106,14 @@ int checkboard (void)
 	char board_rev = 0;
 	struct cpu_type *cpu;
 
-	val_gpdat = pgpio->gpdat;
+	val_gpdat = in_be32(&pgpio->gpdat);
 	board_rev_gpio = val_gpdat & BOARDREV_MASK;
 	if (board_rev_gpio == BOARDREV_C)
 		board_rev = 'C';
 	else if (board_rev_gpio == BOARDREV_B)
 		board_rev = 'B';
+	else if (board_rev_gpio == BOARDREV_D)
+		board_rev = 'D';
 	else
 		panic ("Unexpected Board REV %x detected!!\n", board_rev_gpio);

@@ -159,6 +167,7 @@ int board_eth_init(bd_t *bis)
 	volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
 	int num = 0;
 	char *tmp;
+	u32 pordevsr;
 	unsigned int vscfw_addr;
 
 #ifdef CONFIG_TSEC1

@@ -171,7 +180,8 @@ int board_eth_init(bd_t *bis)
 #endif
 #ifdef CONFIG_TSEC3
 	SET_STD_TSEC_INFO(tsec_info[num], 3);
-	if (!(gur->pordevsr & MPC85xx_PORDEVSR_SGMII3_DIS))
+	pordevsr = in_be32(&gur->pordevsr);
+	if (!(pordevsr & MPC85xx_PORDEVSR_SGMII3_DIS))
 		tsec_info[num].flags |= TSEC_SGMII;
 	num++;
 #endif

Signature · 1 line

1.5.6.5

Wolfgang Denk

2010-06-22 07:57 UTC #1 lore raw

PATCH 1/1 85xx/p1_p2_rdb: Added RevD board version support

Dear Poonam Aggrwal,

Quoted 8 lines · In message <[email protected]> you…

- Also modified the code to use io accessors.
Signed-off-by Poonam Aggrwal <[email protected]>
Signed-off-by Dipen Dudhat <[email protected]>
---
Incorporated Wolfgang's comments on earlier patch
 board/freescale/p1_p2_rdb/p1_p2_rdb.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

Thanks.

Andy & Kumar: if you ACK I can pull directly so we get this in -rc3?

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
No more blah, blah, blah!
	-- Kirk, "Miri", stardate 2713.6

Kumar Gala

2010-06-22 18:56 UTC #2 lore raw

PATCH 1/1 85xx/p1_p2_rdb: Added RevD board version support

Quoted 12 lines · Wolfgang Denk

Dear Poonam Aggrwal,
Quoted 8 lines · In message <[email protected]> you…
- Also modified the code to use io accessors.
Signed-off-by Poonam Aggrwal <[email protected]>
Signed-off-by Dipen Dudhat <[email protected]>
---
Incorporated Wolfgang's comments on earlier patch
board/freescale/p1_p2_rdb/p1_p2_rdb.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)

Quoted 7 lines

Thanks.
Andy & Kumar: if you ACK I can pull directly so we get this in -rc3?
Best regards,
Wolfgang Denk

ACK.

- k

Wolfgang Denk

Applied

2010-06-29 19:07 UTC #3 lore raw

PATCH 1/1 85xx/p1_p2_rdb: Added RevD board version support

In reply to Poonam Aggrwal

Dear Poonam Aggrwal,

Quoted 8 lines · In message <[email protected]> you…

- Also modified the code to use io accessors.
Signed-off-by Poonam Aggrwal <[email protected]>
Signed-off-by Dipen Dudhat <[email protected]>
---
Incorporated Wolfgang's comments on earlier patch
 board/freescale/p1_p2_rdb/p1_p2_rdb.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 8 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A Stanford research group advertised for participants in a  study  of
obsessive-compulsive  disorder. They were looking for therapy clients
who had been diagnosed with this disorder. The  response  was  grati-
fying;  they  got  3,000 responses about three days after the ad came
out. All from the same person.