* [U-Boot] [PATCH] ARM: keystone2: Get rid of unused clock files
@ 2016-02-24 23:48 Nishanth Menon
2016-02-25 6:28 ` Lokesh Vutla
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Nishanth Menon @ 2016-02-24 23:48 UTC (permalink / raw)
To: u-boot
With commit fe772ebd285b ("ARM: keystone2: Use common definition for
clk_get_rate"), we have centralized the clock code into a common clock
logic and the redundant files, unfortunately remained... Clean that
up.
Signed-off-by: Nishanth Menon <nm@ti.com>
---
arch/arm/mach-keystone/clock-k2e.c | 95 --------------------------------
arch/arm/mach-keystone/clock-k2hk.c | 105 ------------------------------------
arch/arm/mach-keystone/clock-k2l.c | 99 ----------------------------------
3 files changed, 299 deletions(-)
delete mode 100644 arch/arm/mach-keystone/clock-k2e.c
delete mode 100644 arch/arm/mach-keystone/clock-k2hk.c
delete mode 100644 arch/arm/mach-keystone/clock-k2l.c
diff --git a/arch/arm/mach-keystone/clock-k2e.c b/arch/arm/mach-keystone/clock-k2e.c
deleted file mode 100644
index 7d163a4b1ab9..000000000000
--- a/arch/arm/mach-keystone/clock-k2e.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Keystone2: get clk rate for K2E
- *
- * (C) Copyright 2012-2014
- * Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/clock_defs.h>
-
-/**
- * pll_freq_get - get pll frequency
- * Fout = Fref * NF(mult) / NR(prediv) / OD
- * @pll: pll identifier
- */
-static unsigned long pll_freq_get(int pll)
-{
- unsigned long mult = 1, prediv = 1, output_div = 2;
- unsigned long ret;
- u32 tmp, reg;
-
- if (pll == CORE_PLL) {
- ret = external_clk[sys_clk];
- if (pllctl_reg_read(pll, ctl) & PLLCTL_PLLEN) {
- /* PLL mode */
- tmp = __raw_readl(KS2_MAINPLLCTL0);
- prediv = (tmp & PLL_DIV_MASK) + 1;
- mult = (((tmp & PLLM_MULT_HI_SMASK) >> 6) |
- (pllctl_reg_read(pll, mult) &
- PLLM_MULT_LO_MASK)) + 1;
- output_div = ((pllctl_reg_read(pll, secctl) >>
- PLL_CLKOD_SHIFT) & PLL_CLKOD_MASK) + 1;
-
- ret = ret / prediv / output_div * mult;
- }
- } else {
- switch (pll) {
- case PASS_PLL:
- ret = external_clk[pa_clk];
- reg = KS2_PASSPLLCTL0;
- break;
- case DDR3_PLL:
- ret = external_clk[ddr3a_clk];
- reg = KS2_DDR3APLLCTL0;
- break;
- default:
- return 0;
- }
-
- tmp = __raw_readl(reg);
-
- if (!(tmp & PLLCTL_BYPASS)) {
- /* Bypass disabled */
- prediv = (tmp & PLL_DIV_MASK) + 1;
- mult = ((tmp >> PLL_MULT_SHIFT) & PLL_MULT_MASK) + 1;
- output_div = ((tmp >> PLL_CLKOD_SHIFT) &
- PLL_CLKOD_MASK) + 1;
- ret = ((ret / prediv) * mult) / output_div;
- }
- }
-
- return ret;
-}
-
-unsigned long clk_get_rate(unsigned int clk)
-{
- switch (clk) {
- case core_pll_clk: return pll_freq_get(CORE_PLL);
- case pass_pll_clk: return pll_freq_get(PASS_PLL);
- case ddr3_pll_clk: return pll_freq_get(DDR3_PLL);
- case sys_clk0_1_clk:
- case sys_clk0_clk: return pll_freq_get(CORE_PLL) / pll0div_read(1);
- case sys_clk1_clk: return pll_freq_get(CORE_PLL) / pll0div_read(2);
- case sys_clk2_clk: return pll_freq_get(CORE_PLL) / pll0div_read(3);
- case sys_clk3_clk: return pll_freq_get(CORE_PLL) / pll0div_read(4);
- case sys_clk0_2_clk: return clk_get_rate(sys_clk0_clk) / 2;
- case sys_clk0_3_clk: return clk_get_rate(sys_clk0_clk) / 3;
- case sys_clk0_4_clk: return clk_get_rate(sys_clk0_clk) / 4;
- case sys_clk0_6_clk: return clk_get_rate(sys_clk0_clk) / 6;
- case sys_clk0_8_clk: return clk_get_rate(sys_clk0_clk) / 8;
- case sys_clk0_12_clk: return clk_get_rate(sys_clk0_clk) / 12;
- case sys_clk0_24_clk: return clk_get_rate(sys_clk0_clk) / 24;
- case sys_clk1_3_clk: return clk_get_rate(sys_clk1_clk) / 3;
- case sys_clk1_4_clk: return clk_get_rate(sys_clk1_clk) / 4;
- case sys_clk1_6_clk: return clk_get_rate(sys_clk1_clk) / 6;
- case sys_clk1_12_clk: return clk_get_rate(sys_clk1_clk) / 12;
- default:
- break;
- }
-
- return 0;
-}
diff --git a/arch/arm/mach-keystone/clock-k2hk.c b/arch/arm/mach-keystone/clock-k2hk.c
deleted file mode 100644
index 2e368910bf05..000000000000
--- a/arch/arm/mach-keystone/clock-k2hk.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Keystone2: get clk rate for K2HK
- *
- * (C) Copyright 2012-2014
- * Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/clock_defs.h>
-
-/**
- * pll_freq_get - get pll frequency
- * Fout = Fref * NF(mult) / NR(prediv) / OD
- * @pll: pll identifier
- */
-static unsigned long pll_freq_get(int pll)
-{
- unsigned long mult = 1, prediv = 1, output_div = 2;
- unsigned long ret;
- u32 tmp, reg;
-
- if (pll == CORE_PLL) {
- ret = external_clk[sys_clk];
- if (pllctl_reg_read(pll, ctl) & PLLCTL_PLLEN) {
- /* PLL mode */
- tmp = __raw_readl(KS2_MAINPLLCTL0);
- prediv = (tmp & PLL_DIV_MASK) + 1;
- mult = (((tmp & PLLM_MULT_HI_SMASK) >> 6) |
- (pllctl_reg_read(pll, mult) &
- PLLM_MULT_LO_MASK)) + 1;
- output_div = ((pllctl_reg_read(pll, secctl) >>
- PLL_CLKOD_SHIFT) & PLL_CLKOD_MASK) + 1;
-
- ret = ret / prediv / output_div * mult;
- }
- } else {
- switch (pll) {
- case PASS_PLL:
- ret = external_clk[pa_clk];
- reg = KS2_PASSPLLCTL0;
- break;
- case TETRIS_PLL:
- ret = external_clk[tetris_clk];
- reg = KS2_ARMPLLCTL0;
- break;
- case DDR3A_PLL:
- ret = external_clk[ddr3a_clk];
- reg = KS2_DDR3APLLCTL0;
- break;
- case DDR3B_PLL:
- ret = external_clk[ddr3b_clk];
- reg = KS2_DDR3BPLLCTL0;
- break;
- default:
- return 0;
- }
-
- tmp = __raw_readl(reg);
-
- if (!(tmp & PLLCTL_BYPASS)) {
- /* Bypass disabled */
- prediv = (tmp & PLL_DIV_MASK) + 1;
- mult = ((tmp >> PLL_MULT_SHIFT) & PLL_MULT_MASK) + 1;
- output_div = ((tmp >> PLL_CLKOD_SHIFT) &
- PLL_CLKOD_MASK) + 1;
- ret = ((ret / prediv) * mult) / output_div;
- }
- }
-
- return ret;
-}
-
-unsigned long clk_get_rate(unsigned int clk)
-{
- switch (clk) {
- case core_pll_clk: return pll_freq_get(CORE_PLL);
- case pass_pll_clk: return pll_freq_get(PASS_PLL);
- case tetris_pll_clk: return pll_freq_get(TETRIS_PLL);
- case ddr3a_pll_clk: return pll_freq_get(DDR3A_PLL);
- case ddr3b_pll_clk: return pll_freq_get(DDR3B_PLL);
- case sys_clk0_1_clk:
- case sys_clk0_clk: return pll_freq_get(CORE_PLL) / pll0div_read(1);
- case sys_clk1_clk: return pll_freq_get(CORE_PLL) / pll0div_read(2);
- case sys_clk2_clk: return pll_freq_get(CORE_PLL) / pll0div_read(3);
- case sys_clk3_clk: return pll_freq_get(CORE_PLL) / pll0div_read(4);
- case sys_clk0_2_clk: return clk_get_rate(sys_clk0_clk) / 2;
- case sys_clk0_3_clk: return clk_get_rate(sys_clk0_clk) / 3;
- case sys_clk0_4_clk: return clk_get_rate(sys_clk0_clk) / 4;
- case sys_clk0_6_clk: return clk_get_rate(sys_clk0_clk) / 6;
- case sys_clk0_8_clk: return clk_get_rate(sys_clk0_clk) / 8;
- case sys_clk0_12_clk: return clk_get_rate(sys_clk0_clk) / 12;
- case sys_clk0_24_clk: return clk_get_rate(sys_clk0_clk) / 24;
- case sys_clk1_3_clk: return clk_get_rate(sys_clk1_clk) / 3;
- case sys_clk1_4_clk: return clk_get_rate(sys_clk1_clk) / 4;
- case sys_clk1_6_clk: return clk_get_rate(sys_clk1_clk) / 6;
- case sys_clk1_12_clk: return clk_get_rate(sys_clk1_clk) / 12;
- default:
- break;
- }
-
- return 0;
-}
diff --git a/arch/arm/mach-keystone/clock-k2l.c b/arch/arm/mach-keystone/clock-k2l.c
deleted file mode 100644
index 00040591925a..000000000000
--- a/arch/arm/mach-keystone/clock-k2l.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Keystone2: get clk rate for K2L
- *
- * (C) Copyright 2012-2014
- * Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/clock_defs.h>
-
-/**
- * pll_freq_get - get pll frequency
- * Fout = Fref * NF(mult) / NR(prediv) / OD
- * @pll: pll identifier
- */
-static unsigned long pll_freq_get(int pll)
-{
- unsigned long mult = 1, prediv = 1, output_div = 2;
- unsigned long ret;
- u32 tmp, reg;
-
- if (pll == CORE_PLL) {
- ret = external_clk[sys_clk];
- if (pllctl_reg_read(pll, ctl) & PLLCTL_PLLEN) {
- /* PLL mode */
- tmp = __raw_readl(KS2_MAINPLLCTL0);
- prediv = (tmp & PLL_DIV_MASK) + 1;
- mult = (((tmp & PLLM_MULT_HI_SMASK) >> 6) |
- (pllctl_reg_read(pll, mult) &
- PLLM_MULT_LO_MASK)) + 1;
- output_div = ((pllctl_reg_read(pll, secctl) >>
- PLL_CLKOD_SHIFT) & PLL_CLKOD_MASK) + 1;
-
- ret = ret / prediv / output_div * mult;
- }
- } else {
- switch (pll) {
- case PASS_PLL:
- ret = external_clk[pa_clk];
- reg = KS2_PASSPLLCTL0;
- break;
- case TETRIS_PLL:
- ret = external_clk[tetris_clk];
- reg = KS2_ARMPLLCTL0;
- break;
- case DDR3_PLL:
- ret = external_clk[ddr3a_clk];
- reg = KS2_DDR3APLLCTL0;
- break;
- default:
- return 0;
- }
-
- tmp = __raw_readl(reg);
- if (!(tmp & PLLCTL_BYPASS)) {
- /* Bypass disabled */
- prediv = (tmp & PLL_DIV_MASK) + 1;
- mult = ((tmp >> PLL_MULT_SHIFT) & PLL_MULT_MASK) + 1;
- output_div = ((tmp >> PLL_CLKOD_SHIFT) &
- PLL_CLKOD_MASK) + 1;
- ret = ((ret / prediv) * mult) / output_div;
- }
- }
-
- return ret;
-}
-
-unsigned long clk_get_rate(unsigned int clk)
-{
- switch (clk) {
- case core_pll_clk: return pll_freq_get(CORE_PLL);
- case pass_pll_clk: return pll_freq_get(PASS_PLL);
- case tetris_pll_clk: return pll_freq_get(TETRIS_PLL);
- case ddr3_pll_clk: return pll_freq_get(DDR3_PLL);
- case sys_clk0_1_clk:
- case sys_clk0_clk: return pll_freq_get(CORE_PLL) / pll0div_read(1);
- case sys_clk1_clk: return pll_freq_get(CORE_PLL) / pll0div_read(2);
- case sys_clk2_clk: return pll_freq_get(CORE_PLL) / pll0div_read(3);
- case sys_clk3_clk: return pll_freq_get(CORE_PLL) / pll0div_read(4);
- case sys_clk0_2_clk: return clk_get_rate(sys_clk0_clk) / 2;
- case sys_clk0_3_clk: return clk_get_rate(sys_clk0_clk) / 3;
- case sys_clk0_4_clk: return clk_get_rate(sys_clk0_clk) / 4;
- case sys_clk0_6_clk: return clk_get_rate(sys_clk0_clk) / 6;
- case sys_clk0_8_clk: return clk_get_rate(sys_clk0_clk) / 8;
- case sys_clk0_12_clk: return clk_get_rate(sys_clk0_clk) / 12;
- case sys_clk0_24_clk: return clk_get_rate(sys_clk0_clk) / 24;
- case sys_clk1_3_clk: return clk_get_rate(sys_clk1_clk) / 3;
- case sys_clk1_4_clk: return clk_get_rate(sys_clk1_clk) / 4;
- case sys_clk1_6_clk: return clk_get_rate(sys_clk1_clk) / 6;
- case sys_clk1_12_clk: return clk_get_rate(sys_clk1_clk) / 12;
- default:
- break;
- }
-
- return 0;
-}
--
2.7.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] ARM: keystone2: Get rid of unused clock files
2016-02-24 23:48 [U-Boot] [PATCH] ARM: keystone2: Get rid of unused clock files Nishanth Menon
@ 2016-02-25 6:28 ` Lokesh Vutla
2016-02-25 15:23 ` Tom Rini
2016-03-15 11:56 ` [U-Boot] " Tom Rini
2 siblings, 0 replies; 4+ messages in thread
From: Lokesh Vutla @ 2016-02-25 6:28 UTC (permalink / raw)
To: u-boot
On 2/25/2016 5:18 AM, Nishanth Menon wrote:
> With commit fe772ebd285b ("ARM: keystone2: Use common definition for
> clk_get_rate"), we have centralized the clock code into a common clock
> logic and the redundant files, unfortunately remained... Clean that
> up.
Wondering how it got missed :(
Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
Thanks and regards,
Lokesh
>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
> arch/arm/mach-keystone/clock-k2e.c | 95 --------------------------------
> arch/arm/mach-keystone/clock-k2hk.c | 105 ------------------------------------
> arch/arm/mach-keystone/clock-k2l.c | 99 ----------------------------------
> 3 files changed, 299 deletions(-)
> delete mode 100644 arch/arm/mach-keystone/clock-k2e.c
> delete mode 100644 arch/arm/mach-keystone/clock-k2hk.c
> delete mode 100644 arch/arm/mach-keystone/clock-k2l.c
>
> diff --git a/arch/arm/mach-keystone/clock-k2e.c b/arch/arm/mach-keystone/clock-k2e.c
> deleted file mode 100644
> index 7d163a4b1ab9..000000000000
> --- a/arch/arm/mach-keystone/clock-k2e.c
> +++ /dev/null
> @@ -1,95 +0,0 @@
> -/*
> - * Keystone2: get clk rate for K2E
> - *
> - * (C) Copyright 2012-2014
> - * Texas Instruments Incorporated, <www.ti.com>
> - *
> - * SPDX-License-Identifier: GPL-2.0+
> - */
> -
> -#include <common.h>
> -#include <asm/arch/clock.h>
> -#include <asm/arch/clock_defs.h>
> -
> -/**
> - * pll_freq_get - get pll frequency
> - * Fout = Fref * NF(mult) / NR(prediv) / OD
> - * @pll: pll identifier
> - */
> -static unsigned long pll_freq_get(int pll)
> -{
> - unsigned long mult = 1, prediv = 1, output_div = 2;
> - unsigned long ret;
> - u32 tmp, reg;
> -
> - if (pll == CORE_PLL) {
> - ret = external_clk[sys_clk];
> - if (pllctl_reg_read(pll, ctl) & PLLCTL_PLLEN) {
> - /* PLL mode */
> - tmp = __raw_readl(KS2_MAINPLLCTL0);
> - prediv = (tmp & PLL_DIV_MASK) + 1;
> - mult = (((tmp & PLLM_MULT_HI_SMASK) >> 6) |
> - (pllctl_reg_read(pll, mult) &
> - PLLM_MULT_LO_MASK)) + 1;
> - output_div = ((pllctl_reg_read(pll, secctl) >>
> - PLL_CLKOD_SHIFT) & PLL_CLKOD_MASK) + 1;
> -
> - ret = ret / prediv / output_div * mult;
> - }
> - } else {
> - switch (pll) {
> - case PASS_PLL:
> - ret = external_clk[pa_clk];
> - reg = KS2_PASSPLLCTL0;
> - break;
> - case DDR3_PLL:
> - ret = external_clk[ddr3a_clk];
> - reg = KS2_DDR3APLLCTL0;
> - break;
> - default:
> - return 0;
> - }
> -
> - tmp = __raw_readl(reg);
> -
> - if (!(tmp & PLLCTL_BYPASS)) {
> - /* Bypass disabled */
> - prediv = (tmp & PLL_DIV_MASK) + 1;
> - mult = ((tmp >> PLL_MULT_SHIFT) & PLL_MULT_MASK) + 1;
> - output_div = ((tmp >> PLL_CLKOD_SHIFT) &
> - PLL_CLKOD_MASK) + 1;
> - ret = ((ret / prediv) * mult) / output_div;
> - }
> - }
> -
> - return ret;
> -}
> -
> -unsigned long clk_get_rate(unsigned int clk)
> -{
> - switch (clk) {
> - case core_pll_clk: return pll_freq_get(CORE_PLL);
> - case pass_pll_clk: return pll_freq_get(PASS_PLL);
> - case ddr3_pll_clk: return pll_freq_get(DDR3_PLL);
> - case sys_clk0_1_clk:
> - case sys_clk0_clk: return pll_freq_get(CORE_PLL) / pll0div_read(1);
> - case sys_clk1_clk: return pll_freq_get(CORE_PLL) / pll0div_read(2);
> - case sys_clk2_clk: return pll_freq_get(CORE_PLL) / pll0div_read(3);
> - case sys_clk3_clk: return pll_freq_get(CORE_PLL) / pll0div_read(4);
> - case sys_clk0_2_clk: return clk_get_rate(sys_clk0_clk) / 2;
> - case sys_clk0_3_clk: return clk_get_rate(sys_clk0_clk) / 3;
> - case sys_clk0_4_clk: return clk_get_rate(sys_clk0_clk) / 4;
> - case sys_clk0_6_clk: return clk_get_rate(sys_clk0_clk) / 6;
> - case sys_clk0_8_clk: return clk_get_rate(sys_clk0_clk) / 8;
> - case sys_clk0_12_clk: return clk_get_rate(sys_clk0_clk) / 12;
> - case sys_clk0_24_clk: return clk_get_rate(sys_clk0_clk) / 24;
> - case sys_clk1_3_clk: return clk_get_rate(sys_clk1_clk) / 3;
> - case sys_clk1_4_clk: return clk_get_rate(sys_clk1_clk) / 4;
> - case sys_clk1_6_clk: return clk_get_rate(sys_clk1_clk) / 6;
> - case sys_clk1_12_clk: return clk_get_rate(sys_clk1_clk) / 12;
> - default:
> - break;
> - }
> -
> - return 0;
> -}
> diff --git a/arch/arm/mach-keystone/clock-k2hk.c b/arch/arm/mach-keystone/clock-k2hk.c
> deleted file mode 100644
> index 2e368910bf05..000000000000
> --- a/arch/arm/mach-keystone/clock-k2hk.c
> +++ /dev/null
> @@ -1,105 +0,0 @@
> -/*
> - * Keystone2: get clk rate for K2HK
> - *
> - * (C) Copyright 2012-2014
> - * Texas Instruments Incorporated, <www.ti.com>
> - *
> - * SPDX-License-Identifier: GPL-2.0+
> - */
> -
> -#include <common.h>
> -#include <asm/arch/clock.h>
> -#include <asm/arch/clock_defs.h>
> -
> -/**
> - * pll_freq_get - get pll frequency
> - * Fout = Fref * NF(mult) / NR(prediv) / OD
> - * @pll: pll identifier
> - */
> -static unsigned long pll_freq_get(int pll)
> -{
> - unsigned long mult = 1, prediv = 1, output_div = 2;
> - unsigned long ret;
> - u32 tmp, reg;
> -
> - if (pll == CORE_PLL) {
> - ret = external_clk[sys_clk];
> - if (pllctl_reg_read(pll, ctl) & PLLCTL_PLLEN) {
> - /* PLL mode */
> - tmp = __raw_readl(KS2_MAINPLLCTL0);
> - prediv = (tmp & PLL_DIV_MASK) + 1;
> - mult = (((tmp & PLLM_MULT_HI_SMASK) >> 6) |
> - (pllctl_reg_read(pll, mult) &
> - PLLM_MULT_LO_MASK)) + 1;
> - output_div = ((pllctl_reg_read(pll, secctl) >>
> - PLL_CLKOD_SHIFT) & PLL_CLKOD_MASK) + 1;
> -
> - ret = ret / prediv / output_div * mult;
> - }
> - } else {
> - switch (pll) {
> - case PASS_PLL:
> - ret = external_clk[pa_clk];
> - reg = KS2_PASSPLLCTL0;
> - break;
> - case TETRIS_PLL:
> - ret = external_clk[tetris_clk];
> - reg = KS2_ARMPLLCTL0;
> - break;
> - case DDR3A_PLL:
> - ret = external_clk[ddr3a_clk];
> - reg = KS2_DDR3APLLCTL0;
> - break;
> - case DDR3B_PLL:
> - ret = external_clk[ddr3b_clk];
> - reg = KS2_DDR3BPLLCTL0;
> - break;
> - default:
> - return 0;
> - }
> -
> - tmp = __raw_readl(reg);
> -
> - if (!(tmp & PLLCTL_BYPASS)) {
> - /* Bypass disabled */
> - prediv = (tmp & PLL_DIV_MASK) + 1;
> - mult = ((tmp >> PLL_MULT_SHIFT) & PLL_MULT_MASK) + 1;
> - output_div = ((tmp >> PLL_CLKOD_SHIFT) &
> - PLL_CLKOD_MASK) + 1;
> - ret = ((ret / prediv) * mult) / output_div;
> - }
> - }
> -
> - return ret;
> -}
> -
> -unsigned long clk_get_rate(unsigned int clk)
> -{
> - switch (clk) {
> - case core_pll_clk: return pll_freq_get(CORE_PLL);
> - case pass_pll_clk: return pll_freq_get(PASS_PLL);
> - case tetris_pll_clk: return pll_freq_get(TETRIS_PLL);
> - case ddr3a_pll_clk: return pll_freq_get(DDR3A_PLL);
> - case ddr3b_pll_clk: return pll_freq_get(DDR3B_PLL);
> - case sys_clk0_1_clk:
> - case sys_clk0_clk: return pll_freq_get(CORE_PLL) / pll0div_read(1);
> - case sys_clk1_clk: return pll_freq_get(CORE_PLL) / pll0div_read(2);
> - case sys_clk2_clk: return pll_freq_get(CORE_PLL) / pll0div_read(3);
> - case sys_clk3_clk: return pll_freq_get(CORE_PLL) / pll0div_read(4);
> - case sys_clk0_2_clk: return clk_get_rate(sys_clk0_clk) / 2;
> - case sys_clk0_3_clk: return clk_get_rate(sys_clk0_clk) / 3;
> - case sys_clk0_4_clk: return clk_get_rate(sys_clk0_clk) / 4;
> - case sys_clk0_6_clk: return clk_get_rate(sys_clk0_clk) / 6;
> - case sys_clk0_8_clk: return clk_get_rate(sys_clk0_clk) / 8;
> - case sys_clk0_12_clk: return clk_get_rate(sys_clk0_clk) / 12;
> - case sys_clk0_24_clk: return clk_get_rate(sys_clk0_clk) / 24;
> - case sys_clk1_3_clk: return clk_get_rate(sys_clk1_clk) / 3;
> - case sys_clk1_4_clk: return clk_get_rate(sys_clk1_clk) / 4;
> - case sys_clk1_6_clk: return clk_get_rate(sys_clk1_clk) / 6;
> - case sys_clk1_12_clk: return clk_get_rate(sys_clk1_clk) / 12;
> - default:
> - break;
> - }
> -
> - return 0;
> -}
> diff --git a/arch/arm/mach-keystone/clock-k2l.c b/arch/arm/mach-keystone/clock-k2l.c
> deleted file mode 100644
> index 00040591925a..000000000000
> --- a/arch/arm/mach-keystone/clock-k2l.c
> +++ /dev/null
> @@ -1,99 +0,0 @@
> -/*
> - * Keystone2: get clk rate for K2L
> - *
> - * (C) Copyright 2012-2014
> - * Texas Instruments Incorporated, <www.ti.com>
> - *
> - * SPDX-License-Identifier: GPL-2.0+
> - */
> -
> -#include <common.h>
> -#include <asm/arch/clock.h>
> -#include <asm/arch/clock_defs.h>
> -
> -/**
> - * pll_freq_get - get pll frequency
> - * Fout = Fref * NF(mult) / NR(prediv) / OD
> - * @pll: pll identifier
> - */
> -static unsigned long pll_freq_get(int pll)
> -{
> - unsigned long mult = 1, prediv = 1, output_div = 2;
> - unsigned long ret;
> - u32 tmp, reg;
> -
> - if (pll == CORE_PLL) {
> - ret = external_clk[sys_clk];
> - if (pllctl_reg_read(pll, ctl) & PLLCTL_PLLEN) {
> - /* PLL mode */
> - tmp = __raw_readl(KS2_MAINPLLCTL0);
> - prediv = (tmp & PLL_DIV_MASK) + 1;
> - mult = (((tmp & PLLM_MULT_HI_SMASK) >> 6) |
> - (pllctl_reg_read(pll, mult) &
> - PLLM_MULT_LO_MASK)) + 1;
> - output_div = ((pllctl_reg_read(pll, secctl) >>
> - PLL_CLKOD_SHIFT) & PLL_CLKOD_MASK) + 1;
> -
> - ret = ret / prediv / output_div * mult;
> - }
> - } else {
> - switch (pll) {
> - case PASS_PLL:
> - ret = external_clk[pa_clk];
> - reg = KS2_PASSPLLCTL0;
> - break;
> - case TETRIS_PLL:
> - ret = external_clk[tetris_clk];
> - reg = KS2_ARMPLLCTL0;
> - break;
> - case DDR3_PLL:
> - ret = external_clk[ddr3a_clk];
> - reg = KS2_DDR3APLLCTL0;
> - break;
> - default:
> - return 0;
> - }
> -
> - tmp = __raw_readl(reg);
> - if (!(tmp & PLLCTL_BYPASS)) {
> - /* Bypass disabled */
> - prediv = (tmp & PLL_DIV_MASK) + 1;
> - mult = ((tmp >> PLL_MULT_SHIFT) & PLL_MULT_MASK) + 1;
> - output_div = ((tmp >> PLL_CLKOD_SHIFT) &
> - PLL_CLKOD_MASK) + 1;
> - ret = ((ret / prediv) * mult) / output_div;
> - }
> - }
> -
> - return ret;
> -}
> -
> -unsigned long clk_get_rate(unsigned int clk)
> -{
> - switch (clk) {
> - case core_pll_clk: return pll_freq_get(CORE_PLL);
> - case pass_pll_clk: return pll_freq_get(PASS_PLL);
> - case tetris_pll_clk: return pll_freq_get(TETRIS_PLL);
> - case ddr3_pll_clk: return pll_freq_get(DDR3_PLL);
> - case sys_clk0_1_clk:
> - case sys_clk0_clk: return pll_freq_get(CORE_PLL) / pll0div_read(1);
> - case sys_clk1_clk: return pll_freq_get(CORE_PLL) / pll0div_read(2);
> - case sys_clk2_clk: return pll_freq_get(CORE_PLL) / pll0div_read(3);
> - case sys_clk3_clk: return pll_freq_get(CORE_PLL) / pll0div_read(4);
> - case sys_clk0_2_clk: return clk_get_rate(sys_clk0_clk) / 2;
> - case sys_clk0_3_clk: return clk_get_rate(sys_clk0_clk) / 3;
> - case sys_clk0_4_clk: return clk_get_rate(sys_clk0_clk) / 4;
> - case sys_clk0_6_clk: return clk_get_rate(sys_clk0_clk) / 6;
> - case sys_clk0_8_clk: return clk_get_rate(sys_clk0_clk) / 8;
> - case sys_clk0_12_clk: return clk_get_rate(sys_clk0_clk) / 12;
> - case sys_clk0_24_clk: return clk_get_rate(sys_clk0_clk) / 24;
> - case sys_clk1_3_clk: return clk_get_rate(sys_clk1_clk) / 3;
> - case sys_clk1_4_clk: return clk_get_rate(sys_clk1_clk) / 4;
> - case sys_clk1_6_clk: return clk_get_rate(sys_clk1_clk) / 6;
> - case sys_clk1_12_clk: return clk_get_rate(sys_clk1_clk) / 12;
> - default:
> - break;
> - }
> -
> - return 0;
> -}
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] ARM: keystone2: Get rid of unused clock files
2016-02-24 23:48 [U-Boot] [PATCH] ARM: keystone2: Get rid of unused clock files Nishanth Menon
2016-02-25 6:28 ` Lokesh Vutla
@ 2016-02-25 15:23 ` Tom Rini
2016-03-15 11:56 ` [U-Boot] " Tom Rini
2 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2016-02-25 15:23 UTC (permalink / raw)
To: u-boot
On Wed, Feb 24, 2016 at 05:48:43PM -0600, Nishanth Menon wrote:
> With commit fe772ebd285b ("ARM: keystone2: Use common definition for
> clk_get_rate"), we have centralized the clock code into a common clock
> logic and the redundant files, unfortunately remained... Clean that
> up.
>
> Signed-off-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160225/67ec6bae/attachment.sig>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] ARM: keystone2: Get rid of unused clock files
2016-02-24 23:48 [U-Boot] [PATCH] ARM: keystone2: Get rid of unused clock files Nishanth Menon
2016-02-25 6:28 ` Lokesh Vutla
2016-02-25 15:23 ` Tom Rini
@ 2016-03-15 11:56 ` Tom Rini
2 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2016-03-15 11:56 UTC (permalink / raw)
To: u-boot
On Wed, Feb 24, 2016 at 05:48:43PM -0600, Nishanth Menon wrote:
> With commit fe772ebd285b ("ARM: keystone2: Use common definition for
> clk_get_rate"), we have centralized the clock code into a common clock
> logic and the redundant files, unfortunately remained... Clean that
> up.
>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160315/ed82c6ba/attachment.sig>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-03-15 11:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-24 23:48 [U-Boot] [PATCH] ARM: keystone2: Get rid of unused clock files Nishanth Menon
2016-02-25 6:28 ` Lokesh Vutla
2016-02-25 15:23 ` Tom Rini
2016-03-15 11:56 ` [U-Boot] " Tom Rini
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.