Patchwork [U-Boot,1/4] am33xx: add pll and clock support for TI814x CPSW

login
register
mail settings
Submitter Matt Porter
Date March 15, 2013, 8:58 p.m.
Message ID <1363381100-6364-2-git-send-email-mporter@ti.com>
Download mbox | patch
Permalink /patch/228180/
State Superseded
Delegated to: Tom Rini
Headers show

Comments

Matt Porter - March 15, 2013, 8:58 p.m.
Enables required PLLs and clocks for CPSW on TI814x.

Signed-off-by: Matt Porter <mporter@ti.com>
---
 arch/arm/cpu/armv7/am33xx/clock_ti814x.c           |   56 +++++++++++++++++++-
 arch/arm/include/asm/arch-am33xx/hardware_ti814x.h |    1 +
 board/ti/ti814x/evm.c                              |    3 ++
 3 files changed, 58 insertions(+), 2 deletions(-)
Tom Rini - March 15, 2013, 9:13 p.m.
On Fri, Mar 15, 2013 at 04:58:17PM -0400, Matt Porter wrote:

[snip]
> +	/* Ethernet */
> +	writel(PRCM_MOD_EN, &cmalwon->l3slowclkstctrl);
> +	while ((readl(&cmalwon->l3slowclkstctrl) & 0x2100) != 0x2100)
> +		;
> +	writel(PRCM_MOD_EN, &cmalwon->ethclkstctrl);
> +	writel(PRCM_MOD_EN, &cmalwon->ethernet0clkctrl);
> +	while ((readl(&cmalwon->ethernet0clkctrl) & 0x30000) != 0)
> +		;
> +	writel(PRCM_MOD_EN, &cmalwon->ethernet1clkctrl);
> +	while ((readl(&cmalwon->ethernet1clkctrl) & 0x30000) != 0)

Please define away the magic numbers.

[snip]
> +void sata_pll_config(void)
> +{
> +	/* TRM 21.3.1 */
> +	writel(0xc12c003c, &spll->pllcfg1);

I'm OK with comments, but please make it a multi-line thing that
explains what's going on so that it's clear that yes, really, we
shouldn't have defined these.
Matt Porter - March 20, 2013, 1:25 p.m.
On Fri, Mar 15, 2013 at 09:13:54PM +0000, Tom Rini wrote:
> On Fri, Mar 15, 2013 at 04:58:17PM -0400, Matt Porter wrote:
> 
> [snip]
> > +	/* Ethernet */
> > +	writel(PRCM_MOD_EN, &cmalwon->l3slowclkstctrl);
> > +	while ((readl(&cmalwon->l3slowclkstctrl) & 0x2100) != 0x2100)
> > +		;
> > +	writel(PRCM_MOD_EN, &cmalwon->ethclkstctrl);
> > +	writel(PRCM_MOD_EN, &cmalwon->ethernet0clkctrl);
> > +	while ((readl(&cmalwon->ethernet0clkctrl) & 0x30000) != 0)
> > +		;
> > +	writel(PRCM_MOD_EN, &cmalwon->ethernet1clkctrl);
> > +	while ((readl(&cmalwon->ethernet1clkctrl) & 0x30000) != 0)
> 
> Please define away the magic numbers.
> 
> [snip]
> > +void sata_pll_config(void)
> > +{
> > +	/* TRM 21.3.1 */
> > +	writel(0xc12c003c, &spll->pllcfg1);
> 
> I'm OK with comments, but please make it a multi-line thing that
> explains what's going on so that it's clear that yes, really, we
> shouldn't have defined these.

I'll address this with gratuitous defines in v2...and expand the
comment.

-Matt

Patch

diff --git a/arch/arm/cpu/armv7/am33xx/clock_ti814x.c b/arch/arm/cpu/armv7/am33xx/clock_ti814x.c
index cb4210f..69ecf72 100644
--- a/arch/arm/cpu/armv7/am33xx/clock_ti814x.c
+++ b/arch/arm/cpu/armv7/am33xx/clock_ti814x.c
@@ -183,7 +183,7 @@  struct cm_alwon {
 	unsigned int resv5[2];
 	unsigned int gpmcclkctrl;
 	unsigned int ethernet0clkctrl;
-	unsigned int resv6[1];
+	unsigned int ethernet1clkctrl;
 	unsigned int mpuclkctrl;
 	unsigned int debugssclkctrl;
 	unsigned int l3clkctrl;
@@ -203,9 +203,23 @@  struct cm_alwon {
 	unsigned int custefuseclkctrl;
 };
 
+#define SATA_PLL_BASE			(CTRL_BASE + 0x0720)
+
+struct sata_pll {
+	unsigned int pllcfg0;
+	unsigned int pllcfg1;
+	unsigned int pllcfg2;
+	unsigned int pllcfg3;
+	unsigned int pllcfg4;
+	unsigned int pllstatus;
+	unsigned int rxstatus;
+	unsigned int txstatus;
+	unsigned int testcfg;
+};
 
 const struct cm_alwon *cmalwon = (struct cm_alwon *)CM_ALWON_BASE;
 const struct cm_def *cmdef = (struct cm_def *)CM_DEFAULT_BASE;
+const struct sata_pll *spll = (struct sata_pll *)SATA_PLL_BASE;
 
 /*
  * Enable the peripheral clock for required peripherals
@@ -221,6 +235,18 @@  static void enable_per_clocks(void)
 	writel(PRCM_MOD_EN, &cmalwon->mmchs1clkctrl);
 	while (readl(&cmalwon->mmchs1clkctrl) != PRCM_MOD_EN)
 		;
+
+	/* Ethernet */
+	writel(PRCM_MOD_EN, &cmalwon->l3slowclkstctrl);
+	while ((readl(&cmalwon->l3slowclkstctrl) & 0x2100) != 0x2100)
+		;
+	writel(PRCM_MOD_EN, &cmalwon->ethclkstctrl);
+	writel(PRCM_MOD_EN, &cmalwon->ethernet0clkctrl);
+	while ((readl(&cmalwon->ethernet0clkctrl) & 0x30000) != 0)
+		;
+	writel(PRCM_MOD_EN, &cmalwon->ethernet1clkctrl);
+	while ((readl(&cmalwon->ethernet1clkctrl) & 0x30000) != 0)
+		;
 }
 
 /*
@@ -365,6 +391,31 @@  void ddr_pll_config(unsigned int ddrpll_m)
 	pll_config(DDR_PLL_BASE, DDR_N, DDR_M, DDR_M2, DDR_CLKCTRL, 1);
 }
 
+void sata_pll_config(void)
+{
+	/* TRM 21.3.1 */
+	writel(0xc12c003c, &spll->pllcfg1);
+	udelay(50);
+
+	writel(0x004008e0, &spll->pllcfg3);
+	udelay(50);
+
+	writel(0x80000004, &spll->pllcfg0);
+	udelay(50);
+
+	writel(0x80000014, &spll->pllcfg0);
+	udelay(50);
+
+	writel(0x80000016, &spll->pllcfg0);
+	udelay(50);
+
+	writel(0xc0000017, &spll->pllcfg0);
+	udelay(50);
+
+	while (((readl(&spll->pllstatus) & 0x01) == 0))
+		;
+}
+
 void enable_emif_clocks(void) {};
 
 void enable_dmm_clocks(void)
@@ -397,9 +448,10 @@  void pll_init()
 	/* Enable the control module */
 	writel(PRCM_MOD_EN, &cmalwon->controlclkctrl);
 
+	/* Configure PLLs */
 	mpu_pll_config();
-
 	l3_pll_config();
+	sata_pll_config();
 
 	/* Enable the required peripherals */
 	enable_per_clocks();
diff --git a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h b/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h
index a950ac3..8f9315c 100644
--- a/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h
+++ b/arch/arm/include/asm/arch-am33xx/hardware_ti814x.h
@@ -29,6 +29,7 @@ 
 
 /* Control Module Base Address */
 #define CTRL_BASE			0x48140000
+#define CTRL_DEVICE_BASE		0x48140600
 
 /* PRCM Base Address */
 #define PRCM_BASE			0x48180000
diff --git a/board/ti/ti814x/evm.c b/board/ti/ti814x/evm.c
index acc18fb..8513220 100644
--- a/board/ti/ti814x/evm.c
+++ b/board/ti/ti814x/evm.c
@@ -151,6 +151,9 @@  void s_init(void)
 	 */
 	wdt_disable();
 
+	/* Enable timer */
+	timer_init();
+
 	/* Setup the PLLs and the clocks for the peripherals */
 	pll_init();