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

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

Merge tag 'meson-clk-fixes-for-4.13-rc4-v2' of git://github.com/baylibre/clk-meson into clk-fixes 

Pull one Meson clock fix from Neil Armstrong

* tag 'meson-clk-fixes-for-4.13-rc4-v2' of git://github.com/baylibre/clk-meson:
  clk: meson: mpll: fix mpll0 fractional part ignored
parents 5b30850b 1f737ffa

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",

drivers/clk/meson/meson8b.c

+5 −0
Original line number Diff line number Diff line
@@ -267,6 +267,11 @@ static struct meson_clk_mpll meson8b_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",