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

Commit 5c489cca authored by Michael Turquette's avatar Michael Turquette Committed by Stephen Boyd
Browse files

Merge tag 'imx-clk-4.3' of... 

Merge tag 'imx-clk-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-next

The i.MX clock updates for 4.3:
 - Provide a better IPU clock initial settings on imx6dl for getting
   HDMI and LVDS at the same time.
 - Add clock driver support for i.MX6UL SoC
 - Add a second clock for RTC device on i.MX31 and i.MX35
parents e8f35aab 3713e3f5

drivers/clk/imx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,5 +22,6 @@ obj-$(CONFIG_SOC_IMX5) += clk-imx51-imx53.o 
obj-$(CONFIG_SOC_IMX6Q)  += clk-imx6q.o

obj-$(CONFIG_SOC_IMX6SL) += clk-imx6sl.o

obj-$(CONFIG_SOC_IMX6SX) += clk-imx6sx.o

obj-$(CONFIG_SOC_IMX6UL) += clk-imx6ul.o

obj-$(CONFIG_SOC_IMX7D)  += clk-imx7d.o

obj-$(CONFIG_SOC_VF610)  += clk-vf610.o

drivers/clk/imx/clk-imx31.c

+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ int __init mx31_clocks_init(unsigned long fref) 
	clk_register_clkdev(clk[cspi3_gate], NULL, "imx31-cspi.2");

	clk_register_clkdev(clk[pwm_gate], "pwm", NULL);

	clk_register_clkdev(clk[wdog_gate], NULL, "imx2-wdt.0");

	clk_register_clkdev(clk[rtc_gate], NULL, "imx21-rtc");

	clk_register_clkdev(clk[ckil], "ref", "imx21-rtc");

	clk_register_clkdev(clk[rtc_gate], "ipg", "imx21-rtc");

	clk_register_clkdev(clk[epit1_gate], "epit", NULL);

	clk_register_clkdev(clk[epit2_gate], "epit", NULL);

	clk_register_clkdev(clk[nfc], NULL, "imx27-nand.0");

drivers/clk/imx/clk-imx35.c

+5 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static const char *std_sel[] = {"ppll", "arm"}; 
static const char *ipg_per_sel[] = {"ahb_per_div", "arm_per_div"};



enum mx35_clks {

	ckih, mpll, ppll, mpll_075, arm, hsp, hsp_div, hsp_sel, ahb, ipg,

	ckih, ckil, mpll, ppll, mpll_075, arm, hsp, hsp_div, hsp_sel, ahb, ipg,

	arm_per_div, ahb_per_div, ipg_per, uart_sel, uart_div, esdhc_sel,

	esdhc1_div, esdhc2_div, esdhc3_div, spdif_sel, spdif_div_pre,

	spdif_div_post, ssi_sel, ssi1_div_pre, ssi1_div_post, ssi2_div_pre,
@@ -107,6 +107,7 @@ int __init mx35_clocks_init(void) 
	}



	clk[ckih] = imx_clk_fixed("ckih", 24000000);

	clk[ckil] = imx_clk_fixed("ckih", 32768);

	clk[mpll] = imx_clk_pllv1(IMX_PLLV1_IMX35, "mpll", "ckih", base + MX35_CCM_MPCTL);

	clk[ppll] = imx_clk_pllv1(IMX_PLLV1_IMX35, "ppll", "ckih", base + MX35_CCM_PPCTL);
@@ -258,6 +259,9 @@ int __init mx35_clocks_init(void) 
	clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.1");

	clk_register_clkdev(clk[uart3_gate], "per", "imx21-uart.2");

	clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.2");

	/* i.mx35 has the i.mx21 type rtc */

	clk_register_clkdev(clk[ckil], "ref", "imx21-rtc");

	clk_register_clkdev(clk[rtc_gate], "ipg", "imx21-rtc");

	clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.0");

	clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.0");

	clk_register_clkdev(clk[usbotg_gate], "ahb", "mxc-ehci.0");

drivers/clk/imx/clk-imx6q.c

+4 −0
Original line number Diff line number Diff line
@@ -494,6 +494,10 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) 
		clk_set_parent(clk[IMX6QDL_CLK_LDB_DI1_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);

	}



	clk_set_rate(clk[IMX6QDL_CLK_PLL3_PFD1_540M], 540000000);

	if (clk_on_imx6dl())

		clk_set_parent(clk[IMX6QDL_CLK_IPU1_SEL], clk[IMX6QDL_CLK_PLL3_PFD1_540M]);



	clk_set_parent(clk[IMX6QDL_CLK_IPU1_DI0_PRE_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);

	clk_set_parent(clk[IMX6QDL_CLK_IPU1_DI1_PRE_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);

	clk_set_parent(clk[IMX6QDL_CLK_IPU2_DI0_PRE_SEL], clk[IMX6QDL_CLK_PLL5_VIDEO_DIV]);

drivers/clk/imx/clk-imx6ul.c

0 → 100644
+432 −0

File added.

Preview size limit exceeded, changes collapsed.