OSDN Git Service

clk: nxp: clk-lpc32xx: rename clk_gate_is_enabled()
authorGabriel Fernandez <gabriel.fernandez@st.com>
Mon, 21 Aug 2017 11:59:00 +0000 (13:59 +0200)
committerStephen Boyd <sboyd@codeaurora.org>
Fri, 1 Sep 2017 01:35:44 +0000 (18:35 -0700)
We need to export clk_gate_is_enabled() from clk framework, then
to avoid compilation issue we have to rename clk_gate_is_enabled()
in NXP LPC32xx clock driver.
We changed all gate op with 'lpc32xx_' prefix:
lpc32xx_clk_gate_enable(),
lpc32xx_clk_gate_disable(),
lpc32xx_clk_gate_is_enabled().

Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
Acked-by: Vladimir Zapolskiy <vz@mleia.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/nxp/clk-lpc32xx.c

index 5b98ff9..7b359af 100644 (file)
@@ -885,7 +885,7 @@ static const struct clk_ops clk_usb_i2c_ops = {
        .recalc_rate = clk_usb_i2c_recalc_rate,
 };
 
-static int clk_gate_enable(struct clk_hw *hw)
+static int lpc32xx_clk_gate_enable(struct clk_hw *hw)
 {
        struct lpc32xx_clk_gate *clk = to_lpc32xx_gate(hw);
        u32 mask = BIT(clk->bit_idx);
@@ -894,7 +894,7 @@ static int clk_gate_enable(struct clk_hw *hw)
        return regmap_update_bits(clk_regmap, clk->reg, mask, val);
 }
 
-static void clk_gate_disable(struct clk_hw *hw)
+static void lpc32xx_clk_gate_disable(struct clk_hw *hw)
 {
        struct lpc32xx_clk_gate *clk = to_lpc32xx_gate(hw);
        u32 mask = BIT(clk->bit_idx);
@@ -903,7 +903,7 @@ static void clk_gate_disable(struct clk_hw *hw)
        regmap_update_bits(clk_regmap, clk->reg, mask, val);
 }
 
-static int clk_gate_is_enabled(struct clk_hw *hw)
+static int lpc32xx_clk_gate_is_enabled(struct clk_hw *hw)
 {
        struct lpc32xx_clk_gate *clk = to_lpc32xx_gate(hw);
        u32 val;
@@ -916,9 +916,9 @@ static int clk_gate_is_enabled(struct clk_hw *hw)
 }
 
 static const struct clk_ops lpc32xx_clk_gate_ops = {
-       .enable = clk_gate_enable,
-       .disable = clk_gate_disable,
-       .is_enabled = clk_gate_is_enabled,
+       .enable = lpc32xx_clk_gate_enable,
+       .disable = lpc32xx_clk_gate_disable,
+       .is_enabled = lpc32xx_clk_gate_is_enabled,
 };
 
 #define div_mask(width)        ((1 << (width)) - 1)