Hello Wenyou,

Am 09.12.2015 um 08:57 schrieb Wenyou Yang:
Due to introducing the UTMI PLL enable function, use this function
to reduce the duplicated code.

Signed-off-by: Wenyou Yang <[email protected]>
---

Changes in v2: None

  arch/arm/mach-at91/armv7/sama5d2_devices.c |    5 +----
  arch/arm/mach-at91/armv7/sama5d3_devices.c |    5 +----
  arch/arm/mach-at91/armv7/sama5d4_devices.c |    5 +----
  3 files changed, 3 insertions(+), 12 deletions(-)

Tested on the smartweb board, see log:
http://xeidos.ddns.net/buildbot/builders/smartweb_dfu/builds/29/steps/shell/logs/tbotlog

Tested-by: Heiko Schocher <[email protected]>

bye,
Heiko

diff --git a/arch/arm/mach-at91/armv7/sama5d2_devices.c 
b/arch/arm/mach-at91/armv7/sama5d2_devices.c
index 88f8f2c..978eac2 100644
--- a/arch/arm/mach-at91/armv7/sama5d2_devices.c
+++ b/arch/arm/mach-at91/armv7/sama5d2_devices.c
@@ -7,7 +7,6 @@

  #include <common.h>
  #include <asm/io.h>
-#include <asm/arch/at91_pmc.h>
  #include <asm/arch/clk.h>
  #include <asm/arch/sama5d2.h>

@@ -48,9 +47,7 @@ char *get_cpu_name()
  #ifdef CONFIG_USB_GADGET_ATMEL_USBA
  void at91_udp_hw_init(void)
  {
-       struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
-
-       writel(AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr);
+       at91_upll_clk_enable();

        at91_periph_clk_enable(ATMEL_ID_UDPHS);
  }
diff --git a/arch/arm/mach-at91/armv7/sama5d3_devices.c 
b/arch/arm/mach-at91/armv7/sama5d3_devices.c
index 78ecfc8..64ac262 100644
--- a/arch/arm/mach-at91/armv7/sama5d3_devices.c
+++ b/arch/arm/mach-at91/armv7/sama5d3_devices.c
@@ -8,7 +8,6 @@
  #include <common.h>
  #include <asm/arch/sama5d3.h>
  #include <asm/arch/at91_common.h>
-#include <asm/arch/at91_pmc.h>
  #include <asm/arch/clk.h>
  #include <asm/arch/gpio.h>
  #include <asm/io.h>
@@ -208,10 +207,8 @@ void at91_lcd_hw_init(void)
  #ifdef CONFIG_USB_GADGET_ATMEL_USBA
  void at91_udp_hw_init(void)
  {
-       struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
-
        /* Enable UPLL clock */
-       writel(AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr);
+       at91_upll_clk_enable();
        /* Enable UDPHS clock */
        at91_periph_clk_enable(ATMEL_ID_UDPHS);
  }
diff --git a/arch/arm/mach-at91/armv7/sama5d4_devices.c 
b/arch/arm/mach-at91/armv7/sama5d4_devices.c
index ce33cd4..ebb779e 100644
--- a/arch/arm/mach-at91/armv7/sama5d4_devices.c
+++ b/arch/arm/mach-at91/armv7/sama5d4_devices.c
@@ -8,7 +8,6 @@
  #include <common.h>
  #include <asm/io.h>
  #include <asm/arch/at91_common.h>
-#include <asm/arch/at91_pmc.h>
  #include <asm/arch/clk.h>
  #include <asm/arch/sama5_sfr.h>
  #include <asm/arch/sama5d4.h>
@@ -37,10 +36,8 @@ char *get_cpu_name()
  #ifdef CONFIG_USB_GADGET_ATMEL_USBA
  void at91_udp_hw_init(void)
  {
-       struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
-
        /* Enable UPLL clock */
-       writel(AT91_PMC_UPLLEN | AT91_PMC_BIASEN, &pmc->uckr);
+       at91_upll_clk_enable();
        /* Enable UDPHS clock */
        at91_periph_clk_enable(ATMEL_ID_UDPHS);
  }


--
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
_______________________________________________
U-Boot mailing list
[email protected]
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to