Skip to contentSkip to conversation

at91sam9260/9263: add back up fot the rst(reset controller).

PATCH New Sedji Gaouaou 4 participants 6 messages Jun 24, 2009 – Jul 5, 2009 Arm/Microchip (AT91) SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 at91sam9260/9263: add back up fot the rst(reset controller).

On the boards at91sam9260ek, at91sam9263ek and afed9260, the rstc register was set to 0 after being set to 500 ms for the PHY reset. Do backup the old reset length and restore it after the MACB initialisation.

---
 board/afeb9260/afeb9260.c                 |    6 +++++-
 board/atmel/at91sam9260ek/at91sam9260ek.c |    6 +++++-
 board/atmel/at91sam9263ek/at91sam9263ek.c |    6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)
board/afeb9260/afeb9260.c +5 -1
index a247663..b9d0929 100644
@@ -81,6 +81,8 @@ static void afeb9260_nand_hw_init(void)
 #ifdef CONFIG_MACB
 static void afeb9260_macb_hw_init(void)
 {
+	unsigned long rstc;
+	
 	/* Enable clock */
 	at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_EMAC);
 
@@ -103,6 +105,8 @@ static void afeb9260_macb_hw_init(void)
 	       pin_to_mask(AT91_PIN_PA28),
 	       pin_to_controller(AT91_PIN_PA0) + PIO_PUDR);
 
+	rstc = at91_sys_read(AT91_RSTC_MR) & AT91_RSTC_ERSTL;
+	
 	/* Need to reset PHY -> 500ms reset */
 	at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
 				     AT91_RSTC_ERSTL | (0x0D << 8) |
@@ -115,7 +119,7 @@ static void afeb9260_macb_hw_init(void)
 
 	/* Restore NRST value */
 	at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
-				     AT91_RSTC_ERSTL | (0x0 << 8) |
+				     (rstc) |
 				     AT91_RSTC_URSTEN);
 
 	/* Re-enable pull-up */
board/atmel/at91sam9260ek/at91sam9260ek.c +5 -1
index 6bd3b44..d7d60ba 100644
@@ -86,6 +86,8 @@ static void at91sam9260ek_nand_hw_init(void)
 #ifdef CONFIG_MACB
 static void at91sam9260ek_macb_hw_init(void)
 {
+	unsigned long rstc;
+	
 	/* Enable clock */
 	at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_EMAC);
 
@@ -108,6 +110,8 @@ static void at91sam9260ek_macb_hw_init(void)
 	       pin_to_mask(AT91_PIN_PA28),
 	       pin_to_controller(AT91_PIN_PA0) + PIO_PUDR);
 
+	rstc = at91_sys_read(AT91_RSTC_MR) & AT91_RSTC_ERSTL;
+	
 	/* Need to reset PHY -> 500ms reset */
 	at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
 				     (AT91_RSTC_ERSTL & (0x0D << 8)) |
@@ -120,7 +124,7 @@ static void at91sam9260ek_macb_hw_init(void)
 
 	/* Restore NRST value */
 	at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
-				     (AT91_RSTC_ERSTL & (0x0 << 8)) |
+				     (rstc) |
 				     AT91_RSTC_URSTEN);
 
 	/* Re-enable pull-up */
board/atmel/at91sam9263ek/at91sam9263ek.c +5 -1
index 57d5c95..59c6a96 100644
@@ -91,6 +91,8 @@ static void at91sam9263ek_nand_hw_init(void)
 #ifdef CONFIG_MACB
 static void at91sam9263ek_macb_hw_init(void)
 {
+	unsigned long rstc;
+	
 	/* Enable clock */
 	at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9263_ID_EMAC);
 
@@ -108,6 +110,8 @@ static void at91sam9263ek_macb_hw_init(void)
 	       pin_to_mask(AT91_PIN_PE26),
 	       pin_to_controller(AT91_PIN_PE0) + PIO_PUDR);
 
+	rstc = at91_sys_read(AT91_RSTC_MR) & AT91_RSTC_ERSTL;
+	
 	/* Need to reset PHY -> 500ms reset */
 	at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
 				     (AT91_RSTC_ERSTL & (0x0D << 8)) |
@@ -120,7 +124,7 @@ static void at91sam9263ek_macb_hw_init(void)
 
 	/* Restore NRST value */
 	at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY |
-				     (AT91_RSTC_ERSTL & (0x0 << 8)) |
+				     (rstc) |
 				     AT91_RSTC_URSTEN);
 
 	/* Re-enable pull-up */
Signature · 1 line
1.5.3.7
#1 lore raw

PATCH 1/1 at91sam9260/9263: add back up fot the rst(reset controller).

Hi Sedji,

Quoted 4 lines · Sedji Gaouaou

On the boards at91sam9260ek, at91sam9263ek and afed9260, the rstc register was set to 0 after being set to 500 ms for the PHY reset. Do backup the old reset length and restore it after the MACB initialisation.

And sorry for the delay.

Stelian.

Signature · 1 line
Stelian Pop <[email protected]>
#2 lore raw

PATCH 1/1 at91sam9260/9263: add back up fot the rst(reset controller).

In reply to Sedji Gaouaou
Quoted 9 lines · Sedji Gaouaou

On the boards at91sam9260ek, at91sam9263ek and afed9260, the rstc register was set to 0 after being set to 500 ms for the PHY reset. Do backup the old reset length and restore it after the MACB initialisation.

---
 board/afeb9260/afeb9260.c                 |    6 +++++-
 board/atmel/at91sam9260ek/at91sam9260ek.c |    6 +++++-
 board/atmel/at91sam9263ek/at91sam9263ek.c |    6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

applied to u-boot-arm

Best Regards,
J.

#3 lore raw

PATCH 1/1 at91sam9260/9263: add back up fot the rst(reset controller).

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 11 lines · In message <[email protected]> you wrote:
Quoted 9 lines · Sedji Gaouaou

On the boards at91sam9260ek, at91sam9263ek and afed9260, the rstc register was set to 0 after being set to 500 ms for the PHY reset. Do backup the old reset length and restore it after the MACB initialisation.

---
 board/afeb9260/afeb9260.c                 |    6 +++++-
 board/atmel/at91sam9260ek/at91sam9260ek.c |    6 +++++-
 board/atmel/at91sam9263ek/at91sam9263ek.c |    6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

applied to u-boot-arm

Can you please fix the commit message? "fot" is obviously a typo;
I guess it should read "for" ? Thanks.

Best regards,

Wolfgang Denk

Signature · 4 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
Bus error -- please leave by the rear door.
#4 lore raw

PATCH 1/1 at91sam9260/9263: add back up fot the rst(reset controller).

Quoted 13 lines · Wolfgang Denk

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 10 lines · In message <[email protected]> you wrote:
Quoted 9 lines · Sedji Gaouaou

On the boards at91sam9260ek, at91sam9263ek and afed9260, the rstc register was set to 0 after being set to 500 ms for the PHY reset. Do backup the old reset length and restore it after the MACB initialisation.

---
 board/afeb9260/afeb9260.c                 |    6 +++++-
 board/atmel/at91sam9260ek/at91sam9260ek.c |    6 +++++-
 board/atmel/at91sam9263ek/at91sam9263ek.c |    6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)
Quoted 4 lines
Quoted 1 line

applied to u-boot-arm

Can you please fix the commit message? "fot" is obviously a typo;
I guess it should read "for" ? Thanks.

please accept it as this, I other patch applied over it and I prefer to not break the branch history.

Best Regards,
J.

#5 lore raw

PATCH 1/1 at91sam9260/9263: add back up fot the rst(reset controller).

Dear Jean-Christophe PLAGNIOL-VILLARD,

Quoted 5 lines · In message <[email protected]> you wrote:
Quoted 3 lines

Can you please fix the commit message? "fot" is obviously a typo;
I guess it should read "for" ? Thanks.

please accept it as this, I other patch applied over it and I prefer to not break the branch history.

Please fix it.

Best regards,

Wolfgang Denk

Signature · 4 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
All I ask is a chance to prove that money can't make me happy.