diff options
Diffstat (limited to 'arch/arm/mach-keystone')
-rw-r--r-- | arch/arm/mach-keystone/clock-k2e.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-keystone/clock-k2l.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-keystone/include/mach/clock-k2e.h | 15 | ||||
-rw-r--r-- | arch/arm/mach-keystone/include/mach/clock-k2hk.h | 18 | ||||
-rw-r--r-- | arch/arm/mach-keystone/include/mach/clock-k2l.h | 15 | ||||
-rw-r--r-- | arch/arm/mach-keystone/include/mach/clock.h | 11 |
6 files changed, 13 insertions, 50 deletions
diff --git a/arch/arm/mach-keystone/clock-k2e.c b/arch/arm/mach-keystone/clock-k2e.c index b23d2a5..7d163a4 100644 --- a/arch/arm/mach-keystone/clock-k2e.c +++ b/arch/arm/mach-keystone/clock-k2e.c @@ -43,7 +43,7 @@ static unsigned long pll_freq_get(int pll) reg = KS2_PASSPLLCTL0; break; case DDR3_PLL: - ret = external_clk[ddr3_clk]; + ret = external_clk[ddr3a_clk]; reg = KS2_DDR3APLLCTL0; break; default: diff --git a/arch/arm/mach-keystone/clock-k2l.c b/arch/arm/mach-keystone/clock-k2l.c index 0bd0fd6..0004059 100644 --- a/arch/arm/mach-keystone/clock-k2l.c +++ b/arch/arm/mach-keystone/clock-k2l.c @@ -47,7 +47,7 @@ static unsigned long pll_freq_get(int pll) reg = KS2_ARMPLLCTL0; break; case DDR3_PLL: - ret = external_clk[ddr3_clk]; + ret = external_clk[ddr3a_clk]; reg = KS2_DDR3APLLCTL0; break; default: diff --git a/arch/arm/mach-keystone/include/mach/clock-k2e.h b/arch/arm/mach-keystone/include/mach/clock-k2e.h index 8fdc0f0..e66ad69 100644 --- a/arch/arm/mach-keystone/include/mach/clock-k2e.h +++ b/arch/arm/mach-keystone/include/mach/clock-k2e.h @@ -10,21 +10,6 @@ #ifndef __ASM_ARCH_CLOCK_K2E_H #define __ASM_ARCH_CLOCK_K2E_H -enum ext_clk_e { - sys_clk, - alt_core_clk, - pa_clk, - ddr3_clk, - mcm_clk, - pcie_clk, - sgmii_clk, - xgmii_clk, - usb_clk, - ext_clk_count /* number of external clocks */ -}; - -extern unsigned int external_clk[ext_clk_count]; - #define CLK_LIST(CLK)\ CLK(0, core_pll_clk)\ CLK(1, pass_pll_clk)\ diff --git a/arch/arm/mach-keystone/include/mach/clock-k2hk.h b/arch/arm/mach-keystone/include/mach/clock-k2hk.h index 366bf0e..775a9cb 100644 --- a/arch/arm/mach-keystone/include/mach/clock-k2hk.h +++ b/arch/arm/mach-keystone/include/mach/clock-k2hk.h @@ -10,24 +10,6 @@ #ifndef __ASM_ARCH_CLOCK_K2HK_H #define __ASM_ARCH_CLOCK_K2HK_H -enum ext_clk_e { - sys_clk, - alt_core_clk, - pa_clk, - tetris_clk, - ddr3a_clk, - ddr3b_clk, - mcm_clk, - pcie_clk, - sgmii_srio_clk, - xgmii_clk, - usb_clk, - rp1_clk, - ext_clk_count /* number of external clocks */ -}; - -extern unsigned int external_clk[ext_clk_count]; - #define CLK_LIST(CLK)\ CLK(0, core_pll_clk)\ CLK(1, pass_pll_clk)\ diff --git a/arch/arm/mach-keystone/include/mach/clock-k2l.h b/arch/arm/mach-keystone/include/mach/clock-k2l.h index e3f005a..485746d 100644 --- a/arch/arm/mach-keystone/include/mach/clock-k2l.h +++ b/arch/arm/mach-keystone/include/mach/clock-k2l.h @@ -10,21 +10,6 @@ #ifndef __ASM_ARCH_CLOCK_K2L_H #define __ASM_ARCH_CLOCK_K2L_H -enum ext_clk_e { - sys_clk, - alt_core_clk, - pa_clk, - tetris_clk, - ddr3_clk, - pcie_clk, - sgmii_clk, - usb_clk, - rp1_clk, - ext_clk_count /* number of external clocks */ -}; - -extern unsigned int external_clk[ext_clk_count]; - #define CLK_LIST(CLK)\ CLK(0, core_pll_clk)\ CLK(1, pass_pll_clk)\ diff --git a/arch/arm/mach-keystone/include/mach/clock.h b/arch/arm/mach-keystone/include/mach/clock.h index de697c0..d0bcee7 100644 --- a/arch/arm/mach-keystone/include/mach/clock.h +++ b/arch/arm/mach-keystone/include/mach/clock.h @@ -55,6 +55,16 @@ enum { MAX_PLL_COUNT, }; +enum ext_clk_e { + sys_clk, + alt_core_clk, + pa_clk, + tetris_clk, + ddr3a_clk, + ddr3b_clk, + ext_clk_count /* number of external clocks */ +}; + enum clk_e { CLK_LIST(GENERATE_ENUM) }; @@ -72,6 +82,7 @@ struct pll_init_data { int pll_od; /* PLL output divider */ }; +extern unsigned int external_clk[ext_clk_count]; extern const struct keystone_pll_regs keystone_pll_regs[]; extern s16 divn_val[]; extern int speeds[]; |