leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clk: stm32f7: rename clk_stm32f7.c to clk_stm32f.c

Browse Source 
Now that clk_stm32f7.c manages clocks for both STM32F4 and F7 SoCs
rename it to a more generic clk_stm32f.c

Fix also some checkpatch errors/warnings.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Vikas Manocha <vikas.manocha@st.com>
This commit is contained in:
Patrice Chotard 2017-11-15 13:14:48 +01:00 committed by Tom Rini
parent f9333c93c8
commit f264e23572
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/clk/Kconfig
View File

@ -46,6 +46,14 @@ config CLK_BOSTON
help help
Enable this to support the clocks Enable this to support the clocks
config CLK_STM32F
bool "Enable clock driver support for STM32F family"
depends on CLK && (STM32F7 || STM32F4)
default y
help
This clock driver adds support for RCC clock management
for STM32F4 and STM32F7 SoCs.
config CLK_ZYNQ config CLK_ZYNQ
bool "Enable clock driver support for Zynq" bool "Enable clock driver support for Zynq"
depends on CLK && ARCH_ZYNQ depends on CLK && ARCH_ZYNQ

2
drivers/clk/Makefile
View File

@ -21,5 +21,5 @@ obj-$(CONFIG_CLK_AT91) += at91/
obj-$(CONFIG_CLK_BCM6345) += clk_bcm6345.o obj-$(CONFIG_CLK_BCM6345) += clk_bcm6345.o
obj-$(CONFIG_CLK_BOSTON) += clk_boston.o obj-$(CONFIG_CLK_BOSTON) += clk_boston.o
obj-$(CONFIG_ARCH_ASPEED) += aspeed/ obj-$(CONFIG_ARCH_ASPEED) += aspeed/
obj-$(CONFIG_STM32F7) += clk_stm32f7.o obj-$(CONFIG_CLK_STM32F) += clk_stm32f.o
obj-$(CONFIG_STM32H7) += clk_stm32h7.o obj-$(CONFIG_STM32H7) += clk_stm32h7.o

12
drivers/clk/clk_stm32f7.c → drivers/clk/clk_stm32f.c
View File

@ -197,6 +197,7 @@ static unsigned long stm32_clk_get_rate(struct clk *clk)
struct stm32_rcc_regs *regs = priv->base; struct stm32_rcc_regs *regs = priv->base;
u32 sysclk = 0; u32 sysclk = 0;
u32 shift = 0; u32 shift = 0;
u16 pllm, plln, pllp;
/* Prescaler table lookups for clock computation */ /* Prescaler table lookups for clock computation */
u8 ahb_psc_table[16] = { u8 ahb_psc_table[16] = {
0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 6, 7, 8, 9
@ -207,7 +208,6 @@ static unsigned long stm32_clk_get_rate(struct clk *clk)
if ((readl(&regs->cfgr) & RCC_CFGR_SWS_MASK) == if ((readl(&regs->cfgr) & RCC_CFGR_SWS_MASK) ==
RCC_CFGR_SWS_PLL) { RCC_CFGR_SWS_PLL) {
u16 pllm, plln, pllp;
pllm = (readl(&regs->pllcfgr) & RCC_PLLCFGR_PLLM_MASK); pllm = (readl(&regs->pllcfgr) & RCC_PLLCFGR_PLLM_MASK);
plln = ((readl(&regs->pllcfgr) & RCC_PLLCFGR_PLLN_MASK) plln = ((readl(&regs->pllcfgr) & RCC_PLLCFGR_PLLN_MASK)
>> RCC_PLLCFGR_PLLN_SHIFT); >> RCC_PLLCFGR_PLLN_SHIFT);
@ -228,25 +228,21 @@ static unsigned long stm32_clk_get_rate(struct clk *clk)
(readl(&regs->cfgr) & RCC_CFGR_AHB_PSC_MASK) (readl(&regs->cfgr) & RCC_CFGR_AHB_PSC_MASK)
>> RCC_CFGR_HPRE_SHIFT)]; >> RCC_CFGR_HPRE_SHIFT)];
return sysclk >>= shift; return sysclk >>= shift;
break;
/* APB1 CLOCK */ /* APB1 CLOCK */
case STM32F7_APB1_CLOCK(TIM2) ... STM32F7_APB1_CLOCK(UART8): case STM32F7_APB1_CLOCK(TIM2) ... STM32F7_APB1_CLOCK(UART8):
shift = apb_psc_table[( shift = apb_psc_table[(
(readl(&regs->cfgr) & RCC_CFGR_APB1_PSC_MASK) (readl(&regs->cfgr) & RCC_CFGR_APB1_PSC_MASK)
>> RCC_CFGR_PPRE1_SHIFT)]; >> RCC_CFGR_PPRE1_SHIFT)];
return sysclk >>= shift; return sysclk >>= shift;
break;
/* APB2 CLOCK */ /* APB2 CLOCK */
case STM32F7_APB2_CLOCK(TIM1) ... STM32F7_APB2_CLOCK(LTDC): case STM32F7_APB2_CLOCK(TIM1) ... STM32F7_APB2_CLOCK(LTDC):
shift = apb_psc_table[( shift = apb_psc_table[(
(readl(&regs->cfgr) & RCC_CFGR_APB2_PSC_MASK) (readl(&regs->cfgr) & RCC_CFGR_APB2_PSC_MASK)
>> RCC_CFGR_PPRE2_SHIFT)]; >> RCC_CFGR_PPRE2_SHIFT)];
return sysclk >>= shift; return sysclk >>= shift;
break;
default: default:
pr_err("clock index %ld out of range\n", clk->id); pr_err("clock index %ld out of range\n", clk->id);
return -EINVAL; return -EINVAL;
break;
} }
} }
@ -288,7 +284,7 @@ static int stm32_clk_probe(struct udevice *dev)
struct ofnode_phandle_args args; struct ofnode_phandle_args args;
int err; int err;
debug("%s: stm32_clk_probe\n", __func__); debug("%s\n", __func__);
struct stm32_clk *priv = dev_get_priv(dev); struct stm32_clk *priv = dev_get_priv(dev);
fdt_addr_t addr; fdt_addr_t addr;
@ -346,8 +342,8 @@ static const struct udevice_id stm32_clk_ids[] = {
{} {}
}; };
U_BOOT_DRIVER(stm32f7_clk) = { U_BOOT_DRIVER(stm32fx_clk) = {
.name = "stm32f7_clk", .name = "stm32fx_clk",
.id = UCLASS_CLK, .id = UCLASS_CLK,
.of_match = stm32_clk_ids, .of_match = stm32_clk_ids,
.ops = &stm32_clk_ops, .ops = &stm32_clk_ops,