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

Commit 57527ed1 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 driver fixes.

  The sunxi fixes are for an incorrect clk tree configuration and a bad
  frequency calculation. The other two are fixes for passing the wrong
  pointer in drivers recently converted to clk_hw style registration"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: efm32gg: Pass correct type to hw provider registration
  clk: berlin: Pass correct type to hw provider registration
  clk: sunxi: Fix M factor computation for APB1
  clk: sunxi-ng: sun6i-a31: Force AHB1 clock to use PLL6 as parent
parents 000b8949 c8616671

drivers/clk/berlin/bg2.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -685,7 +685,7 @@ static void __init berlin2_clock_setup(struct device_node *np) 
	}

	}





	/* register clk-provider */

	/* register clk-provider */

	of_clk_add_hw_provider(np, of_clk_hw_onecell_get, &clk_data);

	of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_data);





	return;

	return;

drivers/clk/berlin/bg2q.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -382,7 +382,7 @@ static void __init berlin2q_clock_setup(struct device_node *np) 
	}

	}





	/* register clk-provider */

	/* register clk-provider */

	of_clk_add_hw_provider(np, of_clk_hw_onecell_get, &clk_data);

	of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_data);





	return;

	return;

drivers/clk/clk-efm32gg.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -82,6 +82,6 @@ static void __init efm32gg_cmu_init(struct device_node *np) 
	hws[clk_HFPERCLKDAC0] = clk_hw_register_gate(NULL, "HFPERCLK.DAC0",

	hws[clk_HFPERCLKDAC0] = clk_hw_register_gate(NULL, "HFPERCLK.DAC0",

			"HFXO", 0, base + CMU_HFPERCLKEN0, 17, 0, NULL);

			"HFXO", 0, base + CMU_HFPERCLKEN0, 17, 0, NULL);





	of_clk_add_hw_provider(np, of_clk_hw_onecell_get, &clk_data);

	of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_data);

}

}

CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init);
 
CLK_OF_DECLARE(efm32ggcmu, "efm32gg,cmu", efm32gg_cmu_init);

drivers/clk/sunxi-ng/ccu-sun6i-a31.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -191,6 +191,8 @@ static struct clk_div_table axi_div_table[] = { 
static SUNXI_CCU_DIV_TABLE(axi_clk, "axi", "cpu",

static SUNXI_CCU_DIV_TABLE(axi_clk, "axi", "cpu",

			   0x050, 0, 3, axi_div_table, 0);

			   0x050, 0, 3, axi_div_table, 0);





#define SUN6I_A31_AHB1_REG  0x054



static const char * const ahb1_parents[] = { "osc32k", "osc24M",

static const char * const ahb1_parents[] = { "osc32k", "osc24M",

					     "axi", "pll-periph" };

					     "axi", "pll-periph" };
@@ -1230,6 +1232,16 @@ static void __init sun6i_a31_ccu_setup(struct device_node *node) 
	val &= BIT(16);

	val &= BIT(16);

	writel(val, reg + SUN6I_A31_PLL_MIPI_REG);

	writel(val, reg + SUN6I_A31_PLL_MIPI_REG);





	/* Force AHB1 to PLL6 / 3 */

	val = readl(reg + SUN6I_A31_AHB1_REG);

	/* set PLL6 pre-div = 3 */

	val &= ~GENMASK(7, 6);

	val |= 0x2 << 6;

	/* select PLL6 / pre-div */

	val &= ~GENMASK(13, 12);

	val |= 0x3 << 12;

	writel(val, reg + SUN6I_A31_AHB1_REG);



	sunxi_ccu_probe(node, reg, &sun6i_a31_ccu_desc);

	sunxi_ccu_probe(node, reg, &sun6i_a31_ccu_desc);





	ccu_mux_notifier_register(pll_cpu_clk.common.hw.clk,

	ccu_mux_notifier_register(pll_cpu_clk.common.hw.clk,

drivers/clk/sunxi/clk-sunxi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -373,7 +373,7 @@ static void sun4i_get_apb1_factors(struct factors_request *req) 
	else

	else

		calcp = 3;

		calcp = 3;





	calcm = (req->parent_rate >> calcp) - 1;

	calcm = (div >> calcp) - 1;





	req->rate = (req->parent_rate >> calcp) / (calcm + 1);

	req->rate = (req->parent_rate >> calcp) / (calcm + 1);

	req->m = calcm;

	req->m = calcm;