dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-10-30 18:05:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

ARM: socfpga: Convert callers of cm_write_with_phase for wait_for_bit_le32

Browse Source 
Now that we have and use wait_for_bit_le32() available, the callers of
cm_write_with_phase() should not be casting values to u32 and instead we
expect a const void *, so provide that directly.

Fixes: 48263504c8 ("wait_bit: use wait_for_bit_le32 and remove wait_for_bit")
Reviewed-by: Marek Vasut <marex@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2018-01-26 11:24:04 -05:00
parent fc04bd84b3
commit ab12aa24e6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-socfpga/clock_manager_gen5.c
View File

@@ -33,7 +33,7 @@ static void cm_write_ctrl(u32 val)
} }
/* function to write a clock register that has phase information */ /* function to write a clock register that has phase information */
static int cm_write_with_phase(u32 value, u32 reg_address, u32 mask) static int cm_write_with_phase(u32 value, const void *reg_address, u32 mask)
{ {
int ret; int ret;
@@ -268,26 +268,26 @@ int cm_basic_init(const struct cm_config * const cfg)
* are aligned nicely; so we can change any phase. * are aligned nicely; so we can change any phase.
*/ */
ret = cm_write_with_phase(cfg->ddrdqsclk, ret = cm_write_with_phase(cfg->ddrdqsclk,
(u32)&clock_manager_base->sdr_pll.ddrdqsclk, &clock_manager_base->sdr_pll.ddrdqsclk,
CLKMGR_SDRPLLGRP_DDRDQSCLK_PHASE_MASK); CLKMGR_SDRPLLGRP_DDRDQSCLK_PHASE_MASK);
if (ret) if (ret)
return ret; return ret;
/* SDRAM DDR2XDQSCLK */ /* SDRAM DDR2XDQSCLK */
ret = cm_write_with_phase(cfg->ddr2xdqsclk, ret = cm_write_with_phase(cfg->ddr2xdqsclk,
(u32)&clock_manager_base->sdr_pll.ddr2xdqsclk, &clock_manager_base->sdr_pll.ddr2xdqsclk,
CLKMGR_SDRPLLGRP_DDR2XDQSCLK_PHASE_MASK); CLKMGR_SDRPLLGRP_DDR2XDQSCLK_PHASE_MASK);
if (ret) if (ret)
return ret; return ret;
ret = cm_write_with_phase(cfg->ddrdqclk, ret = cm_write_with_phase(cfg->ddrdqclk,
(u32)&clock_manager_base->sdr_pll.ddrdqclk, &clock_manager_base->sdr_pll.ddrdqclk,
CLKMGR_SDRPLLGRP_DDRDQCLK_PHASE_MASK); CLKMGR_SDRPLLGRP_DDRDQCLK_PHASE_MASK);
if (ret) if (ret)
return ret; return ret;
ret = cm_write_with_phase(cfg->s2fuser2clk, ret = cm_write_with_phase(cfg->s2fuser2clk,
(u32)&clock_manager_base->sdr_pll.s2fuser2clk, &clock_manager_base->sdr_pll.s2fuser2clk,
CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_MASK); CLKMGR_SDRPLLGRP_S2FUSER2CLK_PHASE_MASK);
if (ret) if (ret)
return ret; return ret;