Commit 09bad0df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull clk fixes from Stephen Boyd:
 "Here's more than a handful of clk driver fixes for changes that came
  in during the merge window:

   - Fix the AT91 sama5d2 programmable clk prescaler formula

   - A bunch of Amlogic meson clk driver fixes for the VPU clks

   - A DMI quirk for Intel's Bay Trail SoC's driver to properly mark pmc
     clks as critical only when really needed

   - Stop overwriting CLK_SET_RATE_PARENT flag in mediatek's clk gate
     implementation

   - Use the right structure to test for a frequency table in i.MX's
     PLL_1416x driver"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: imx: Fix PLL_1416X not rounding rates
  clk: mediatek: fix clk-gate flag setting
  platform/x86: pmc_atom: Drop __initconst on dmi table
  clk: x86: Add system specific quirk to mark clocks as critical
  clk: meson: vid-pll-div: remove warning and return 0 on invalid config
  clk: meson: pll: fix rounding and setting a rate that matches precisely
  clk: meson-g12a: fix VPU clock parents
  clk: meson: g12a: fix VPU clock muxes mask
  clk: meson-gxbb: round the vdec dividers to closest
  clk: at91: fix programmable clock for sama5d2
parents a3b84248 f89b9e1b

drivers/clk/at91/clk-programmable.c

+43 −14
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
#define PROG_ID_MAX		7



#define PROG_STATUS_MASK(id)	(1 << ((id) + 8))

#define PROG_PRES_MASK		0x7

#define PROG_PRES(layout, pckr)	((pckr >> layout->pres_shift) & PROG_PRES_MASK)

#define PROG_PRES(layout, pckr)	((pckr >> layout->pres_shift) & layout->pres_mask)

#define PROG_MAX_RM9200_CSS	3



struct clk_programmable {
@@ -37,20 +36,29 @@ static unsigned long clk_programmable_recalc_rate(struct clk_hw *hw, 
						  unsigned long parent_rate)

{

	struct clk_programmable *prog = to_clk_programmable(hw);

	const struct clk_programmable_layout *layout = prog->layout;

	unsigned int pckr;

	unsigned long rate;



	regmap_read(prog->regmap, AT91_PMC_PCKR(prog->id), &pckr);



	return parent_rate >> PROG_PRES(prog->layout, pckr);

	if (layout->is_pres_direct)

		rate = parent_rate / (PROG_PRES(layout, pckr) + 1);

	else

		rate = parent_rate >> PROG_PRES(layout, pckr);



	return rate;

}



static int clk_programmable_determine_rate(struct clk_hw *hw,

					   struct clk_rate_request *req)

{

	struct clk_programmable *prog = to_clk_programmable(hw);

	const struct clk_programmable_layout *layout = prog->layout;

	struct clk_hw *parent;

	long best_rate = -EINVAL;

	unsigned long parent_rate;

	unsigned long tmp_rate;

	unsigned long tmp_rate = 0;

	int shift;

	int i;
@@ -60,11 +68,19 @@ static int clk_programmable_determine_rate(struct clk_hw *hw, 
			continue;



		parent_rate = clk_hw_get_rate(parent);

		for (shift = 0; shift < PROG_PRES_MASK; shift++) {

		if (layout->is_pres_direct) {

			for (shift = 0; shift <= layout->pres_mask; shift++) {

				tmp_rate = parent_rate / (shift + 1);

				if (tmp_rate <= req->rate)

					break;

			}

		} else {

			for (shift = 0; shift < layout->pres_mask; shift++) {

				tmp_rate = parent_rate >> shift;

				if (tmp_rate <= req->rate)

					break;

			}

		}



		if (tmp_rate > req->rate)

			continue;
@@ -137,16 +153,23 @@ static int clk_programmable_set_rate(struct clk_hw *hw, unsigned long rate, 
	if (!div)

		return -EINVAL;



	if (layout->is_pres_direct) {

		shift = div - 1;



		if (shift > layout->pres_mask)

			return -EINVAL;

	} else {

		shift = fls(div) - 1;



		if (div != (1 << shift))

			return -EINVAL;



	if (shift >= PROG_PRES_MASK)

		if (shift >= layout->pres_mask)

			return -EINVAL;

	}



	regmap_update_bits(prog->regmap, AT91_PMC_PCKR(prog->id),

			   PROG_PRES_MASK << layout->pres_shift,

			   layout->pres_mask << layout->pres_shift,

			   shift << layout->pres_shift);



	return 0;
@@ -202,19 +225,25 @@ at91_clk_register_programmable(struct regmap *regmap, 
}



const struct clk_programmable_layout at91rm9200_programmable_layout = {

	.pres_mask = 0x7,

	.pres_shift = 2,

	.css_mask = 0x3,

	.have_slck_mck = 0,

	.is_pres_direct = 0,

};



const struct clk_programmable_layout at91sam9g45_programmable_layout = {

	.pres_mask = 0x7,

	.pres_shift = 2,

	.css_mask = 0x3,

	.have_slck_mck = 1,

	.is_pres_direct = 0,

};



const struct clk_programmable_layout at91sam9x5_programmable_layout = {

	.pres_mask = 0x7,

	.pres_shift = 4,

	.css_mask = 0x7,

	.have_slck_mck = 0,

	.is_pres_direct = 0,

};

drivers/clk/at91/pmc.h

+2 −0
Original line number Diff line number Diff line
@@ -71,9 +71,11 @@ struct clk_pll_characteristics { 
};



struct clk_programmable_layout {

	u8 pres_mask;

	u8 pres_shift;

	u8 css_mask;

	u8 have_slck_mck;

	u8 is_pres_direct;

};



extern const struct clk_programmable_layout at91rm9200_programmable_layout;

drivers/clk/at91/sama5d2.c

+9 −1
Original line number Diff line number Diff line
@@ -125,6 +125,14 @@ static const struct { 
	  .pll = true },

};



static const struct clk_programmable_layout sama5d2_programmable_layout = {

	.pres_mask = 0xff,

	.pres_shift = 4,

	.css_mask = 0x7,

	.have_slck_mck = 0,

	.is_pres_direct = 1,

};



static void __init sama5d2_pmc_setup(struct device_node *np)

{

	struct clk_range range = CLK_RANGE(0, 0);
@@ -249,7 +257,7 @@ static void __init sama5d2_pmc_setup(struct device_node *np) 


		hw = at91_clk_register_programmable(regmap, name,

						    parent_names, 6, i,

						    &at91sam9x5_programmable_layout);

						    &sama5d2_programmable_layout);

		if (IS_ERR(hw))

			goto err_free;

	}

drivers/clk/imx/clk-pll14xx.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ struct clk *imx_clk_pll14xx(const char *name, const char *parent_name, 


	switch (pll_clk->type) {

	case PLL_1416X:

		if (!pll->rate_table)

		if (!pll_clk->rate_table)

			init.ops = &clk_pll1416x_min_ops;

		else

			init.ops = &clk_pll1416x_ops;

drivers/clk/mediatek/clk-gate.c

+1 −2
Original line number Diff line number Diff line
@@ -169,11 +169,10 @@ struct clk *mtk_clk_register_gate( 
		return ERR_PTR(-ENOMEM);



	init.name = name;

	init.flags = CLK_SET_RATE_PARENT;

	init.flags = flags | CLK_SET_RATE_PARENT;

	init.parent_names = parent_name ? &parent_name : NULL;

	init.num_parents = parent_name ? 1 : 0;

	init.ops = ops;

	init.flags = flags;



	cg->regmap = regmap;

	cg->set_ofs = set_ofs;

CRA Git | Maintained and supported by SUSTech CRA and CCSE