arm926ejs, at91: add common phy_reset function
Subsystems (2)
PATCH v2 1/1 arm926ejs, at91: add common phy_reset function
add common phy reset code into a common function.
---
- changes for v2:
- add comment from Andreas Bie?mann:
- constify timeout
- add some more comment
- add Markus Hubig to Copyright
- removed makefile changes
- add CONFIG_AT91_WANTS_COMMON_PHY
- rebased against commit c2e5e802ecb7ab668ce9911b210ed68c804b349f
- Patch based on the spl v4 patchset from Bo Shen, see:
http://lists.denx.de/pipermail/u-boot/2013-November/167235.html --- arch/arm/cpu/at91-common/Makefile | 1 + arch/arm/cpu/at91-common/phy.c | 57 +++++++++++++++++++++++++ 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 +------------- include/configs/afeb9260.h | 2 +- include/configs/at91sam9260ek.h | 1 + include/configs/at91sam9263ek.h | 1 + include/configs/at91sam9m10g45ek.h | 1 + include/configs/cpu9260.h | 1 + include/configs/sbc35_a9g20.h | 1 + include/configs/snapper9260.h | 1 + include/configs/stamp9g20.h | 1 + include/configs/vl_ma2sc.h | 1 + 21 files changed, 79 insertions(+), 167 deletions(-) create mode 100644 arch/arm/cpu/at91-common/phy.c
arch/arm/cpu/at91-common/Makefile +1 -0
@@ -8,4 +8,5 @@ # SPDX-License-Identifier: GPL-2.0+ # +obj-$(CONFIG_AT91_WANTS_COMMON_PHY) += phy.o obj-$(CONFIG_SPL_BUILD) += mpddrc.o spl.o
arch/arm/cpu/at91-common/phy.c new file +57 -0
57 lines not on this page · raw message
arch/arm/include/asm/arch-at91/at91_common.h +1 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) |
include/configs/afeb9260.h +1 -1
@@ -106,7 +106,7 @@/* Ethernet */ #define CONFIG_MACB #define CONFIG_RESET_PHY_R - +#define CONFIG_AT91_WANTS_COMMON_PHY #define CONFIG_NET_RETRY_COUNT 20/* USB */
include/configs/at91sam9260ek.h +1 -0
@@ -181,6 +181,7 @@#define CONFIG_RMII 1#define CONFIG_NET_RETRY_COUNT 20#define CONFIG_RESET_PHY_R 1 +#define CONFIG_AT91_WANTS_COMMON_PHY /* USB */ #define CONFIG_USB_ATMEL
include/configs/at91sam9263ek.h +1 -0
@@ -275,6 +275,7 @@#define CONFIG_RMII 1#define CONFIG_NET_RETRY_COUNT 20#define CONFIG_RESET_PHY_R 1 +#define CONFIG_AT91_WANTS_COMMON_PHY /* USB */ #define CONFIG_USB_ATMEL
include/configs/at91sam9m10g45ek.h +1 -0
@@ -120,6 +120,7 @@#define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20#define CONFIG_RESET_PHY_R +#define CONFIG_AT91_WANTS_COMMON_PHY /* USB */ #define CONFIG_USB_EHCI
include/configs/cpu9260.h +1 -0
@@ -310,6 +310,7 @@#define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20#define CONFIG_MACB_SEARCH_PHY +#define CONFIG_AT91_WANTS_COMMON_PHY /* LEDS */ /* Status LED */
include/configs/sbc35_a9g20.h +1 -0
@@ -115,6 +115,7 @@#define CONFIG_NET_RETRY_COUNT 20#define CONFIG_RESET_PHY_R #define CONFIG_MACB_SEARCH_PHY +#define CONFIG_AT91_WANTS_COMMON_PHY /* USB */ #define CONFIG_USB_ATMEL
include/configs/snapper9260.h +1 -0
@@ -59,6 +59,7 @@#define CONFIG_RMII #define CONFIG_NET_RETRY_COUNT 20#define CONFIG_RESET_PHY_R +#define CONFIG_AT91_WANTS_COMMON_PHY #define CONFIG_TFTP_PORT #define CONFIG_TFTP_TSIZE
include/configs/stamp9g20.h +1 -0
@@ -145,6 +145,7 @@#ifdef CONFIG_MACB # define CONFIG_RMII /* use reduced MII inteface */ # define CONFIG_NET_RETRY_COUNT 20/* # of DHCP/BOOTP retries */ +#define CONFIG_AT91_WANTS_COMMON_PHY /* BOOTP and DHCP options */ # define CONFIG_BOOTP_BOOTFILESIZE
include/configs/vl_ma2sc.h +1 -0
@@ -330,6 +330,7 @@#define CONFIG_RMII #define CONFIG_NET_MULTI #define CONFIG_NET_RETRY_COUNT 5 +#define CONFIG_AT91_WANTS_COMMON_PHY #define CONFIG_OVERWRITE_ETHADDR_ONCE
Signature · 1 line
1.8.3.1
PATCH v2 1/1 arm926ejs, at91: add common phy_reset function
Am 2013-11-18 08:07, schrieb Heiko Schocher:
Quoted 39 lines
add common phy reset code into a common function.
Signed-off-by Heiko Schocher <[email protected]>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]>---
- changes for v2:
- add comment from Andreas Bie?mann:
- constify timeout
- add some more comment
- add Markus Hubig to Copyright
- removed makefile changes
- addCONFIG_AT91_WANTS_COMMON_PHY
- rebased against commitc2e5e802ecb7ab668ce9911b210ed68c804b349f
- Patch based on the spl v4 patchset from Bo Shen, see:http://lists.denx.de/pipermail/u-boot/2013-November/167235.html --- arch/arm/cpu/at91-common/Makefile | 1 + arch/arm/cpu/at91-common/phy.c | 57 +++++++++++++++++++++++++ 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 +------------- include/configs/afeb9260.h | 2 +- include/configs/at91sam9260ek.h | 1 + include/configs/at91sam9263ek.h | 1 +
Quoted 9 lines
include/configs/at91sam9m10g45ek.h | 1 + include/configs/cpu9260.h | 1 + include/configs/sbc35_a9g20.h | 1 + include/configs/snapper9260.h | 1 + include/configs/stamp9g20.h | 1 + include/configs/vl_ma2sc.h | 1 + 21 files changed, 79 insertions(+), 167 deletions(-) create mode 100644 arch/arm/cpu/at91-common/phy.c
I have successfully tested this patch for vl_ma2sc, so:
PATCH v2 1/1 arm926ejs, at91: add common phy_reset function
Hello Jens,
Am 18.11.2013 10:00, schrieb esw at bus-elektronik.de:
Quoted 49 lines
Am 2013-11-18 08:07, schrieb Heiko Schocher:
Quoted 46 lines
add common phy reset code into a common function.
Signed-off-by Heiko Schocher<[email protected]>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]>---
- changes for v2:
- add comment from Andreas Bie?mann:
- constify timeout
- add some more comment
- add Markus Hubig to Copyright
- removed makefile changes
- addCONFIG_AT91_WANTS_COMMON_PHY
- rebased against commitc2e5e802ecb7ab668ce9911b210ed68c804b349f
- Patch based on the spl v4 patchset from Bo Shen, see:http://lists.denx.de/pipermail/u-boot/2013-November/167235.html --- arch/arm/cpu/at91-common/Makefile | 1 + arch/arm/cpu/at91-common/phy.c | 57 +++++++++++++++++++++++++ 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 +------------- include/configs/afeb9260.h | 2 +- include/configs/at91sam9260ek.h | 1 + include/configs/at91sam9263ek.h | 1 + include/configs/at91sam9m10g45ek.h | 1 + include/configs/cpu9260.h | 1 + include/configs/sbc35_a9g20.h | 1 + include/configs/snapper9260.h | 1 + include/configs/stamp9g20.h | 1 + include/configs/vl_ma2sc.h | 1 + 21 files changed, 79 insertions(+), 167 deletions(-)Quoted 2 lines
create mode 100644
arch/arm/cpu/at91-common/phy.c
Quoted 4 lines
I have successfully tested this patch for
vl_ma2sc, so:
Thanks for testing!
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH v2 1/1 arm926ejs, at91: add common phy_reset function
In reply to Heiko SchocherHi Heiko,
Quoted 46 lines · Heiko Schocher
add common phy reset code into a common function.
Signed-off-by Heiko Schocher <[email protected]>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]>---
- changes for v2:
- add comment from Andreas Bie?mann:
- constify timeout
- add some more comment
- add Markus Hubig to Copyright
- removed makefile changes
- addCONFIG_AT91_WANTS_COMMON_PHY
- rebased against commitc2e5e802ecb7ab668ce9911b210ed68c804b349f
- Patch based on the spl v4 patchset from Bo Shen, see:http://lists.denx.de/pipermail/u-boot/2013-November/167235.html --- arch/arm/cpu/at91-common/Makefile | 1 + arch/arm/cpu/at91-common/phy.c | 57 +++++++++++++++++++++++++ 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 +------------- include/configs/afeb9260.h | 2 +- include/configs/at91sam9260ek.h | 1 + include/configs/at91sam9263ek.h | 1 + include/configs/at91sam9m10g45ek.h | 1 + include/configs/cpu9260.h | 1 + include/configs/sbc35_a9g20.h | 1 + include/configs/snapper9260.h | 1 + include/configs/stamp9g20.h | 1 + include/configs/vl_ma2sc.h | 1 + 21 files changed, 79 insertions(+), 167 deletions(-)
Quoted 1 line
create mode 100644
arch/arm/cpu/at91-common/phy.c
Test OK on at91sam9m10g45ek board.
Best Regards,
Bo Shen
PATCH v2 1/1 arm926ejs, at91: add common phy_reset function
In reply to Heiko SchocherDear Heiko Schocher,
Quoted 50 lines · Heiko Schocher
add common phy reset code into a common function.
Signed-off-by Heiko Schocher <[email protected]>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]>Tested-by Bo Shen <[email protected]>Acked-by Bo Shen <[email protected]>---
- changes for v2:
- add comment from Andreas Bie?mann:
- constify timeout
- add some more comment
- add Markus Hubig to Copyright
- removed makefile changes
- addCONFIG_AT91_WANTS_COMMON_PHY
- rebased against commitc2e5e802ecb7ab668ce9911b210ed68c804b349f
- Patch based on the spl v4 patchset from Bo Shen, see:http://lists.denx.de/pipermail/u-boot/2013-November/167235.html --- arch/arm/cpu/at91-common/Makefile | 1 + arch/arm/cpu/at91-common/phy.c | 57 +++++++++++++++++++++++++ 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 +------------- include/configs/afeb9260.h | 2 +- include/configs/at91sam9260ek.h | 1 + include/configs/at91sam9263ek.h | 1 + include/configs/at91sam9m10g45ek.h | 1 + include/configs/cpu9260.h | 1 + include/configs/sbc35_a9g20.h | 1 + include/configs/snapper9260.h | 1 + include/configs/stamp9g20.h | 1 + include/configs/vl_ma2sc.h | 1 + 21 files changed, 79 insertions(+), 167 deletions(-)
Quoted 1 line
create mode 100644
arch/arm/cpu/at91-common/phy.c
applied to u-boot-atmel/master, thanks!
Best regards,
Andreas Bie?mann