Patchwork [U-Boot,08/10,V4] EXYNOS5: CLOCK: Add BPLL support

login
register
mail settings
Submitter Rajeshwari Birje
Date June 29, 2012, 12:59 p.m.
Message ID <1340974750-19969-9-git-send-email-rajeshwari.s@samsung.com>
Download mbox | patch
Permalink /patch/168226/
State Changes Requested
Delegated to: Minkyu Kang
Headers show

Comments

Rajeshwari Birje - June 29, 2012, 12:59 p.m.
This patch adds support for BPLL clock.

Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
---
Changes in V3:
        - New Patch
Changes in V4:
        - Removed the warning message.
 arch/arm/cpu/armv7/exynos/clock.c        |   26 ++++++++++++++++++++------
 arch/arm/include/asm/arch-exynos/clk.h   |    1 +
 arch/arm/include/asm/arch-exynos/clock.h |    2 ++
 3 files changed, 23 insertions(+), 6 deletions(-)
Joon Young Shim - July 2, 2012, 9:52 a.m.
2012/6/29 Rajeshwari Shinde <rajeshwari.s@samsung.com>:
> This patch adds support for BPLL clock.
>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
> ---
> Changes in V3:
>         - New Patch
> Changes in V4:
>         - Removed the warning message.
>  arch/arm/cpu/armv7/exynos/clock.c        |   26 ++++++++++++++++++++------
>  arch/arm/include/asm/arch-exynos/clk.h   |    1 +
>  arch/arm/include/asm/arch-exynos/clock.h |    2 ++
>  3 files changed, 23 insertions(+), 6 deletions(-)
>

Acked-by: Joonyoung Shim <jy0922.shim@samsung.com>
Minkyu Kang - July 2, 2012, 10:17 a.m.
Dear Rajeshwari Shinde,

On 29 June 2012 21:59, Rajeshwari Shinde <rajeshwari.s@samsung.com> wrote:
> This patch adds support for BPLL clock.
>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
> ---
> Changes in V3:
>         - New Patch
> Changes in V4:
>         - Removed the warning message.
>  arch/arm/cpu/armv7/exynos/clock.c        |   26 ++++++++++++++++++++------
>  arch/arm/include/asm/arch-exynos/clk.h   |    1 +
>  arch/arm/include/asm/arch-exynos/clock.h |    2 ++
>  3 files changed, 23 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/cpu/armv7/exynos/clock.c
> index dbd5f11..13e3641 100644
> --- a/arch/arm/cpu/armv7/exynos/clock.c
> +++ b/arch/arm/cpu/armv7/exynos/clock.c
> @@ -98,7 +98,7 @@ static unsigned long exynos5_get_pll_clk(int pllreg)
>         struct exynos5_clock *clk =
>                 (struct exynos5_clock *)samsung_get_base_clock();
>         unsigned long r, m, p, s, k = 0, mask, fout;
> -       unsigned int freq, pll_div2_sel,  mpll_fout_sel;
> +       unsigned int freq, pll_div2_sel, fout_sel;
>
>         switch (pllreg) {
>         case APLL:
> @@ -115,6 +115,9 @@ static unsigned long exynos5_get_pll_clk(int pllreg)
>                 r = readl(&clk->vpll_con0);
>                 k = readl(&clk->vpll_con1);
>                 break;
> +       case BPLL:
> +               r = readl(&clk->bpll_con0);
> +               break;
>         default:
>                 printf("Unsupported PLL (%d)\n", pllreg);
>                 return 0;
> @@ -125,8 +128,9 @@ static unsigned long exynos5_get_pll_clk(int pllreg)
>          * MPLL_CON: MIDV [25:16]
>          * EPLL_CON: MIDV [24:16]
>          * VPLL_CON: MIDV [24:16]
> +        * BPLL_CON: MIDV [25:16]
>          */
> -       if (pllreg == APLL || pllreg == MPLL)
> +       if (pllreg == APLL || pllreg == MPLL || pllreg == BPLL)
>                 mask = 0x3ff;
>         else
>                 mask = 0x1ff;
> @@ -155,13 +159,23 @@ static unsigned long exynos5_get_pll_clk(int pllreg)
>                 fout = m * (freq / (p * (1 << (s - 1))));
>         }
>
> -       /* According to the user manual, in EVT1 MPLL always gives
> +       /* According to the user manual, in EVT1 MPLL and BPLL always gives
>          * 1.6GHz clock, so divide by 2 to get 800MHz MPLL clock.*/
> -       if (pllreg == MPLL) {
> +       if (pllreg == MPLL || pllreg == BPLL) {
>                 pll_div2_sel = readl(&clk->pll_div2_sel);
> -               mpll_fout_sel = (pll_div2_sel >> MPLL_FOUT_SEL_SHIFT)
> +
> +               switch (pllreg) {
> +               case MPLL:
> +               fout_sel = (pll_div2_sel >> MPLL_FOUT_SEL_SHIFT)
>                                 & MPLL_FOUT_SEL_MASK;
> -               if (mpll_fout_sel == 0)
> +               break;
> +               case BPLL:
> +               fout_sel = (pll_div2_sel >> BPLL_FOUT_SEL_SHIFT)
> +                               & BPLL_FOUT_SEL_MASK;
> +               break;
> +               }

indentation error.
please fix it.

> +
> +               if (fout_sel == 0)
>                         fout /= 2;
>         }
>

Thanks.
Minkyu Kang.

Patch

diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/cpu/armv7/exynos/clock.c
index dbd5f11..13e3641 100644
--- a/arch/arm/cpu/armv7/exynos/clock.c
+++ b/arch/arm/cpu/armv7/exynos/clock.c
@@ -98,7 +98,7 @@  static unsigned long exynos5_get_pll_clk(int pllreg)
 	struct exynos5_clock *clk =
 		(struct exynos5_clock *)samsung_get_base_clock();
 	unsigned long r, m, p, s, k = 0, mask, fout;
-	unsigned int freq, pll_div2_sel,  mpll_fout_sel;
+	unsigned int freq, pll_div2_sel, fout_sel;
 
 	switch (pllreg) {
 	case APLL:
@@ -115,6 +115,9 @@  static unsigned long exynos5_get_pll_clk(int pllreg)
 		r = readl(&clk->vpll_con0);
 		k = readl(&clk->vpll_con1);
 		break;
+	case BPLL:
+		r = readl(&clk->bpll_con0);
+		break;
 	default:
 		printf("Unsupported PLL (%d)\n", pllreg);
 		return 0;
@@ -125,8 +128,9 @@  static unsigned long exynos5_get_pll_clk(int pllreg)
 	 * MPLL_CON: MIDV [25:16]
 	 * EPLL_CON: MIDV [24:16]
 	 * VPLL_CON: MIDV [24:16]
+	 * BPLL_CON: MIDV [25:16]
 	 */
-	if (pllreg == APLL || pllreg == MPLL)
+	if (pllreg == APLL || pllreg == MPLL || pllreg == BPLL)
 		mask = 0x3ff;
 	else
 		mask = 0x1ff;
@@ -155,13 +159,23 @@  static unsigned long exynos5_get_pll_clk(int pllreg)
 		fout = m * (freq / (p * (1 << (s - 1))));
 	}
 
-	/* According to the user manual, in EVT1 MPLL always gives
+	/* According to the user manual, in EVT1 MPLL and BPLL always gives
 	 * 1.6GHz clock, so divide by 2 to get 800MHz MPLL clock.*/
-	if (pllreg == MPLL) {
+	if (pllreg == MPLL || pllreg == BPLL) {
 		pll_div2_sel = readl(&clk->pll_div2_sel);
-		mpll_fout_sel = (pll_div2_sel >> MPLL_FOUT_SEL_SHIFT)
+
+		switch (pllreg) {
+		case MPLL:
+		fout_sel = (pll_div2_sel >> MPLL_FOUT_SEL_SHIFT)
 				& MPLL_FOUT_SEL_MASK;
-		if (mpll_fout_sel == 0)
+		break;
+		case BPLL:
+		fout_sel = (pll_div2_sel >> BPLL_FOUT_SEL_SHIFT)
+				& BPLL_FOUT_SEL_MASK;
+		break;
+		}
+
+		if (fout_sel == 0)
 			fout /= 2;
 	}
 
diff --git a/arch/arm/include/asm/arch-exynos/clk.h b/arch/arm/include/asm/arch-exynos/clk.h
index 637fb4b..e99339a 100644
--- a/arch/arm/include/asm/arch-exynos/clk.h
+++ b/arch/arm/include/asm/arch-exynos/clk.h
@@ -27,6 +27,7 @@ 
 #define EPLL	2
 #define HPLL	3
 #define VPLL	4
+#define BPLL	5
 
 unsigned long get_pll_clk(int pllreg);
 unsigned long get_arm_clk(void);
diff --git a/arch/arm/include/asm/arch-exynos/clock.h b/arch/arm/include/asm/arch-exynos/clock.h
index bf41c19..fce38ef 100644
--- a/arch/arm/include/asm/arch-exynos/clock.h
+++ b/arch/arm/include/asm/arch-exynos/clock.h
@@ -599,4 +599,6 @@  struct exynos5_clock {
 
 #define MPLL_FOUT_SEL_SHIFT	4
 #define MPLL_FOUT_SEL_MASK	0x1
+#define BPLL_FOUT_SEL_SHIFT	0
+#define BPLL_FOUT_SEL_MASK	0x1
 #endif