Skip to contentSkip to conversation

arm926ejs, at91: add common phy_reset function

RFC Superseded Heiko Schocher 3 participants 6 messages Nov 12, 2013 – Nov 13, 2013

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

RFC 1/1 arm926ejs, at91: add common phy_reset function

add common phy reset code into a common function.

Cc Andreas Bie?mann <[email protected]>
Cc Bo Shen <[email protected]>
Cc Jens Scharsig <[email protected]>
Cc Sergey Lapin <[email protected]>
Cc Stelian Pop <[email protected]>
Cc Albin Tonnerre <[email protected]>
Cc Eric Benard <[email protected]>
Cc Markus Hubig <[email protected]>

---
Patch based on the spl patchset from Bo Shen (as I want to collect this function in at91-common directory), see:
http://lists.denx.de/pipermail/u-boot/2013-November/166272.html
(reworked this against newest Kconfig Makefile changes ...
@Bo: Do you plan an update for this patchset for the Kconfig changes?

Maybe my change in arch/arm/cpu/at91-common/Makefile could be done better... Do we have a common define for all this variants?

---
 arch/arm/cpu/Makefile                           |  1 +
 arch/arm/cpu/at91-common/Makefile               |  5 +++
 arch/arm/cpu/at91-common/phy.c                  | 48 +++++++++++++++++++++++++
 arch/arm/include/asm/arch-at91/at91_common.h    |  1 +
 board/BuS/vl_ma2sc/vl_ma2sc.c                   | 18 ++--------
 board/afeb9260/afeb9260.c                       | 18 +---------
 board/atmel/at91sam9260ek/at91sam9260ek.c       | 19 +---------
 board/atmel/at91sam9263ek/at91sam9263ek.c       | 19 ++--------
 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 19 +---------
 board/bluewater/snapper9260/snapper9260.c       | 16 +--------
 board/calao/sbc35_a9g20/sbc35_a9g20.c           | 19 +---------
 board/eukrea/cpu9260/cpu9260.c                  | 18 +---------
 board/taskit/stamp9g20/stamp9g20.c              | 31 +---------------
 spl/Makefile                                    |  4 ---
 14 files changed, 66 insertions(+), 170 deletions(-)
 create mode 100644 arch/arm/cpu/at91-common/phy.c
arch/arm/cpu/Makefile +1 -0
index fd0da53..886347d 100644
@@ -1,2 +1,3 @@
 obj-$(CONFIG_TEGRA) += $(SOC)-common/
 obj-$(CONFIG_TEGRA) += tegra-common/
+obj-$(CONFIG_AT91FAMILY) += at91-common/
arch/arm/cpu/at91-common/Makefile +5 -0
index 040b956..255c7b9 100644
@@ -8,5 +8,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
+obj-$(CONFIG_AT91SAM9260) += phy.o
+obj-$(CONFIG_AT91SAM9G20) += phy.o
+obj-$(CONFIG_AT91SAM9263) += phy.o
+obj-$(CONFIG_AT91SAM9XE) += phy.o
+obj-$(CONFIG_AT91SAM9M10G45) += phy.o
 obj-$(CONFIG_SPL_BUILD) += mpddrc.o
 obj-$(CONFIG_SPL_BUILD) += spl.o
arch/arm/cpu/at91-common/phy.c new file +48 -0

48 lines not on this page · raw message

arch/arm/include/asm/arch-at91/at91_common.h +1 -0
index 3ca4d5b..59e2f43 100644
@@ -26,5 +26,6 @@ void at91_plla_init(u32 pllar);
 void at91_mck_init(u32 mckr);
 void at91_pmc_init(void);
 void mem_init(void);
+void at91_phy_reset(void);
 
 #endif /* AT91_COMMON_H */
board/BuS/vl_ma2sc/vl_ma2sc.c +2 -16
index e2ae6fd..412ff3b 100644
@@ -16,7 +16,6 @@
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_pio.h>
-#include <asm/arch/at91_rstc.h>
 #include <asm/arch/at91sam9263.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/at91_common.h>
@@ -76,25 +75,12 @@ static void vl_ma2sc_nand_hw_init(void)
 #ifdef CONFIG_MACB
 static void vl_ma2sc_macb_hw_init(void)
 {
-	unsigned long	erstl;
 	at91_pmc_t	*pmc	= (at91_pmc_t *) ATMEL_BASE_PMC;
-	at91_rstc_t	*rstc	= (at91_rstc_t *) ATMEL_BASE_RSTC;
+
 	/* Enable clock */
 	writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
 
-	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
-
-	/* Need to reset PHY -> 500ms reset */
-	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(0x0D) |
-		AT91_RSTC_MR_URSTEN, &rstc->mr);
-
-	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
-	/* Wait for end hardware reset */
-	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL))
-		;
-
-	/* Restore NRST value */
-	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN, &rstc->mr);
+	at91_phy_reset();
 
 	at91_macb_hw_init();
 }
board/afeb9260/afeb9260.c +1 -17
index e1b1c10..ea9575d 100644
@@ -13,7 +13,6 @@
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
 #include <asm/arch/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
@@ -67,8 +66,6 @@ static void afeb9260_macb_hw_init(void)
 {
 	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
 	struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA;
-	struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC;
-	unsigned long erstl;
 
 
 	/* Enable EMAC clock */
@@ -94,20 +91,7 @@ static void afeb9260_macb_hw_init(void)
 	       pin_to_mask(AT91_PIN_PA28),
 	       &pioa->pudr);
 
-	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
-
-	/* Need to reset PHY -> 500ms reset */
-	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(13) |
-		AT91_RSTC_MR_URSTEN, &rstc->mr);
-	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
-
-	/* Wait for end hardware reset */
-	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL))
-		;
-	/* Restore NRST value */
-	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN,
-		&rstc->mr);
-
+	at91_phy_reset();
 
 	/* Re-enable pull-up */
 	writel(pin_to_mask(AT91_PIN_PA14) |
board/atmel/at91sam9260ek/at91sam9260ek.c +1 -18
index 263de49..7f14af1 100644
@@ -12,7 +12,6 @@
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
 #include <asm/arch/gpio.h>
 #include <atmel_mci.h>
 
@@ -73,8 +72,6 @@ static void at91sam9260ek_macb_hw_init(void)
 {
 	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
 	struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA;
-	struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC;
-	unsigned long erstl;
 
 	/* Enable EMAC clock */
 	writel(1 << ATMEL_ID_EMAC0, &pmc->pcer);
@@ -98,21 +95,7 @@ static void at91sam9260ek_macb_hw_init(void)
 		pin_to_mask(AT91_PIN_PA28),
 		&pioa->pudr);
 
-	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
-
-	/* Need to reset PHY -> 500ms reset */
-	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(13) |
-		AT91_RSTC_MR_URSTEN, &rstc->mr);
-
-	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
-
-	/* Wait for end hardware reset */
-	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL))
-		;
-
-	/* Restore NRST value */
-	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN,
-		&rstc->mr);
+	at91_phy_reset();
 
 	/* Re-enable pull-up */
 	writel(pin_to_mask(AT91_PIN_PA14) |
board/atmel/at91sam9263ek/at91sam9263ek.c +2 -17
index 2e9246f..d42a173 100644
@@ -12,7 +12,6 @@
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
 #include <asm/arch/at91_matrix.h>
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/clk.h>
@@ -82,10 +81,9 @@ static void at91sam9263ek_nand_hw_init(void)
 #ifdef CONFIG_MACB
 static void at91sam9263ek_macb_hw_init(void)
 {
-	unsigned long 	erstl;
 	at91_pmc_t	*pmc	= (at91_pmc_t *) ATMEL_BASE_PMC;
 	at91_pio_t	*pio	= (at91_pio_t *) ATMEL_BASE_PIO;
-	at91_rstc_t	*rstc	= (at91_rstc_t *) ATMEL_BASE_RSTC;
+
 	/* Enable clock */
 	writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
 
@@ -97,23 +95,10 @@ static void at91sam9263ek_macb_hw_init(void)
 	 *
 	 * PHY has internal pull-down
 	 */
-
 	writel(1 << 25, &pio->pioc.pudr);
 	writel((1 << 25) | (1 <<26), &pio->pioe.pudr);
 
-	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
-
-	/* Need to reset PHY -> 500ms reset */
-	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(0x0D) |
-		AT91_RSTC_MR_URSTEN, &rstc->mr);
-
-	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
-	/* Wait for end hardware reset */
-	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL))
-		;
-
-	/* Restore NRST value */
-	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN, &rstc->mr);
+	at91_phy_reset();
 
 	/* Re-enable pull-up */
 	writel(1 << 25, &pio->pioc.puer);
board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c +1 -18
index 6a071f6..b7e2efd 100644
@@ -12,7 +12,6 @@
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/clk.h>
 #include <lcd.h>
@@ -88,8 +87,6 @@ static void at91sam9m10g45ek_macb_hw_init(void)
 {
 	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
 	struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA;
-	struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC;
-	unsigned long erstl;
 
 	/* Enable clock */
 	writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
@@ -107,21 +104,7 @@ static void at91sam9m10g45ek_macb_hw_init(void)
 	       pin_to_mask(AT91_PIN_PA13),
 	       &pioa->pudr);
 
-	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
-
-	/* Need to reset PHY -> 500ms reset */
-	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(13) |
-		AT91_RSTC_MR_URSTEN, &rstc->mr);
-
-	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
-
-	/* Wait for end hardware reset */
-	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL))
-		;
-
-	/* Restore NRST value */
-	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN,
-		&rstc->mr);
+	at91_phy_reset();
 
 	/* Re-enable pull-up */
 	writel(pin_to_mask(AT91_PIN_PA15) |
board/bluewater/snapper9260/snapper9260.c +1 -15
index 8a6919d..bfde129 100644
@@ -14,7 +14,6 @@
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
 #include <asm/arch/gpio.h>
 #include <net.h>
 #include <netdev.h>
@@ -31,8 +30,6 @@ static void macb_hw_init(void)
 {
 	struct at91_pmc *pmc   = (struct at91_pmc  *)ATMEL_BASE_PMC;
 	struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA;
-	struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC;
-	unsigned long erstl;
 
 	/* Enable clock */
 	writel(1 << ATMEL_ID_EMAC0, &pmc->pcer);
@@ -54,18 +51,7 @@ static void macb_hw_init(void)
 	/* Enable ethernet power */
 	pca953x_set_val(0x28, IO_EXP_ETH_POWER, 0);
 
-	/* Need to reset PHY -> 500ms reset */
-	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
-	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(13) |
-	       AT91_RSTC_MR_URSTEN, &rstc->mr);
-	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
-
-	/* Wait for end hardware reset */
-	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL))
-		;
-
-	/* Restore NRST value */
-	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN, &rstc->mr);
+	at91_phy_reset();
 
 	/* Bring the ethernet out of reset */
 	pca953x_set_val(0x28, IO_EXP_ETH_RESET, 1);
board/calao/sbc35_a9g20/sbc35_a9g20.c +1 -18
index ecf261c..2074a93 100644
@@ -15,7 +15,6 @@
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
 #include <asm/arch/gpio.h>
 
 #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
@@ -77,8 +76,6 @@ static void sbc35_a9g20_macb_hw_init(void)
 {
 	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
 	struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA;
-	struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC;
-	unsigned long erstl;
 
 	/* Enable EMAC clock */
 	writel(1 << ATMEL_ID_EMAC0, &pmc->pcer);
@@ -102,21 +99,7 @@ static void sbc35_a9g20_macb_hw_init(void)
 	       pin_to_mask(AT91_PIN_PA28),
 	       &pioa->pudr);
 
-	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
-
-	/* Need to reset PHY -> 500ms reset */
-	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(13) |
-		AT91_RSTC_MR_URSTEN, &rstc->mr);
-
-	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
-
-	/* Wait for end hardware reset */
-	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL))
-		;
-
-	/* Restore NRST value */
-	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN,
-		&rstc->mr);
+	at91_phy_reset();
 
 	/* Re-enable pull-up */
 	writel(pin_to_mask(AT91_PIN_PA14) |
board/eukrea/cpu9260/cpu9260.c +1 -17
index 5e1524e..274f72d 100644
@@ -17,7 +17,6 @@
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_matrix.h>
 #include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/hardware.h>
@@ -89,29 +88,14 @@ static void cpu9260_nand_hw_init(void)
 #ifdef CONFIG_MACB
 static void cpu9260_macb_hw_init(void)
 {
-	unsigned long rstcmr;
 	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
-	at91_rstc_t *rstc = (at91_rstc_t *) ATMEL_BASE_RSTC;
 
 	/* Enable clock */
 	writel(1 << ATMEL_ID_EMAC0, &pmc->pcer);
 
 	at91_set_pio_pullup(AT91_PIO_PORTA, 17, 1);
 
-	rstcmr = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
-
-	/* Need to reset PHY -> 500ms reset */
-	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(0xD) |
-				AT91_RSTC_MR_URSTEN, &rstc->mr);
-
-	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
-
-	/* Wait for end hardware reset */
-	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL))
-		;
-
-	/* Restore NRST value */
-	writel(AT91_RSTC_KEY | rstcmr | AT91_RSTC_MR_URSTEN, &rstc->mr);
+	at91_phy_reset();
 
 	at91_macb_hw_init();
 }
board/taskit/stamp9g20/stamp9g20.c +1 -30
index 704a63b..27cdf77 100644
@@ -19,7 +19,6 @@
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
 #include <asm/arch/gpio.h>
 #include <watchdog.h>
 
@@ -67,8 +66,6 @@ static void stamp9G20_nand_hw_init(void)
 static void stamp9G20_macb_hw_init(void)
 {
 	struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA;
-	struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC;
-	unsigned long erstl;
 
 	/* Enable the PHY Chip via PA26 on the Stamp 2 Adaptor */
 	at91_set_gpio_output(AT91_PIN_PA26, 0);
@@ -91,33 +88,7 @@ static void stamp9G20_macb_hw_init(void)
 		pin_to_mask(AT91_PIN_PA28),
 		&pioa->pudr);
 
-	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
-
-	/* Need to reset PHY -> 500ms reset */
-	writel(AT91_RSTC_KEY | (AT91_RSTC_MR_ERSTL(13) &
-				~AT91_RSTC_MR_URSTEN), &rstc->mr);
-	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
-
-	/* Wait for end of hardware reset */
-	unsigned long start = get_timer(0);
-	unsigned long timeout = 1000; /* 1000ms */
-
-	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL)) {
-
-		/* avoid shutdown by watchdog */
-		WATCHDOG_RESET();
-		mdelay(10);
-
-		/* timeout for not getting stuck in an endless loop */
-		if (get_timer(start) >= timeout) {
-			puts("*** ERROR: Timeout waiting for PHY reset!\n");
-			break;
-		};
-	};
-
-	/* Restore NRST value */
-	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN,
-		&rstc->mr);
+	at91_phy_reset();
 
 	/* Re-enable pull-up */
 	writel(pin_to_mask(AT91_PIN_PA14) |
spl/Makefile +0 -4
index 736c6ca..cbd3d27 100644
@@ -111,10 +111,6 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)
 LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
 endif
 
-ifeq ($(SOC),at91)
-LIBS-y += arch/$(ARCH)/cpu/at91-common/libat91-common.o
-endif
-
 # Add GCC lib
 ifeq ("$(USE_PRIVATE_LIBGCC)", "yes")
 PLATFORM_LIBGCC = $(SPLTREE)/arch/$(ARCH)/lib/libgcc.o
Signature · 1 line
1.8.3.1
#1 lore raw

Hello Heiko,

Quoted 12 lines · Heiko Schocher

add common phy reset code into a common function.

Cc Andreas Bie?mann <[email protected]>
Cc Bo Shen <[email protected]>
Cc Jens Scharsig <[email protected]>
Cc Sergey Lapin <[email protected]>
Cc Stelian Pop <[email protected]>
Cc Albin Tonnerre <[email protected]>
Cc Eric Benard <[email protected]>
Cc Markus Hubig <[email protected]>
Quoted 6 lines

---
Patch based on the spl patchset from Bo Shen (as I want to collect this function in at91-common directory), see:
http://lists.denx.de/pipermail/u-boot/2013-November/166272.html
(reworked this against newest Kconfig Makefile changes ...
@Bo: Do you plan an update for this patchset for the Kconfig changes?

@Bo: I'll review the patches also these days.

Quoted 4 lines

Maybe my change in arch/arm/cpu/at91-common/Makefile could be done better... Do we have a common define for all this variants?

I think not, but how about defining a new one?

Quoted 32 lines
---
 arch/arm/cpu/Makefile                           |  1 +
 arch/arm/cpu/at91-common/Makefile               |  5 +++
 arch/arm/cpu/at91-common/phy.c                  | 48 +++++++++++++++++++++++++
 arch/arm/include/asm/arch-at91/at91_common.h    |  1 +
 board/BuS/vl_ma2sc/vl_ma2sc.c                   | 18 ++--------
 board/afeb9260/afeb9260.c                       | 18 +---------
 board/atmel/at91sam9260ek/at91sam9260ek.c       | 19 +---------
 board/atmel/at91sam9263ek/at91sam9263ek.c       | 19 ++--------
 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 19 +---------
 board/bluewater/snapper9260/snapper9260.c       | 16 +--------
 board/calao/sbc35_a9g20/sbc35_a9g20.c           | 19 +---------
 board/eukrea/cpu9260/cpu9260.c                  | 18 +---------
 board/taskit/stamp9g20/stamp9g20.c              | 31 +---------------
 spl/Makefile                                    |  4 ---
 14 files changed, 66 insertions(+), 170 deletions(-)
 create mode 100644 arch/arm/cpu/at91-common/phy.c
arch/arm/cpu/Makefile +1 -0
index fd0da53..886347d 100644
@@ -1,2 +1,3 @@
 obj-$(CONFIG_TEGRA) += $(SOC)-common/
 obj-$(CONFIG_TEGRA) += tegra-common/
+obj-$(CONFIG_AT91FAMILY) += at91-common/
arch/arm/cpu/at91-common/Makefile +0 -0
index 040b956..255c7b9 100644

arch/arm/cpu/at91-common/Makefile line 15

Quoted 8 lines
arch/arm/cpu/at91-common/Makefile +5 -0
@@ -8,5 +8,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
+obj-$(CONFIG_AT91SAM9260) += phy.o
+obj-$(CONFIG_AT91SAM9G20) += phy.o
+obj-$(CONFIG_AT91SAM9263) += phy.o
+obj-$(CONFIG_AT91SAM9XE) += phy.o
+obj-$(CONFIG_AT91SAM9M10G45) += phy.o

How about defining some CONFIG_AT91_WANTS_PHY_RESET or CONFIG_AT91_WANTS_COMMON_PHY?

Quoted 20 lines
arch/arm/cpu/at91-common/Makefile +0 -0
 obj-$(CONFIG_SPL_BUILD) += mpddrc.o
 obj-$(CONFIG_SPL_BUILD) += spl.o
arch/arm/cpu/at91-common/phy.c new file +12 -0
new file mode 100644
index 0000000..4706635
@@ -0,0 +1,48 @@
+/*
+ * (C) Copyright 2007-2008
+ * Stelian Pop <[email protected]>
+ * Lead Tech Design <www.leadtechdesign.com>
+ *
+ * Copyright (C) 2013 DENX Software Engineering, hs at denx.de
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/io.h>

arch/arm/cpu/at91-common/phy.c line 22

Quoted 10 lines
arch/arm/cpu/at91-common/phy.c new file +10 -0
+#include <asm/sizes.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_rstc.h>
+#include <watchdog.h>
+
+void at91_phy_reset(void)
+{
+	unsigned long erstl;
+	unsigned long start = get_timer(0);
+	unsigned long timeout = 1000; /* 1000ms */

I'd constify timeout, it could give a hint to the compiler and it doesn't hurt here.

arch/arm/cpu/at91-common/phy.c line 27

Quoted 5 lines
arch/arm/cpu/at91-common/phy.c new file +5 -0
+	at91_rstc_t *rstc = (at91_rstc_t *)ATMEL_BASE_RSTC;
+
+	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
+
+	/* Need to reset PHY -> 500ms reset */

As there where discussion about this trick here could you please add some comments:

---8<---
Reset PHY by pulling the NRST line for 500ms to low. To do so disable user reset for low level on NRST pin and poll the NRST level in reset status register.
--->8---

Quoted 32 lines
arch/arm/cpu/at91-common/phy.c new file +21 -0
+	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(0x0D) |
+		AT91_RSTC_MR_URSTEN, &rstc->mr);
+
+	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
+
+	/* Wait for end of hardware reset */
+	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL)) {
+		/* avoid shutdown by watchdog */
+		WATCHDOG_RESET();
+		mdelay(10);
+
+		/* timeout for not getting stuck in an endless loop */
+		if (get_timer(start) >= timeout) {
+			puts("*** ERROR: Timeout waiting for PHY reset!\n");
+			break;
+		}
+	};
+
+	/* Restore NRST value */
+	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN, &rstc->mr);
+}
arch/arm/include/asm/arch-at91/at91_common.h +1 -0
index 3ca4d5b..59e2f43 100644
@@ -26,5 +26,6 @@ void at91_plla_init(u32 pllar);
 void at91_mck_init(u32 mckr);
 void at91_pmc_init(void);
 void mem_init(void);
+void at91_phy_reset(void);
 
 #endif /* AT91_COMMON_H */

<snip>

Quoted 36 lines
board/taskit/stamp9g20/stamp9g20.c +0 -14
index 704a63b..27cdf77 100644
@@ -19,7 +19,6 @@
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_common.h>
 #include <asm/arch/at91_pmc.h>
-#include <asm/arch/at91_rstc.h>
 #include <asm/arch/gpio.h>
 #include <watchdog.h>
 
@@ -67,8 +66,6 @@ static void stamp9G20_nand_hw_init(void)
 static void stamp9G20_macb_hw_init(void)
 {
 	struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA;
-	struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC;
-	unsigned long erstl;
 
 	/* Enable the PHY Chip via PA26 on the Stamp 2 Adaptor */
 	at91_set_gpio_output(AT91_PIN_PA26, 0);
@@ -91,33 +88,7 @@ static void stamp9G20_macb_hw_init(void)
 		pin_to_mask(AT91_PIN_PA28),
 		&pioa->pudr);
 
-	erstl = readl(&rstc->mr) & AT91_RSTC_MR_ERSTL_MASK;
-
-	/* Need to reset PHY -> 500ms reset */
-	writel(AT91_RSTC_KEY | (AT91_RSTC_MR_ERSTL(13) &
-				~AT91_RSTC_MR_URSTEN), &rstc->mr);
-	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST, &rstc->cr);
-
-	/* Wait for end of hardware reset */
-	unsigned long start = get_timer(0);
-	unsigned long timeout = 1000; /* 1000ms */
-

board/taskit/stamp9g20/stamp9g20.c static void stamp9G20_macb_hw_init(void) · line 114

Quoted 10 lines
board/taskit/stamp9g20/stamp9g20.c +0 -10
-	while (!(readl(&rstc->sr) & AT91_RSTC_SR_NRSTL)) {
-
-		/* avoid shutdown by watchdog */
-		WATCHDOG_RESET();
-		mdelay(10);
-
-		/* timeout for not getting stuck in an endless loop */
-		if (get_timer(start) >= timeout) {
-			puts("*** ERROR: Timeout waiting for PHY reset!\n");
-			break;

Your code looks like this one, you should add Markus Hubig to your Copyright list.

Quoted 15 lines
board/taskit/stamp9g20/stamp9g20.c +1 -6
-		};
-	};
-
-	/* Restore NRST value */
-	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN,
-		&rstc->mr);
+	at91_phy_reset();
 
 	/* Re-enable pull-up */
 	writel(pin_to_mask(AT91_PIN_PA14) |
spl/Makefile +0 -0
index 736c6ca..cbd3d27 100644

spl/Makefile ifneq ($(CONFIG_MX23)$(CONFIG_MX35),) · line 117

Quoted 7 lines
spl/Makefile +0 -4
@@ -111,10 +111,6 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)
 LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
 endif
 
-ifeq ($(SOC),at91)
-LIBS-y += arch/$(ARCH)/cpu/at91-common/libat91-common.o
-endif
-

That should not be removed here.

Looks good to me. Hopefully some board maintainers send their tested-by ...

Best regards

Andreas Bie?mann

#2 lore raw

Hello Andreas,

Am 12.11.2013 13:56, schrieb Andreas Bie?mann:

Quoted 15 lines

Hello Heiko,

Quoted 12 lines · Heiko Schocher

add common phy reset code into a common function.

Cc Andreas Bie?mann<[email protected]>
Cc Bo Shen<[email protected]>
Cc Jens Scharsig<[email protected]>
Cc Sergey Lapin<[email protected]>
Cc Stelian Pop<[email protected]>
Cc Albin Tonnerre<[email protected]>
Cc Eric Benard<[email protected]>
Cc Markus Hubig<[email protected]>
Quoted 8 lines
Quoted 6 lines

---
Patch based on the spl patchset from Bo Shen (as I want to collect this function in at91-common directory), see:
http://lists.denx.de/pipermail/u-boot/2013-November/166272.html
(reworked this against newest Kconfig Makefile changes ...
@Bo: Do you plan an update for this patchset for the Kconfig changes?

@Bo: I'll review the patches also these days.

Perfect!

Quoted 5 lines
Quoted 3 lines

Maybe my change in arch/arm/cpu/at91-common/Makefile could be done better... Do we have a common define for all this variants?

I think not, but how about defining a new one?

I am fine with this too...

Quoted 34 lines
Quoted 34 lines
---
  arch/arm/cpu/Makefile                           |  1 +
  arch/arm/cpu/at91-common/Makefile               |  5 +++
  arch/arm/cpu/at91-common/phy.c                  | 48 +++++++++++++++++++++++++
  arch/arm/include/asm/arch-at91/at91_common.h    |  1 +
  board/BuS/vl_ma2sc/vl_ma2sc.c                   | 18 ++--------
  board/afeb9260/afeb9260.c                       | 18 +---------
  board/atmel/at91sam9260ek/at91sam9260ek.c       | 19 +---------
  board/atmel/at91sam9263ek/at91sam9263ek.c       | 19 ++--------
  board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 19 +---------
  board/bluewater/snapper9260/snapper9260.c       | 16 +--------
  board/calao/sbc35_a9g20/sbc35_a9g20.c           | 19 +---------
  board/eukrea/cpu9260/cpu9260.c                  | 18 +---------
  board/taskit/stamp9g20/stamp9g20.c              | 31 +---------------
  spl/Makefile                                    |  4 ---
  14 files changed, 66 insertions(+), 170 deletions(-)

create mode 100644 arch/arm/cpu/at91-common/phy.c

arch/arm/cpu/Makefile +1 -0
index fd0da53..886347d 100644
@@ -1,2 +1,3 @@
  obj-$(CONFIG_TEGRA) += $(SOC)-common/
  obj-$(CONFIG_TEGRA) += tegra-common/
+obj-$(CONFIG_AT91FAMILY) += at91-common/
arch/arm/cpu/at91-common/Makefile +0 -0
index 040b956..255c7b9 100644
@@ -8,5 +8,10 @@
  # SPDX-License-Identifier:	GPL-2.0+
  #
 
Quoted 8 lines

arch/arm/cpu/at91-common/Makefile line 15

Quoted 5 lines
arch/arm/cpu/at91-common/Makefile +5 -0
+obj-$(CONFIG_AT91SAM9260) += phy.o
+obj-$(CONFIG_AT91SAM9G20) += phy.o
+obj-$(CONFIG_AT91SAM9263) += phy.o
+obj-$(CONFIG_AT91SAM9XE) += phy.o
+obj-$(CONFIG_AT91SAM9M10G45) += phy.o

How about defining some CONFIG_AT91_WANTS_PHY_RESET or CONFIG_AT91_WANTS_COMMON_PHY?

I vote for CONFIG_AT91_WANTS_COMMON_PHY

Quoted 25 lines
Quoted 25 lines
arch/arm/cpu/at91-common/Makefile +0 -0
  obj-$(CONFIG_SPL_BUILD) += mpddrc.o
  obj-$(CONFIG_SPL_BUILD) += spl.o
arch/arm/cpu/at91-common/phy.c new file +17 -0
new file mode 100644
index 0000000..4706635
@@ -0,0 +1,48 @@
+/*
+ * (C) Copyright 2007-2008
+ * Stelian Pop<[email protected]>
+ * Lead Tech Design<www.leadtechdesign.com>
+ *
+ * Copyright (C) 2013 DENX Software Engineering, hs at denx.de
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include<common.h>
+#include<asm/io.h>
+#include<asm/sizes.h>
+#include<asm/arch/at91_pmc.h>
+#include<asm/arch/at91_rstc.h>
+#include<watchdog.h>
+
Quoted 8 lines

arch/arm/cpu/at91-common/phy.c line 22

Quoted 5 lines
arch/arm/cpu/at91-common/phy.c new file +5 -0
+void at91_phy_reset(void)
+{
+	unsigned long erstl;
+	unsigned long start = get_timer(0);
+	unsigned long timeout = 1000; /* 1000ms */

I'd constify timeout, it could give a hint to the compiler and it doesn't hurt here.

Ok.

Quoted 8 lines

arch/arm/cpu/at91-common/phy.c line 27

Quoted 5 lines
arch/arm/cpu/at91-common/phy.c new file +5 -0
+	at91_rstc_t *rstc = (at91_rstc_t *)ATMEL_BASE_RSTC;
+
+	erstl = readl(&rstc->mr)&  AT91_RSTC_MR_ERSTL_MASK;
+
+	/* Need to reset PHY ->  500ms reset */

As there where discussion about this trick here could you please add some comments:

Ok.

Quoted 82 lines

---8<---
Reset PHY by pulling the NRST line for 500ms to low. To do so disable user reset for low level on NRST pin and poll the NRST level in reset status register.
--->8---

Quoted 32 lines
arch/arm/cpu/at91-common/phy.c new file +21 -0
+	writel(AT91_RSTC_KEY | AT91_RSTC_MR_ERSTL(0x0D) |
+		AT91_RSTC_MR_URSTEN,&rstc->mr);
+
+	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST,&rstc->cr);
+
+	/* Wait for end of hardware reset */
+	while (!(readl(&rstc->sr)&  AT91_RSTC_SR_NRSTL)) {
+		/* avoid shutdown by watchdog */
+		WATCHDOG_RESET();
+		mdelay(10);
+
+		/* timeout for not getting stuck in an endless loop */
+		if (get_timer(start)>= timeout) {
+			puts("*** ERROR: Timeout waiting for PHY reset!\n");
+			break;
+		}
+	};
+
+	/* Restore NRST value */
+	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN,&rstc->mr);
+}
arch/arm/include/asm/arch-at91/at91_common.h +1 -0
index 3ca4d5b..59e2f43 100644
@@ -26,5 +26,6 @@ void at91_plla_init(u32 pllar);
  void at91_mck_init(u32 mckr);
  void at91_pmc_init(void);
  void mem_init(void);
+void at91_phy_reset(void);
 
  #endif /* AT91_COMMON_H */

<snip>

Quoted 41 lines
board/taskit/stamp9g20/stamp9g20.c +0 -19
index 704a63b..27cdf77 100644
@@ -19,7 +19,6 @@
  #include<asm/arch/at91sam9_smc.h>
  #include<asm/arch/at91_common.h>
  #include<asm/arch/at91_pmc.h>
-#include<asm/arch/at91_rstc.h>
  #include<asm/arch/gpio.h>
  #include<watchdog.h>
 
@@ -67,8 +66,6 @@ static void stamp9G20_nand_hw_init(void)
  static void stamp9G20_macb_hw_init(void)
  {
  	struct at91_port *pioa = (struct at91_port *)ATMEL_BASE_PIOA;
-	struct at91_rstc *rstc = (struct at91_rstc *)ATMEL_BASE_RSTC;
-	unsigned long erstl;
 
  	/* Enable the PHY Chip via PA26 on the Stamp 2 Adaptor */
  	at91_set_gpio_output(AT91_PIN_PA26, 0);
@@ -91,33 +88,7 @@ static void stamp9G20_macb_hw_init(void)
  		pin_to_mask(AT91_PIN_PA28),
  		&pioa->pudr);
 
-	erstl = readl(&rstc->mr)&  AT91_RSTC_MR_ERSTL_MASK;
-
-	/* Need to reset PHY ->  500ms reset */
-	writel(AT91_RSTC_KEY | (AT91_RSTC_MR_ERSTL(13)&
-				~AT91_RSTC_MR_URSTEN),&rstc->mr);
-	writel(AT91_RSTC_KEY | AT91_RSTC_CR_EXTRST,&rstc->cr);
-
-	/* Wait for end of hardware reset */
-	unsigned long start = get_timer(0);
-	unsigned long timeout = 1000; /* 1000ms */
-
-	while (!(readl(&rstc->sr)&  AT91_RSTC_SR_NRSTL)) {
-
-		/* avoid shutdown by watchdog */
-		WATCHDOG_RESET();
-		mdelay(10);
Quoted 8 lines

board/taskit/stamp9g20/stamp9g20.c static void stamp9G20_macb_hw_init(void) · line 114

Quoted 5 lines
board/taskit/stamp9g20/stamp9g20.c +0 -5
-
-		/* timeout for not getting stuck in an endless loop */
-		if (get_timer(start)>= timeout) {
-			puts("*** ERROR: Timeout waiting for PHY reset!\n");
-			break;

Your code looks like this one, you should add Markus Hubig to your Copyright list.

Ok.

Quoted 18 lines
Quoted 18 lines
board/taskit/stamp9g20/stamp9g20.c +1 -6
-		};
-	};
-
-	/* Restore NRST value */
-	writel(AT91_RSTC_KEY | erstl | AT91_RSTC_MR_URSTEN,
-		&rstc->mr);
+	at91_phy_reset();
 
  	/* Re-enable pull-up */
  	writel(pin_to_mask(AT91_PIN_PA14) |
spl/Makefile +0 -0
index 736c6ca..cbd3d27 100644
@@ -111,10 +111,6 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)
  LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
  endif
 
Quoted 6 lines

spl/Makefile ifneq ($(CONFIG_MX23)$(CONFIG_MX35),) · line 117

Quoted 4 lines
spl/Makefile +0 -4
-ifeq ($(SOC),at91)
-LIBS-y += arch/$(ARCH)/cpu/at91-common/libat91-common.o
-endif
-

That should not be removed here.

See my change in arch/arm/cpu/Makefile

With this change, this in the spl/Makefile is not needed ... I did this, because arch/arm/cpu/at91-common/ contains not only spl code. But maybe this should be changed in the spl patchset from bo?

Quoted 1 line

Looks good to me. Hopefully some board maintainers send their tested-by ...

I am too...

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#3 lore raw

Hi Heiko,

Quoted 26 lines · Heiko Schocher

Hello Andreas,

Am 12.11.2013 13:56, schrieb Andreas Bie?mann:

Quoted 23 lines

Hello Heiko,

Quoted 12 lines · Heiko Schocher

add common phy reset code into a common function.

Cc Andreas Bie?mann<[email protected]>
Cc Bo Shen<[email protected]>
Cc Jens Scharsig<[email protected]>
Cc Sergey Lapin<[email protected]>
Cc Stelian Pop<[email protected]>
Cc Albin Tonnerre<[email protected]>
Cc Eric Benard<[email protected]>
Cc Markus Hubig<[email protected]>
Quoted 6 lines

---
Patch based on the spl patchset from Bo Shen (as I want to collect this function in at91-common directory), see:
http://lists.denx.de/pipermail/u-boot/2013-November/166272.html
(reworked this against newest Kconfig Makefile changes ...
@Bo: Do you plan an update for this patchset for the Kconfig changes?

@Bo: I'll review the patches also these days.

After Andreas finish reviewing the code, I will update this patchset for the Kconfig changes if needed.

Quoted 37 lines

Perfect!

Quoted 5 lines
Quoted 3 lines

Maybe my change in arch/arm/cpu/at91-common/Makefile could be done better... Do we have a common define for all this variants?

I think not, but how about defining a new one?

I am fine with this too...

Quoted 27 lines
Quoted 27 lines
---
  arch/arm/cpu/Makefile                           |  1 +
  arch/arm/cpu/at91-common/Makefile               |  5 +++
  arch/arm/cpu/at91-common/phy.c                  | 48
+++++++++++++++++++++++++
  arch/arm/include/asm/arch-at91/at91_common.h    |  1 +
  board/BuS/vl_ma2sc/vl_ma2sc.c                   | 18 ++--------
  board/afeb9260/afeb9260.c                       | 18 +---------
  board/atmel/at91sam9260ek/at91sam9260ek.c       | 19 +---------
  board/atmel/at91sam9263ek/at91sam9263ek.c       | 19 ++--------
  board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 19 +---------
  board/bluewater/snapper9260/snapper9260.c       | 16 +--------
  board/calao/sbc35_a9g20/sbc35_a9g20.c           | 19 +---------
  board/eukrea/cpu9260/cpu9260.c                  | 18 +---------
  board/taskit/stamp9g20/stamp9g20.c              | 31 +---------------
  spl/Makefile                                    |  4 ---
  14 files changed, 66 insertions(+), 170 deletions(-)

create mode 100644 arch/arm/cpu/at91-common/phy.c

arch/arm/cpu/Makefile +1 -0
index fd0da53..886347d 100644
@@ -1,2 +1,3 @@
  obj-$(CONFIG_TEGRA) += $(SOC)-common/
  obj-$(CONFIG_TEGRA) += tegra-common/
+obj-$(CONFIG_AT91FAMILY) += at91-common/

<snip>

Quoted 15 lines
Quoted 8 lines
Quoted 8 lines
spl/Makefile +0 -0
index 736c6ca..cbd3d27 100644
@@ -111,10 +111,6 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)
  LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o
  endif
 
Quoted 6 lines

spl/Makefile ifneq ($(CONFIG_MX23)$(CONFIG_MX35),) · line 117

Quoted 4 lines
spl/Makefile +0 -4
-ifeq ($(SOC),at91)
-LIBS-y += arch/$(ARCH)/cpu/at91-common/libat91-common.o
-endif
-

That should not be removed here.

Quoted 6 lines

See my change in arch/arm/cpu/Makefile

With this change, this in the spl/Makefile is not needed ... I did this, because arch/arm/cpu/at91-common/ contains not only spl code. But maybe this should be changed in the spl patchset from bo?

I am not fully got your means. what should I change?

Quoted 7 lines
Quoted 2 lines

Looks good to me. Hopefully some board maintainers send their tested-by ...

I am too...

bye,
Heiko

Best Regards,
Bo Shen

#4 lore raw

Hello Bo,

Am 13.11.2013 02:35, schrieb Bo Shen:

Quoted 28 lines

Hi Heiko,

Quoted 25 lines · Heiko Schocher

Hello Andreas,

Am 12.11.2013 13:56, schrieb Andreas Bie?mann:

Quoted 22 lines

Hello Heiko,

Quoted 18 lines · Heiko Schocher

add common phy reset code into a common function.

Cc Andreas Bie?mann<[email protected]>
Cc Bo Shen<[email protected]>
Cc Jens Scharsig<[email protected]>
Cc Sergey Lapin<[email protected]>
Cc Stelian Pop<[email protected]>
Cc Albin Tonnerre<[email protected]>
Cc Eric Benard<[email protected]>
Cc Markus Hubig<[email protected]>

---
Patch based on the spl patchset from Bo Shen (as I want to collect this function in at91-common directory), see:
http://lists.denx.de/pipermail/u-boot/2013-November/166272.html
(reworked this against newest Kconfig Makefile changes ... @Bo: Do you plan an update for this patchset for the Kconfig changes?

Quoted 3 lines
Quoted 1 line
Quoted 1 line

@Bo: I'll review the patches also these days.

After Andreas finish reviewing the code, I will update this patchset for the Kconfig changes if needed.

Great, so I wait for your update, before I sent my updated patch, thanks!

Quoted 55 lines
Quoted 37 lines

Perfect!

Quoted 5 lines
Quoted 3 lines

Maybe my change in arch/arm/cpu/at91-common/Makefile could be done better... Do we have a common define for all this variants?

I think not, but how about defining a new one?

I am fine with this too...

Quoted 27 lines
Quoted 27 lines

---
arch/arm/cpu/Makefile | 1 + arch/arm/cpu/at91-common/Makefile | 5 +++ arch/arm/cpu/at91-common/phy.c | 48
+++++++++++++++++++++++++
arch/arm/include/asm/arch-at91/at91_common.h | 1 + board/BuS/vl_ma2sc/vl_ma2sc.c | 18 ++-------- board/afeb9260/afeb9260.c | 18 +--------- board/atmel/at91sam9260ek/at91sam9260ek.c | 19 +--------- board/atmel/at91sam9263ek/at91sam9263ek.c | 19 ++-------- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 19 +--------- board/bluewater/snapper9260/snapper9260.c | 16 +-------- board/calao/sbc35_a9g20/sbc35_a9g20.c | 19 +--------- board/eukrea/cpu9260/cpu9260.c | 18 +--------- board/taskit/stamp9g20/stamp9g20.c | 31 +--------------- spl/Makefile | 4 ---

14 files changed, 66 insertions(+), 170 deletions(-)

create mode 100644 arch/arm/cpu/at91-common/phy.c

arch/arm/cpu/Makefile +0 -0
index fd0da53..886347d 100644
@@ -1,2 +1,3 @@

obj-$(CONFIG_TEGRA) += $(SOC)-common/
obj-$(CONFIG_TEGRA) += tegra-common/
+obj-$(CONFIG_AT91FAMILY) += at91-common/

<snip>

Quoted 15 lines
Quoted 14 lines

spl/Makefile ifneq ($(CONFIG_MX23)$(CONFIG_MX35),) · line 117

Quoted 12 lines
spl/Makefile +0 -0
index 736c6ca..cbd3d27 100644
@@ -111,10 +111,6 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)

LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o endif

spl/Makefile +0 -4
-ifeq ($(SOC),at91)
-LIBS-y += arch/$(ARCH)/cpu/at91-common/libat91-common.o
-endif
-

That should not be removed here.

Quoted 8 lines
Quoted 6 lines

See my change in arch/arm/cpu/Makefile

With this change, this in the spl/Makefile is not needed ... I did this, because arch/arm/cpu/at91-common/ contains not only spl code. But maybe this should be changed in the spl patchset from bo?

I am not fully got your means. what should I change?

Could you add to your patchset the following change?

Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
arch/arm/cpu/Makefile +0 -0
index fd0da53..886347d 100644
@@ -1,2 +1,3 @@

obj-$(CONFIG_TEGRA) += $(SOC)-common/
obj-$(CONFIG_TEGRA) += tegra-common/

arch/arm/cpu/Makefile +1 -0
+obj-$(CONFIG_AT91FAMILY) += at91-common/
spl/Makefile +0 -0
index 736c6ca..cbd3d27 100644
@@ -111,10 +111,6 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)

LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o endif

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

spl/Makefile ifneq ($(CONFIG_MX23)$(CONFIG_MX35),) · line 117

Quoted 4 lines
spl/Makefile +0 -4
-ifeq ($(SOC),at91)
-LIBS-y += arch/$(ARCH)/cpu/at91-common/libat91-common.o
-endif
-

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#5 lore raw

Hi Heiko,

Quoted 96 lines · Heiko Schocher

Hello Bo,

Am 13.11.2013 02:35, schrieb Bo Shen:

Quoted 28 lines

Hi Heiko,

Quoted 25 lines · Heiko Schocher

Hello Andreas,

Am 12.11.2013 13:56, schrieb Andreas Bie?mann:

Quoted 22 lines

Hello Heiko,

Quoted 18 lines · Heiko Schocher

add common phy reset code into a common function.

Cc Andreas Bie?mann<[email protected]>
Cc Bo Shen<[email protected]>
Cc Jens Scharsig<[email protected]>
Cc Sergey Lapin<[email protected]>
Cc Stelian Pop<[email protected]>
Cc Albin Tonnerre<[email protected]>
Cc Eric Benard<[email protected]>
Cc Markus Hubig<[email protected]>

---
Patch based on the spl patchset from Bo Shen (as I want to collect this function in at91-common directory), see:
http://lists.denx.de/pipermail/u-boot/2013-November/166272.html
(reworked this against newest Kconfig Makefile changes ... @Bo: Do you plan an update for this patchset for the Kconfig changes?

Quoted 4 lines
Quoted 1 line
Quoted 1 line

@Bo: I'll review the patches also these days.

After Andreas finish reviewing the code, I will update this patchset for the Kconfig changes if needed.

Great, so I wait for your update, before I sent my updated patch, thanks!

Quoted 57 lines
Quoted 37 lines

Perfect!

Quoted 5 lines
Quoted 3 lines

Maybe my change in arch/arm/cpu/at91-common/Makefile could be done better... Do we have a common define for all this variants?

I think not, but how about defining a new one?

I am fine with this too...

Quoted 27 lines
Quoted 27 lines

---
arch/arm/cpu/Makefile | 1 + arch/arm/cpu/at91-common/Makefile | 5 +++ arch/arm/cpu/at91-common/phy.c | 48
+++++++++++++++++++++++++
arch/arm/include/asm/arch-at91/at91_common.h | 1 + board/BuS/vl_ma2sc/vl_ma2sc.c | 18 ++-------- board/afeb9260/afeb9260.c | 18 +--------- board/atmel/at91sam9260ek/at91sam9260ek.c | 19 +--------- board/atmel/at91sam9263ek/at91sam9263ek.c | 19 ++-------- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 19 +--------- board/bluewater/snapper9260/snapper9260.c | 16 +-------- board/calao/sbc35_a9g20/sbc35_a9g20.c | 19 +--------- board/eukrea/cpu9260/cpu9260.c | 18 +--------- board/taskit/stamp9g20/stamp9g20.c | 31 +--------------- spl/Makefile | 4 ---

14 files changed, 66 insertions(+), 170 deletions(-)

create mode 100644 arch/arm/cpu/at91-common/phy.c

arch/arm/cpu/Makefile +0 -0
index fd0da53..886347d 100644
@@ -1,2 +1,3 @@

obj-$(CONFIG_TEGRA) += $(SOC)-common/
obj-$(CONFIG_TEGRA) += tegra-common/
+obj-$(CONFIG_AT91FAMILY) += at91-common/

<snip>

Quoted 17 lines
Quoted 8 lines
Quoted 8 lines
spl/Makefile +0 -0
index 736c6ca..cbd3d27 100644
@@ -111,10 +111,6 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)

LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o endif

Quoted 6 lines

spl/Makefile ifneq ($(CONFIG_MX23)$(CONFIG_MX35),) · line 117

Quoted 4 lines
spl/Makefile +0 -4
-ifeq ($(SOC),at91)
-LIBS-y += arch/$(ARCH)/cpu/at91-common/libat91-common.o
-endif
-

That should not be removed here.

See my change in arch/arm/cpu/Makefile

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

With this change, this in the spl/Makefile is not needed ... I did this, because arch/arm/cpu/at91-common/ contains not only spl code. But maybe this should be changed in the spl patchset from bo?

I am not fully got your means. what should I change?

Could you add to your patchset the following change?

OK. I will add this after reviewing.
Thanks.

Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
arch/arm/cpu/Makefile +0 -0
index fd0da53..886347d 100644
@@ -1,2 +1,3 @@

obj-$(CONFIG_TEGRA) += $(SOC)-common/
obj-$(CONFIG_TEGRA) += tegra-common/

arch/arm/cpu/Makefile +1 -0
+obj-$(CONFIG_AT91FAMILY) += at91-common/
spl/Makefile +0 -0
index 736c6ca..cbd3d27 100644
@@ -111,10 +111,6 @@ ifneq ($(CONFIG_MX23)$(CONFIG_MX35),)

LIBS-y += arch/$(ARCH)/imx-common/libimx-common.o endif

Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

spl/Makefile ifneq ($(CONFIG_MX23)$(CONFIG_MX35),) · line 117

Quoted 4 lines
spl/Makefile +0 -4
-ifeq ($(SOC),at91)
-LIBS-y += arch/$(ARCH)/cpu/at91-common/libat91-common.o
-endif
-

bye,
Heiko

Best Regards,
Bo Shen