All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wenyou Yang <wenyou.yang@atmel.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v3 5/5] drivers: at91: clean up peripheral clock code
Date: Thu, 10 Dec 2015 10:20:53 +0800	[thread overview]
Message-ID: <1449714053-26416-6-git-send-email-wenyou.yang@atmel.com> (raw)
In-Reply-To: <1449714053-26416-1-git-send-email-wenyou.yang@atmel.com>

Due to introducing the new peripheral clock handle functions,
use these functions to reduce the duplicated code.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---

Changes in v3: None
Changes in v2: None

 drivers/net/at91_emac.c       |    9 ++++-----
 drivers/usb/host/ehci-atmel.c |    8 --------
 drivers/usb/host/ohci-at91.c  |   20 ++++----------------
 3 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index d51e098..bb6866d 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -12,7 +12,6 @@
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_emac.h>
-#include <asm/arch/at91_pmc.h>
 #include <asm/arch/at91_pio.h>
 #include <net.h>
 #include <netdev.h>
@@ -321,7 +320,6 @@ static int at91emac_init(struct eth_device *netdev, bd_t *bd)
 	emac_device *dev;
 	at91_emac_t *emac;
 	at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
-	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
 
 	emac = (at91_emac_t *) netdev->iobase;
 	dev = (emac_device *) netdev->priv;
@@ -347,7 +345,8 @@ static int at91emac_init(struct eth_device *netdev, bd_t *bd)
 	writel(value, &pio->piob.pdr);
 	writel(value, &pio->piob.bsr);
 
-	writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
+	at91_periph_clk_enable(ATMEL_ID_EMAC);
+
 	writel(readl(&emac->ctl) | AT91_EMAC_CTL_CSR, &emac->ctl);
 
 	/* Init Ethernet buffers */
@@ -452,10 +451,10 @@ static int at91emac_recv(struct eth_device *netdev)
 static int at91emac_write_hwaddr(struct eth_device *netdev)
 {
 	at91_emac_t *emac;
-	at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC;
 	emac = (at91_emac_t *) netdev->iobase;
 
-	writel(1 << ATMEL_ID_EMAC, &pmc->pcer);
+	at91_periph_clk_enable(ATMEL_ID_EMAC);
+
 	debug_cond(DEBUG_AT91EMAC,
 		"init MAC-ADDR %02x:%02x:%02x:%02x:%02x:%02x\n",
 		netdev->enetaddr[5], netdev->enetaddr[4], netdev->enetaddr[3],
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 9a8f004..a33fb49 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -40,11 +40,7 @@ int ehci_hcd_init(int index, enum usb_init_type init,
 	}
 
 	/* Enable USB Host clock */
-#ifdef CPU_HAS_PCR
 	at91_periph_clk_enable(ATMEL_ID_UHPHS);
-#else
-	writel(1 << ATMEL_ID_UHPHS, &pmc->pcer);
-#endif
 
 	*hccr = (struct ehci_hccr *)ATMEL_BASE_EHCI;
 	*hcor = (struct ehci_hcor *)((uint32_t)*hccr +
@@ -59,11 +55,7 @@ int ehci_hcd_stop(int index)
 	ulong start_time, tmp_time;
 
 	/* Disable USB Host Clock */
-#ifdef CPU_HAS_PCR
 	at91_periph_clk_disable(ATMEL_ID_UHPHS);
-#else
-	writel(1 << ATMEL_ID_UHPHS, &pmc->pcdr);
-#endif
 
 	start_time = get_timer(0);
 	/* Disable UTMI PLL */
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 820e2e5..da85111 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -37,17 +37,11 @@ int usb_cpu_init(void)
 	writel(AT91_PMC_USBS_USB_UPLL | AT91_PMC_USBDIV_10, &pmc->usb);
 #endif
 
-	/* Enable USB host clock. */
-#ifdef CPU_HAS_PCR
 	at91_periph_clk_enable(ATMEL_ID_UHP);
-#else
-	writel(1 << ATMEL_ID_UHP, &pmc->pcer);
-#endif
 
+	at91_system_clk_enable(ATMEL_PMC_UHP);
 #if defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10)
-	writel(ATMEL_PMC_UHP | AT91_PMC_HCK0, &pmc->scer);
-#else
-	writel(ATMEL_PMC_UHP, &pmc->scer);
+	at91_system_clk_enable(AT91_PMC_HCK0);
 #endif
 
 	return 0;
@@ -57,17 +51,11 @@ int usb_cpu_stop(void)
 {
 	at91_pmc_t *pmc	= (at91_pmc_t *)ATMEL_BASE_PMC;
 
-	/* Disable USB host clock. */
-#ifdef CPU_HAS_PCR
 	at91_periph_clk_disable(ATMEL_ID_UHP);
-#else
-	writel(1 << ATMEL_ID_UHP, &pmc->pcdr);
-#endif
 
+	at91_system_clk_disable(ATMEL_PMC_UHP);
 #if defined(CONFIG_AT91SAM9261) || defined(CONFIG_AT91SAM9G10)
-	writel(ATMEL_PMC_UHP | AT91_PMC_HCK0, &pmc->scdr);
-#else
-	writel(ATMEL_PMC_UHP, &pmc->scdr);
+	at91_system_clk_disable(AT91_PMC_HCK0);
 #endif
 
 #ifdef CONFIG_USB_ATMEL_CLK_SEL_PLLB
-- 
1.7.9.5

  parent reply	other threads:[~2015-12-10  2:20 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-10  2:20 [U-Boot] [PATCH v3 0/5] ARM: at91: improve peripheral and system clock handle functions Wenyou Yang
2015-12-10  2:20 ` [U-Boot] [PATCH v3 1/5] ARM: at91: asm/at91_pmc.h: fix trival register offset Wenyou Yang
2015-12-10  9:37   ` Heiko Schocher
2016-01-27 16:22   ` Andreas Bießmann
2015-12-10  2:20 ` [U-Boot] [PATCH v3 2/5] ARM: at91: clock: add a new file to handle clock Wenyou Yang
2015-12-10  9:37   ` Heiko Schocher
2016-01-27 16:29   ` Andreas Bießmann
2015-12-10  2:20 ` [U-Boot] [PATCH v3 3/5] ARM: cpu: at91: clean up peripheral clock code Wenyou Yang
2015-12-10  9:38   ` Heiko Schocher
2016-01-27 16:22   ` Andreas Bießmann
2015-12-10  2:20 ` [U-Boot] [PATCH v3 4/5] board: atmel: " Wenyou Yang
2015-12-10  9:38   ` Heiko Schocher
2015-12-10  2:20 ` Wenyou Yang [this message]
2015-12-10  9:38   ` [U-Boot] [PATCH v3 5/5] drivers: at91: " Heiko Schocher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1449714053-26416-6-git-send-email-wenyou.yang@atmel.com \
    --to=wenyou.yang@atmel.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.