Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed9c62f7 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-const' into clk-next 

* clk-const:
  clk: make clk_init_data const
  clk: imx: make clk_ops const
  clk: mmp: make clk_ops const
  clk: hisilicon: make clk_ops const
  clk: mxs: make clk_ops const
  clk: sirf: make clk_ops const
  clk: spear: make clk_ops const
  CLK: SPEAr: make aux_clk_masks structures const
  CLK: SPEAr: make structure field and function argument as const
parents 3b0da916 0777066d

drivers/clk/clk-twl6040.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ static const struct clk_ops twl6040_pdmclk_ops = { 
	.recalc_rate = twl6040_pdmclk_recalc_rate,

	.recalc_rate = twl6040_pdmclk_recalc_rate,

};

};





static struct clk_init_data twl6040_pdmclk_init = {

static const struct clk_init_data twl6040_pdmclk_init = {

	.name = "pdmclk",

	.name = "pdmclk",

	.ops = &twl6040_pdmclk_ops,

	.ops = &twl6040_pdmclk_ops,

	.flags = CLK_GET_RATE_NOCACHE,

	.flags = CLK_GET_RATE_NOCACHE,

drivers/clk/clk-wm831x.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -52,7 +52,7 @@ static const struct clk_ops wm831x_xtal_ops = { 
	.recalc_rate = wm831x_xtal_recalc_rate,

	.recalc_rate = wm831x_xtal_recalc_rate,

};

};





static struct clk_init_data wm831x_xtal_init = {

static const struct clk_init_data wm831x_xtal_init = {

	.name = "xtal",

	.name = "xtal",

	.ops = &wm831x_xtal_ops,

	.ops = &wm831x_xtal_ops,

};

};
@@ -225,7 +225,7 @@ static const struct clk_ops wm831x_fll_ops = { 
	.get_parent = wm831x_fll_get_parent,

	.get_parent = wm831x_fll_get_parent,

};

};





static struct clk_init_data wm831x_fll_init = {

static const struct clk_init_data wm831x_fll_init = {

	.name = "fll",

	.name = "fll",

	.ops = &wm831x_fll_ops,

	.ops = &wm831x_fll_ops,

	.parent_names = wm831x_fll_parents,

	.parent_names = wm831x_fll_parents,
@@ -338,7 +338,7 @@ static const struct clk_ops wm831x_clkout_ops = { 
	.set_parent = wm831x_clkout_set_parent,

	.set_parent = wm831x_clkout_set_parent,

};

};





static struct clk_init_data wm831x_clkout_init = {

static const struct clk_init_data wm831x_clkout_init = {

	.name = "clkout",

	.name = "clkout",

	.ops = &wm831x_clkout_ops,

	.ops = &wm831x_clkout_ops,

	.parent_names = wm831x_clkout_parents,

	.parent_names = wm831x_clkout_parents,

drivers/clk/hisilicon/clk-hi3620.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -415,7 +415,7 @@ static int mmc_clk_set_rate(struct clk_hw *hw, unsigned long rate, 
	return mmc_clk_set_timing(hw, rate);

	return mmc_clk_set_timing(hw, rate);

}

}





static struct clk_ops clk_mmc_ops = {

static const struct clk_ops clk_mmc_ops = {

	.prepare = mmc_clk_prepare,

	.prepare = mmc_clk_prepare,

	.determine_rate = mmc_clk_determine_rate,

	.determine_rate = mmc_clk_determine_rate,

	.set_rate = mmc_clk_set_rate,

	.set_rate = mmc_clk_set_rate,

drivers/clk/hisilicon/clk-hix5hd2.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -208,7 +208,7 @@ static void clk_ether_unprepare(struct clk_hw *hw) 
	writel_relaxed(val, clk->ctrl_reg);

	writel_relaxed(val, clk->ctrl_reg);

}

}





static struct clk_ops clk_ether_ops = {

static const struct clk_ops clk_ether_ops = {

	.prepare = clk_ether_prepare,

	.prepare = clk_ether_prepare,

	.unprepare = clk_ether_unprepare,

	.unprepare = clk_ether_unprepare,

};

};
@@ -247,7 +247,7 @@ static void clk_complex_disable(struct clk_hw *hw) 
	writel_relaxed(val, clk->phy_reg);

	writel_relaxed(val, clk->phy_reg);

}

}





static struct clk_ops clk_complex_ops = {

static const struct clk_ops clk_complex_ops = {

	.enable = clk_complex_enable,

	.enable = clk_complex_enable,

	.disable = clk_complex_disable,

	.disable = clk_complex_disable,

};

};

drivers/clk/hisilicon/clkgate-separated.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -88,7 +88,7 @@ static int clkgate_separated_is_enabled(struct clk_hw *hw) 
	return reg ? 1 : 0;

	return reg ? 1 : 0;

}

}





static struct clk_ops clkgate_separated_ops = {

static const struct clk_ops clkgate_separated_ops = {

	.enable		= clkgate_separated_enable,

	.enable		= clkgate_separated_enable,

	.disable	= clkgate_separated_disable,

	.disable	= clkgate_separated_disable,

	.is_enabled	= clkgate_separated_is_enabled,

	.is_enabled	= clkgate_separated_is_enabled,