Commit ef9ca02b 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:
 "A handful of critical fixes for changes introduce this merge window.

   - The TI sci_clk_get() API was pretty broken and nobody noticed.

   - There were some CPUfreq crashes on C.H.I.P devices because we
     failed to propagate rates up the clk tree.

   - Also, the Intel Atom PMC clk driver needs to mark a clk critical if
     the firmware has it enabled already so that audio doesn't get
     killed on Baytrail.

   - Gemini devices have a dead serial console because the reset control
     usage in the serial driver assume one method of reset that gemini
     doesn't support (this will be fixed in the next version in the
     reset framework so this is the small fix for -rc series).

   - Finally we have two rate calculation fixes, one for Exynos and one
     for Meson SoCs, that fix rate inconsistencies"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: keystone: sci-clk: Fix sci_clk_get
  clk: meson: mpll: fix mpll0 fractional part ignored
  clk: samsung: exynos5420: The EPLL rate table corrections
  clk: sunxi-ng: sun5i: Add clk_set_rate_parent to the CPU clock
  clk: x86: Do not gate clocks enabled by the firmware
  clk: gemini: Fix reset regression
parents 69995074 f54d2cd3

drivers/clk/clk-gemini.c

+14 −0
Original line number Diff line number Diff line
@@ -237,6 +237,18 @@ static int gemini_reset(struct reset_controller_dev *rcdev, 
			    BIT(GEMINI_RESET_CPU1) | BIT(id));

}



static int gemini_reset_assert(struct reset_controller_dev *rcdev,

			       unsigned long id)

{

	return 0;

}



static int gemini_reset_deassert(struct reset_controller_dev *rcdev,

				 unsigned long id)

{

	return 0;

}



static int gemini_reset_status(struct reset_controller_dev *rcdev,

			     unsigned long id)

{
@@ -253,6 +265,8 @@ static int gemini_reset_status(struct reset_controller_dev *rcdev, 


static const struct reset_control_ops gemini_reset_ops = {

	.reset = gemini_reset,

	.assert = gemini_reset_assert,

	.deassert = gemini_reset_deassert,

	.status = gemini_reset_status,

};

drivers/clk/keystone/sci-clk.c

+42 −24
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/soc/ti/ti_sci_protocol.h>

#include <linux/bsearch.h>



#define SCI_CLK_SSC_ENABLE		BIT(0)

#define SCI_CLK_ALLOW_FREQ_CHANGE	BIT(1)
@@ -44,6 +45,7 @@ struct sci_clk_data { 
 * @dev: Device pointer for the clock provider

 * @clk_data: Clock data

 * @clocks: Clocks array for this device

 * @num_clocks: Total number of clocks for this provider

 */

struct sci_clk_provider {

	const struct ti_sci_handle *sci;
@@ -51,6 +53,7 @@ struct sci_clk_provider { 
	struct device *dev;

	const struct sci_clk_data *clk_data;

	struct clk_hw **clocks;

	int num_clocks;

};



/**
@@ -58,7 +61,6 @@ struct sci_clk_provider { 
 * @hw:		 Hardware clock cookie for common clock framework

 * @dev_id:	 Device index

 * @clk_id:	 Clock index

 * @node:	 Clocks list link

 * @provider:	 Master clock provider

 * @flags:	 Flags for the clock

 */
@@ -66,7 +68,6 @@ struct sci_clk { 
	struct clk_hw hw;

	u16 dev_id;

	u8 clk_id;

	struct list_head node;

	struct sci_clk_provider *provider;

	u8 flags;

};
@@ -367,6 +368,19 @@ err: 
	return &sci_clk->hw;

}



static int _cmp_sci_clk(const void *a, const void *b)

{

	const struct sci_clk *ca = a;

	const struct sci_clk *cb = *(struct sci_clk **)b;



	if (ca->dev_id == cb->dev_id && ca->clk_id == cb->clk_id)

		return 0;

	if (ca->dev_id > cb->dev_id ||

	    (ca->dev_id == cb->dev_id && ca->clk_id > cb->clk_id))

		return 1;

	return -1;

}



/**

 * sci_clk_get - Xlate function for getting clock handles

 * @clkspec: device tree clock specifier
@@ -380,29 +394,22 @@ err: 
static struct clk_hw *sci_clk_get(struct of_phandle_args *clkspec, void *data)

{

	struct sci_clk_provider *provider = data;

	u16 dev_id;

	u8 clk_id;

	const struct sci_clk_data *clks = provider->clk_data;

	struct clk_hw **clocks = provider->clocks;

	struct sci_clk **clk;

	struct sci_clk key;



	if (clkspec->args_count != 2)

		return ERR_PTR(-EINVAL);



	dev_id = clkspec->args[0];

	clk_id = clkspec->args[1];



	while (clks->num_clks) {

		if (clks->dev == dev_id) {

			if (clk_id >= clks->num_clks)

				return ERR_PTR(-EINVAL);



			return clocks[clk_id];

		}

	key.dev_id = clkspec->args[0];

	key.clk_id = clkspec->args[1];



		clks++;

	}

	clk = bsearch(&key, provider->clocks, provider->num_clocks,

		      sizeof(clk), _cmp_sci_clk);



	if (!clk)

		return ERR_PTR(-ENODEV);



	return &(*clk)->hw;

}



static int ti_sci_init_clocks(struct sci_clk_provider *p)
@@ -410,18 +417,29 @@ static int ti_sci_init_clocks(struct sci_clk_provider *p) 
	const struct sci_clk_data *data = p->clk_data;

	struct clk_hw *hw;

	int i;

	int num_clks = 0;



	while (data->num_clks) {

		p->clocks = devm_kcalloc(p->dev, data->num_clks,

					 sizeof(struct sci_clk),

		num_clks += data->num_clks;

		data++;

	}



	p->num_clocks = num_clks;



	p->clocks = devm_kcalloc(p->dev, num_clks, sizeof(struct sci_clk),

				 GFP_KERNEL);

	if (!p->clocks)

		return -ENOMEM;



	num_clks = 0;



	data = p->clk_data;



	while (data->num_clks) {

		for (i = 0; i < data->num_clks; i++) {

			hw = _sci_clk_build(p, data->dev, i);

			if (!IS_ERR(hw)) {

				p->clocks[i] = hw;

				p->clocks[num_clks++] = hw;

				continue;

			}

drivers/clk/meson/clk-mpll.c

+7 −0
Original line number Diff line number Diff line
@@ -161,6 +161,13 @@ static int mpll_set_rate(struct clk_hw *hw, 
	reg = PARM_SET(p->width, p->shift, reg, 1);

	writel(reg, mpll->base + p->reg_off);



	p = &mpll->ssen;

	if (p->width != 0) {

		reg = readl(mpll->base + p->reg_off);

		reg = PARM_SET(p->width, p->shift, reg, 1);

		writel(reg, mpll->base + p->reg_off);

	}



	p = &mpll->n2;

	reg = readl(mpll->base + p->reg_off);

	reg = PARM_SET(p->width, p->shift, reg, n2);

drivers/clk/meson/clkc.h

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ struct meson_clk_mpll { 
	struct parm sdm_en;

	struct parm n2;

	struct parm en;

	struct parm ssen;

	spinlock_t *lock;

};

drivers/clk/meson/gxbb.c

+5 −0
Original line number Diff line number Diff line
@@ -528,6 +528,11 @@ static struct meson_clk_mpll gxbb_mpll0 = { 
		.shift   = 14,

		.width	 = 1,

	},

	.ssen = {

		.reg_off = HHI_MPLL_CNTL,

		.shift   = 25,

		.width	 = 1,

	},

	.lock = &clk_lock,

	.hw.init = &(struct clk_init_data){

		.name = "mpll0",

CRA Git | Maintained and supported by SUSTech CRA and CCSE