Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-23 13:56:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: keystone: rename clk_get_rate() to ks_clk_get_rate()

Browse source 
The KeyStone platform has its own clk_get_rate() but its prototype
is different from that of the common-clk (clk-uclass) framework.

Prefix the KeyStone specific implementation with ks_ in order to
avoid name-space conflict.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Masahiro Yamada 2016-09-26 20:45:26 +09:00 • committed by Tom Rini
parent 2846bd03ea
commit 43ebbfc39f
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/include/asm/ti-common/keystone_net.h
View file

@ -51,9 +51,9 @@
/* MDIO module input frequency */ /* MDIO module input frequency */
#ifdef CONFIG_SOC_K2G #ifdef CONFIG_SOC_K2G
#define EMAC_MDIO_BUS_FREQ (clk_get_rate(sys_clk0_3_clk)) #define EMAC_MDIO_BUS_FREQ (ks_clk_get_rate(sys_clk0_3_clk))
#else #else
#define EMAC_MDIO_BUS_FREQ (clk_get_rate(pass_pll_clk)) #define EMAC_MDIO_BUS_FREQ (ks_clk_get_rate(pass_pll_clk))
#endif #endif
/* MDIO clock output frequency */ /* MDIO clock output frequency */
#define EMAC_MDIO_CLOCK_FREQ 2500000 /* 2.5 MHz */ #define EMAC_MDIO_CLOCK_FREQ 2500000 /* 2.5 MHz */

24
arch/arm/mach-keystone/clock.c
View file

@ -341,7 +341,7 @@ static unsigned long pll_freq_get(int pll)
return ret; return ret;
} }
unsigned long clk_get_rate(unsigned int clk) unsigned long ks_clk_get_rate(unsigned int clk)
{ {
unsigned long freq = 0; unsigned long freq = 0;
@ -381,37 +381,37 @@ unsigned long clk_get_rate(unsigned int clk)
freq = pll_freq_get(CORE_PLL) / pll0div_read(4); freq = pll_freq_get(CORE_PLL) / pll0div_read(4);
break; break;
case sys_clk0_2_clk: case sys_clk0_2_clk:
freq = clk_get_rate(sys_clk0_clk) / 2; freq = ks_clk_get_rate(sys_clk0_clk) / 2;
break; break;
case sys_clk0_3_clk: case sys_clk0_3_clk:
freq = clk_get_rate(sys_clk0_clk) / 3; freq = ks_clk_get_rate(sys_clk0_clk) / 3;
break; break;
case sys_clk0_4_clk: case sys_clk0_4_clk:
freq = clk_get_rate(sys_clk0_clk) / 4; freq = ks_clk_get_rate(sys_clk0_clk) / 4;
break; break;
case sys_clk0_6_clk: case sys_clk0_6_clk:
freq = clk_get_rate(sys_clk0_clk) / 6; freq = ks_clk_get_rate(sys_clk0_clk) / 6;
break; break;
case sys_clk0_8_clk: case sys_clk0_8_clk:
freq = clk_get_rate(sys_clk0_clk) / 8; freq = ks_clk_get_rate(sys_clk0_clk) / 8;
break; break;
case sys_clk0_12_clk: case sys_clk0_12_clk:
freq = clk_get_rate(sys_clk0_clk) / 12; freq = ks_clk_get_rate(sys_clk0_clk) / 12;
break; break;
case sys_clk0_24_clk: case sys_clk0_24_clk:
freq = clk_get_rate(sys_clk0_clk) / 24; freq = ks_clk_get_rate(sys_clk0_clk) / 24;
break; break;
case sys_clk1_3_clk: case sys_clk1_3_clk:
freq = clk_get_rate(sys_clk1_clk) / 3; freq = ks_clk_get_rate(sys_clk1_clk) / 3;
break; break;
case sys_clk1_4_clk: case sys_clk1_4_clk:
freq = clk_get_rate(sys_clk1_clk) / 4; freq = ks_clk_get_rate(sys_clk1_clk) / 4;
break; break;
case sys_clk1_6_clk: case sys_clk1_6_clk:
freq = clk_get_rate(sys_clk1_clk) / 6; freq = ks_clk_get_rate(sys_clk1_clk) / 6;
break; break;
case sys_clk1_12_clk: case sys_clk1_12_clk:
freq = clk_get_rate(sys_clk1_clk) / 12; freq = ks_clk_get_rate(sys_clk1_clk) / 12;
break; break;
default: default:
break; break;

2
arch/arm/mach-keystone/cmd_clock.c
View file

@ -74,7 +74,7 @@ int do_getclk_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
clk = simple_strtoul(argv[1], NULL, 10); clk = simple_strtoul(argv[1], NULL, 10);
freq = clk_get_rate(clk); freq = ks_clk_get_rate(clk);
if (freq) if (freq)
printf("clock index [%d] - frequency %lu\n", clk, freq); printf("clock index [%d] - frequency %lu\n", clk, freq);
else else

2
arch/arm/mach-keystone/include/mach/clock.h
View file

@ -125,7 +125,7 @@ extern int speeds[];
void init_plls(void); void init_plls(void);
void init_pll(const struct pll_init_data *data); void init_pll(const struct pll_init_data *data);
struct pll_init_data *get_pll_init_data(int pll); struct pll_init_data *get_pll_init_data(int pll);
unsigned long clk_get_rate(unsigned int clk); unsigned long ks_clk_get_rate(unsigned int clk);
int get_max_dev_speed(int *spds); int get_max_dev_speed(int *spds);
int get_max_arm_speed(int *spds); int get_max_arm_speed(int *spds);
void pll_pa_clk_sel(void); void pll_pa_clk_sel(void);

8
include/configs/ti_armv7_keystone2.h
View file

@ -68,14 +68,14 @@
#define CONFIG_CONS_INDEX 1 #define CONFIG_CONS_INDEX 1
#ifndef CONFIG_SOC_K2G #ifndef CONFIG_SOC_K2G
#define CONFIG_SYS_NS16550_CLK clk_get_rate(KS2_CLK1_6) #define CONFIG_SYS_NS16550_CLK ks_clk_get_rate(KS2_CLK1_6)
#else #else
#define CONFIG_SYS_NS16550_CLK clk_get_rate(uart_pll_clk) / 2 #define CONFIG_SYS_NS16550_CLK ks_clk_get_rate(uart_pll_clk) / 2
#endif #endif
/* SPI Configuration */ /* SPI Configuration */
#define CONFIG_DAVINCI_SPI #define CONFIG_DAVINCI_SPI
#define CONFIG_SYS_SPI_CLK clk_get_rate(KS2_CLK1_6) #define CONFIG_SYS_SPI_CLK ks_clk_get_rate(KS2_CLK1_6)
#define CONFIG_SF_DEFAULT_SPEED 30000000 #define CONFIG_SF_DEFAULT_SPEED 30000000
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
#define CONFIG_SYS_SPI0 #define CONFIG_SYS_SPI0
@ -314,7 +314,7 @@
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#ifndef CONFIG_SOC_K2G #ifndef CONFIG_SOC_K2G
#define CONFIG_SYS_HZ_CLOCK clk_get_rate(KS2_CLK1_6) #define CONFIG_SYS_HZ_CLOCK ks_clk_get_rate(KS2_CLK1_6)
#else #else
#define CONFIG_SYS_HZ_CLOCK external_clk[sys_clk] #define CONFIG_SYS_HZ_CLOCK external_clk[sys_clk]
#endif #endif