diff options
Diffstat (limited to 'arch/arm/boards/animeo_ip/init.c')
| -rw-r--r-- | arch/arm/boards/animeo_ip/init.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/arch/arm/boards/animeo_ip/init.c b/arch/arm/boards/animeo_ip/init.c index 847417398a..07daaf4ffd 100644 --- a/arch/arm/boards/animeo_ip/init.c +++ b/arch/arm/boards/animeo_ip/init.c @@ -24,7 +24,6 @@ #include <mach/at91sam9_smc.h> #include <gpio.h> #include <mach/iomux.h> -#include <mach/io.h> #include <mach/at91_pmc.h> #include <mach/at91_rstc.h> #include <local_mac_address.h> @@ -231,30 +230,12 @@ static void animeo_ip_power_control(void) static void animeo_ip_phy_reset(void) { - unsigned long rstc; int i; - struct clk *clk = clk_get(NULL, "macb_clk"); - - clk_enable(clk); for (i = AT91_PIN_PA12; i <= AT91_PIN_PA29; i++) at91_set_gpio_input(i, 0); - 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)) | - AT91_RSTC_URSTEN); - - at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_EXTRST); - - /* Wait for end hardware reset */ - while (!(at91_sys_read(AT91_RSTC_SR) & AT91_RSTC_NRSTL)) - ; - - /* Restore NRST value */ - at91_sys_write(AT91_RSTC_MR, AT91_RSTC_KEY | (rstc) | AT91_RSTC_URSTEN); + at91sam_phy_reset(IOMEM(AT91SAM9260_BASE_RSTC)); } #define MACB_SA1B 0x0098 @@ -345,7 +326,7 @@ static void animeo_ip_shutdown(void) * so linux can detect that we only enable the uart2 * and use it for decompress */ - animeo_ip_shutdown_uart(IOMEM(AT91_DBGU + AT91_BASE_SYS)); + animeo_ip_shutdown_uart(IOMEM(AT91SAM9260_BASE_DBGU)); animeo_ip_shutdown_uart(IOMEM(AT91SAM9260_BASE_US0)); animeo_ip_shutdown_uart(IOMEM(AT91SAM9260_BASE_US1)); } |