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

Commit c77662a4 authored by Michael Turquette's avatar Michael Turquette
Browse files

Merge branch 'for-4.1-clk-ti' of github.com:t-kristo/linux-pm into clk-next

parents 3966fab8 9089848d

drivers/clk/ti/apll.c

+3 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void __init of_dra7_apll_setup(struct device_node *node) 
	ad->control_reg = ti_clk_get_reg_addr(node, 0);

	ad->idlest_reg = ti_clk_get_reg_addr(node, 1);



	if (!ad->control_reg || !ad->idlest_reg)

	if (IS_ERR(ad->control_reg) || IS_ERR(ad->idlest_reg))

		goto cleanup;



	ad->idlest_mask = 0x1;
@@ -384,7 +384,8 @@ static void __init of_omap2_apll_setup(struct device_node *node) 
	ad->autoidle_reg = ti_clk_get_reg_addr(node, 1);

	ad->idlest_reg = ti_clk_get_reg_addr(node, 2);



	if (!ad->control_reg || !ad->autoidle_reg || !ad->idlest_reg)

	if (IS_ERR(ad->control_reg) || IS_ERR(ad->autoidle_reg) ||

	    IS_ERR(ad->idlest_reg))

		goto cleanup;



	clk = clk_register(NULL, &clk_hw->hw);

drivers/clk/ti/autoidle.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ int __init of_ti_clk_autoidle_setup(struct device_node *node) 
	clk->name = node->name;

	clk->reg = ti_clk_get_reg_addr(node, 0);



	if (!clk->reg) {

	if (IS_ERR(clk->reg)) {

		kfree(clk);

		return -EINVAL;

	}

drivers/clk/ti/clk-3xxx-legacy.c

+9 −7
Original line number Diff line number Diff line
@@ -4320,7 +4320,6 @@ static struct ti_clk_alias omap3xxx_clks[] = { 
	CLK(NULL, "dpll3_m3x2_ck", &dpll3_m3x2_ck),

	CLK("etb", "emu_core_alwon_ck", &emu_core_alwon_ck),

	CLK(NULL, "sys_altclk", &sys_altclk),

	CLK(NULL, "mcbsp_clks", &mcbsp_clks),

	CLK(NULL, "sys_clkout1", &sys_clkout1),

	CLK(NULL, "dpll3_m2_ck", &dpll3_m2_ck),

	CLK(NULL, "core_ck", &core_ck),
@@ -4369,8 +4368,6 @@ static struct ti_clk_alias omap3xxx_clks[] = { 
	CLK(NULL, "i2c3_fck", &i2c3_fck),

	CLK(NULL, "i2c2_fck", &i2c2_fck),

	CLK(NULL, "i2c1_fck", &i2c1_fck),

	CLK(NULL, "mcbsp5_fck", &mcbsp5_fck),

	CLK(NULL, "mcbsp1_fck", &mcbsp1_fck),

	CLK(NULL, "core_48m_fck", &core_48m_fck),

	CLK(NULL, "mcspi4_fck", &mcspi4_fck),

	CLK(NULL, "mcspi3_fck", &mcspi3_fck),
@@ -4409,8 +4406,6 @@ static struct ti_clk_alias omap3xxx_clks[] = { 
	CLK(NULL, "uart1_ick", &uart1_ick),

	CLK(NULL, "gpt11_ick", &gpt11_ick),

	CLK(NULL, "gpt10_ick", &gpt10_ick),

	CLK("omap-mcbsp.5", "ick", &mcbsp5_ick),

	CLK("omap-mcbsp.1", "ick", &mcbsp1_ick),

	CLK(NULL, "mcbsp5_ick", &mcbsp5_ick),

	CLK(NULL, "mcbsp1_ick", &mcbsp1_ick),

	CLK(NULL, "omapctrl_ick", &omapctrl_ick),
@@ -4467,15 +4462,22 @@ static struct ti_clk_alias omap3xxx_clks[] = { 
	CLK(NULL, "gpt4_ick", &gpt4_ick),

	CLK(NULL, "gpt3_ick", &gpt3_ick),

	CLK(NULL, "gpt2_ick", &gpt2_ick),

	CLK(NULL, "mcbsp_clks", &mcbsp_clks),

	CLK("omap-mcbsp.1", "ick", &mcbsp1_ick),

	CLK("omap-mcbsp.2", "ick", &mcbsp2_ick),

	CLK("omap-mcbsp.3", "ick", &mcbsp3_ick),

	CLK("omap-mcbsp.4", "ick", &mcbsp4_ick),

	CLK(NULL, "mcbsp4_ick", &mcbsp2_ick),

	CLK("omap-mcbsp.5", "ick", &mcbsp5_ick),

	CLK(NULL, "mcbsp1_ick", &mcbsp1_ick),

	CLK(NULL, "mcbsp2_ick", &mcbsp2_ick),

	CLK(NULL, "mcbsp3_ick", &mcbsp3_ick),

	CLK(NULL, "mcbsp2_ick", &mcbsp4_ick),

	CLK(NULL, "mcbsp4_ick", &mcbsp4_ick),

	CLK(NULL, "mcbsp5_ick", &mcbsp5_ick),

	CLK(NULL, "mcbsp1_fck", &mcbsp1_fck),

	CLK(NULL, "mcbsp2_fck", &mcbsp2_fck),

	CLK(NULL, "mcbsp3_fck", &mcbsp3_fck),

	CLK(NULL, "mcbsp4_fck", &mcbsp4_fck),

	CLK(NULL, "mcbsp5_fck", &mcbsp5_fck),

	CLK(NULL, "emu_src_mux_ck", &emu_src_mux_ck),

	CLK("etb", "emu_src_ck", &emu_src_ck),

	CLK(NULL, "emu_src_mux_ck", &emu_src_mux_ck),

drivers/clk/ti/clk-3xxx.c

+7 −12
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ static struct ti_dt_clk omap3xxx_clks[] = { 
	DT_CLK(NULL, "omap_96m_alwon_fck", "omap_96m_alwon_fck"),

	DT_CLK("etb", "emu_core_alwon_ck", "emu_core_alwon_ck"),

	DT_CLK(NULL, "sys_altclk", "sys_altclk"),

	DT_CLK(NULL, "mcbsp_clks", "mcbsp_clks"),

	DT_CLK(NULL, "sys_clkout1", "sys_clkout1"),

	DT_CLK(NULL, "dpll1_ck", "dpll1_ck"),

	DT_CLK(NULL, "dpll1_x2_ck", "dpll1_x2_ck"),
@@ -82,8 +81,6 @@ static struct ti_dt_clk omap3xxx_clks[] = { 
	DT_CLK(NULL, "i2c3_fck", "i2c3_fck"),

	DT_CLK(NULL, "i2c2_fck", "i2c2_fck"),

	DT_CLK(NULL, "i2c1_fck", "i2c1_fck"),

	DT_CLK(NULL, "mcbsp5_fck", "mcbsp5_fck"),

	DT_CLK(NULL, "mcbsp1_fck", "mcbsp1_fck"),

	DT_CLK(NULL, "core_48m_fck", "core_48m_fck"),

	DT_CLK(NULL, "mcspi4_fck", "mcspi4_fck"),

	DT_CLK(NULL, "mcspi3_fck", "mcspi3_fck"),
@@ -122,10 +119,6 @@ static struct ti_dt_clk omap3xxx_clks[] = { 
	DT_CLK(NULL, "uart1_ick", "uart1_ick"),

	DT_CLK(NULL, "gpt11_ick", "gpt11_ick"),

	DT_CLK(NULL, "gpt10_ick", "gpt10_ick"),

	DT_CLK("omap-mcbsp.5", "ick", "mcbsp5_ick"),

	DT_CLK("omap-mcbsp.1", "ick", "mcbsp1_ick"),

	DT_CLK(NULL, "mcbsp5_ick", "mcbsp5_ick"),

	DT_CLK(NULL, "mcbsp1_ick", "mcbsp1_ick"),

	DT_CLK(NULL, "omapctrl_ick", "omapctrl_ick"),

	DT_CLK(NULL, "dss_tv_fck", "dss_tv_fck"),

	DT_CLK(NULL, "dss_96m_fck", "dss_96m_fck"),
@@ -179,15 +172,17 @@ static struct ti_dt_clk omap3xxx_clks[] = { 
	DT_CLK(NULL, "gpt4_ick", "gpt4_ick"),

	DT_CLK(NULL, "gpt3_ick", "gpt3_ick"),

	DT_CLK(NULL, "gpt2_ick", "gpt2_ick"),

	DT_CLK("omap-mcbsp.2", "ick", "mcbsp2_ick"),

	DT_CLK("omap-mcbsp.3", "ick", "mcbsp3_ick"),

	DT_CLK("omap-mcbsp.4", "ick", "mcbsp4_ick"),

	DT_CLK(NULL, "mcbsp4_ick", "mcbsp2_ick"),

	DT_CLK(NULL, "mcbsp_clks", "mcbsp_clks"),

	DT_CLK(NULL, "mcbsp1_ick", "mcbsp1_ick"),

	DT_CLK(NULL, "mcbsp2_ick", "mcbsp2_ick"),

	DT_CLK(NULL, "mcbsp3_ick", "mcbsp3_ick"),

	DT_CLK(NULL, "mcbsp2_ick", "mcbsp4_ick"),

	DT_CLK(NULL, "mcbsp4_ick", "mcbsp4_ick"),

	DT_CLK(NULL, "mcbsp5_ick", "mcbsp5_ick"),

	DT_CLK(NULL, "mcbsp1_fck", "mcbsp1_fck"),

	DT_CLK(NULL, "mcbsp2_fck", "mcbsp2_fck"),

	DT_CLK(NULL, "mcbsp3_fck", "mcbsp3_fck"),

	DT_CLK(NULL, "mcbsp4_fck", "mcbsp4_fck"),

	DT_CLK(NULL, "mcbsp5_fck", "mcbsp5_fck"),

	DT_CLK("etb", "emu_src_ck", "emu_src_ck"),

	DT_CLK(NULL, "emu_src_ck", "emu_src_ck"),

	DT_CLK(NULL, "pclk_fck", "pclk_fck"),

drivers/clk/ti/clk-44xx.c

+0 −11
Original line number Diff line number Diff line
@@ -249,17 +249,6 @@ static struct ti_dt_clk omap44xx_clks[] = { 
	DT_CLK("usbhs_tll", "usbtll_fck", "dummy_ck"),

	DT_CLK("omap_wdt", "ick", "dummy_ck"),

	DT_CLK(NULL, "timer_32k_ck", "sys_32k_ck"),

	DT_CLK("omap_timer.1", "timer_sys_ck", "sys_clkin_ck"),

	DT_CLK("omap_timer.2", "timer_sys_ck", "sys_clkin_ck"),

	DT_CLK("omap_timer.3", "timer_sys_ck", "sys_clkin_ck"),

	DT_CLK("omap_timer.4", "timer_sys_ck", "sys_clkin_ck"),

	DT_CLK("omap_timer.9", "timer_sys_ck", "sys_clkin_ck"),

	DT_CLK("omap_timer.10", "timer_sys_ck", "sys_clkin_ck"),

	DT_CLK("omap_timer.11", "timer_sys_ck", "sys_clkin_ck"),

	DT_CLK("omap_timer.5", "timer_sys_ck", "syc_clk_div_ck"),

	DT_CLK("omap_timer.6", "timer_sys_ck", "syc_clk_div_ck"),

	DT_CLK("omap_timer.7", "timer_sys_ck", "syc_clk_div_ck"),

	DT_CLK("omap_timer.8", "timer_sys_ck", "syc_clk_div_ck"),

	DT_CLK("4a318000.timer", "timer_sys_ck", "sys_clkin_ck"),

	DT_CLK("48032000.timer", "timer_sys_ck", "sys_clkin_ck"),

	DT_CLK("48034000.timer", "timer_sys_ck", "sys_clkin_ck"),