mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-10-02 09:30:43 +09:00
ARM: keystone2: Get rid of unused clock files
With commit fe772ebd28
("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>
This commit is contained in:
parent
212f96f6bd
commit
239c6953a9
@ -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;
|
|
||||||
}
|
|
@ -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;
|
|
||||||
}
|
|
@ -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;
|
|
||||||
}
|
|
Loading…
Reference in New Issue
Block a user