Skip to content

Commit 6bbc69e

Browse files
committed
Merge tag 'socfpga_clk_updates_for_6.16_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into clk-socfpga
Pull SoCFPGA clk driver updates from Dinh Nguyen: - Optimize local variables for clocks * tag 'socfpga_clk_updates_for_6.16_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux: clk: socfpga: stratix10: Optimize local variables clk: socfpga: clk-pll: Optimize local variables
2 parents 0af2f6b + 0248bfb commit 6bbc69e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

drivers/clk/socfpga/clk-pll-s10.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ static unsigned long clk_pll_recalc_rate(struct clk_hw *hwclk,
8383
unsigned long parent_rate)
8484
{
8585
struct socfpga_pll *socfpgaclk = to_socfpga_clk(hwclk);
86-
unsigned long mdiv;
87-
unsigned long refdiv;
88-
unsigned long reg;
86+
u32 mdiv;
87+
u32 refdiv;
88+
u32 reg;
8989
unsigned long long vco_freq;
9090

9191
/* read VCO1 reg for numerator and denominator */

drivers/clk/socfpga/clk-pll.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ static unsigned long clk_pll_recalc_rate(struct clk_hw *hwclk,
3939
unsigned long parent_rate)
4040
{
4141
struct socfpga_pll *socfpgaclk = to_socfpga_clk(hwclk);
42-
unsigned long divf, divq, reg;
42+
u32 divf, divq, reg;
4343
unsigned long long vco_freq;
44-
unsigned long bypass;
44+
u32 bypass;
4545

4646
reg = readl(socfpgaclk->hw.reg);
4747
bypass = readl(clk_mgr_base_addr + CLKMGR_BYPASS);

0 commit comments

Comments
 (0)