|
@@ -463,22 +463,20 @@ static int xgene_clk_enable(struct clk_hw *hw)
|
|
struct xgene_clk *pclk = to_xgene_clk(hw);
|
|
struct xgene_clk *pclk = to_xgene_clk(hw);
|
|
unsigned long flags = 0;
|
|
unsigned long flags = 0;
|
|
u32 data;
|
|
u32 data;
|
|
- phys_addr_t reg;
|
|
|
|
|
|
|
|
if (pclk->lock)
|
|
if (pclk->lock)
|
|
spin_lock_irqsave(pclk->lock, flags);
|
|
spin_lock_irqsave(pclk->lock, flags);
|
|
|
|
|
|
if (pclk->param.csr_reg != NULL) {
|
|
if (pclk->param.csr_reg != NULL) {
|
|
pr_debug("%s clock enabled\n", clk_hw_get_name(hw));
|
|
pr_debug("%s clock enabled\n", clk_hw_get_name(hw));
|
|
- reg = __pa(pclk->param.csr_reg);
|
|
|
|
/* First enable the clock */
|
|
/* First enable the clock */
|
|
data = xgene_clk_read(pclk->param.csr_reg +
|
|
data = xgene_clk_read(pclk->param.csr_reg +
|
|
pclk->param.reg_clk_offset);
|
|
pclk->param.reg_clk_offset);
|
|
data |= pclk->param.reg_clk_mask;
|
|
data |= pclk->param.reg_clk_mask;
|
|
xgene_clk_write(data, pclk->param.csr_reg +
|
|
xgene_clk_write(data, pclk->param.csr_reg +
|
|
pclk->param.reg_clk_offset);
|
|
pclk->param.reg_clk_offset);
|
|
- pr_debug("%s clock PADDR base %pa clk offset 0x%08X mask 0x%08X value 0x%08X\n",
|
|
|
|
- clk_hw_get_name(hw), ®,
|
|
|
|
|
|
+ pr_debug("%s clk offset 0x%08X mask 0x%08X value 0x%08X\n",
|
|
|
|
+ clk_hw_get_name(hw),
|
|
pclk->param.reg_clk_offset, pclk->param.reg_clk_mask,
|
|
pclk->param.reg_clk_offset, pclk->param.reg_clk_mask,
|
|
data);
|
|
data);
|
|
|
|
|
|
@@ -488,8 +486,8 @@ static int xgene_clk_enable(struct clk_hw *hw)
|
|
data &= ~pclk->param.reg_csr_mask;
|
|
data &= ~pclk->param.reg_csr_mask;
|
|
xgene_clk_write(data, pclk->param.csr_reg +
|
|
xgene_clk_write(data, pclk->param.csr_reg +
|
|
pclk->param.reg_csr_offset);
|
|
pclk->param.reg_csr_offset);
|
|
- pr_debug("%s CSR RESET PADDR base %pa csr offset 0x%08X mask 0x%08X value 0x%08X\n",
|
|
|
|
- clk_hw_get_name(hw), ®,
|
|
|
|
|
|
+ pr_debug("%s csr offset 0x%08X mask 0x%08X value 0x%08X\n",
|
|
|
|
+ clk_hw_get_name(hw),
|
|
pclk->param.reg_csr_offset, pclk->param.reg_csr_mask,
|
|
pclk->param.reg_csr_offset, pclk->param.reg_csr_mask,
|
|
data);
|
|
data);
|
|
}
|
|
}
|