Commit 5c55197c authored by Stephen Boyd's avatar Stephen Boyd
Browse files

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

Merge tag 'clk-imx-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux into clk-imx

Pull i.MX clk driver updates from Abel Vesa:

 - Fix reparenting of UART clocks by initializing only the ones
   associated to stdout
 - Correct the PCIE clocks for i.MX8MP and i.MX8MQ
 - Make LPCG and SCU clocks return on registering failure

* tag 'clk-imx-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux:
  clk: imx: Reference preceded by free
  clk: imx8mq: Correct the pcie1 sels
  clk: imx8mp: Remove the none exist pcie clocks
  clk: imx: Fix reparenting of UARTs not associated with stdout
parents a38fd874 054ef44e

drivers/clk/imx/clk-imx25.c

+1 −11
Original line number Diff line number Diff line
@@ -73,16 +73,6 @@ enum mx25_clks { 


static struct clk *clk[clk_max];



static struct clk ** const uart_clks[] __initconst = {

	&clk[uart_ipg_per],

	&clk[uart1_ipg],

	&clk[uart2_ipg],

	&clk[uart3_ipg],

	&clk[uart4_ipg],

	&clk[uart5_ipg],

	NULL

};



static int __init __mx25_clocks_init(void __iomem *ccm_base)

{

	BUG_ON(!ccm_base);
@@ -228,7 +218,7 @@ static int __init __mx25_clocks_init(void __iomem *ccm_base) 
	 */

	clk_set_parent(clk[cko_sel], clk[ipg]);



	imx_register_uart_clocks(uart_clks);

	imx_register_uart_clocks(6);



	return 0;

}

drivers/clk/imx/clk-imx27.c

+1 −12
Original line number Diff line number Diff line
@@ -49,17 +49,6 @@ static const char *ssi_sel_clks[] = { "spll_gate", "mpll", }; 
static struct clk *clk[IMX27_CLK_MAX];

static struct clk_onecell_data clk_data;



static struct clk ** const uart_clks[] __initconst = {

	&clk[IMX27_CLK_PER1_GATE],

	&clk[IMX27_CLK_UART1_IPG_GATE],

	&clk[IMX27_CLK_UART2_IPG_GATE],

	&clk[IMX27_CLK_UART3_IPG_GATE],

	&clk[IMX27_CLK_UART4_IPG_GATE],

	&clk[IMX27_CLK_UART5_IPG_GATE],

	&clk[IMX27_CLK_UART6_IPG_GATE],

	NULL

};



static void __init _mx27_clocks_init(unsigned long fref)

{

	BUG_ON(!ccm);
@@ -176,7 +165,7 @@ static void __init _mx27_clocks_init(unsigned long fref) 


	clk_prepare_enable(clk[IMX27_CLK_EMI_AHB_GATE]);



	imx_register_uart_clocks(uart_clks);

	imx_register_uart_clocks(7);



	imx_print_silicon_rev("i.MX27", mx27_revision());

}

drivers/clk/imx/clk-imx35.c

+1 −9
Original line number Diff line number Diff line
@@ -82,14 +82,6 @@ enum mx35_clks { 


static struct clk *clk[clk_max];



static struct clk ** const uart_clks[] __initconst = {

	&clk[ipg],

	&clk[uart1_gate],

	&clk[uart2_gate],

	&clk[uart3_gate],

	NULL

};



static void __init _mx35_clocks_init(void)

{

	void __iomem *base;
@@ -243,7 +235,7 @@ static void __init _mx35_clocks_init(void) 
	 */

	clk_prepare_enable(clk[scc_gate]);



	imx_register_uart_clocks(uart_clks);

	imx_register_uart_clocks(4);



	imx_print_silicon_rev("i.MX35", mx35_revision());

}

drivers/clk/imx/clk-imx5.c

+3 −27
Original line number Diff line number Diff line
@@ -128,30 +128,6 @@ static const char *ieee1588_sels[] = { "pll3_sw", "pll4_sw", "dummy" /* usbphy2_ 
static struct clk *clk[IMX5_CLK_END];

static struct clk_onecell_data clk_data;



static struct clk ** const uart_clks_mx51[] __initconst = {

	&clk[IMX5_CLK_UART1_IPG_GATE],

	&clk[IMX5_CLK_UART1_PER_GATE],

	&clk[IMX5_CLK_UART2_IPG_GATE],

	&clk[IMX5_CLK_UART2_PER_GATE],

	&clk[IMX5_CLK_UART3_IPG_GATE],

	&clk[IMX5_CLK_UART3_PER_GATE],

	NULL

};



static struct clk ** const uart_clks_mx50_mx53[] __initconst = {

	&clk[IMX5_CLK_UART1_IPG_GATE],

	&clk[IMX5_CLK_UART1_PER_GATE],

	&clk[IMX5_CLK_UART2_IPG_GATE],

	&clk[IMX5_CLK_UART2_PER_GATE],

	&clk[IMX5_CLK_UART3_IPG_GATE],

	&clk[IMX5_CLK_UART3_PER_GATE],

	&clk[IMX5_CLK_UART4_IPG_GATE],

	&clk[IMX5_CLK_UART4_PER_GATE],

	&clk[IMX5_CLK_UART5_IPG_GATE],

	&clk[IMX5_CLK_UART5_PER_GATE],

	NULL

};



static void __init mx5_clocks_common_init(void __iomem *ccm_base)

{

	clk[IMX5_CLK_DUMMY]		= imx_clk_fixed("dummy", 0);
@@ -382,7 +358,7 @@ static void __init mx50_clocks_init(struct device_node *np) 
	r = clk_round_rate(clk[IMX5_CLK_USBOH3_PER_GATE], 54000000);

	clk_set_rate(clk[IMX5_CLK_USBOH3_PER_GATE], r);



	imx_register_uart_clocks(uart_clks_mx50_mx53);

	imx_register_uart_clocks(5);

}

CLK_OF_DECLARE(imx50_ccm, "fsl,imx50-ccm", mx50_clocks_init);
@@ -488,7 +464,7 @@ static void __init mx51_clocks_init(struct device_node *np) 
	val |= 1 << 23;

	writel(val, MXC_CCM_CLPCR);



	imx_register_uart_clocks(uart_clks_mx51);

	imx_register_uart_clocks(3);

}

CLK_OF_DECLARE(imx51_ccm, "fsl,imx51-ccm", mx51_clocks_init);
@@ -633,6 +609,6 @@ static void __init mx53_clocks_init(struct device_node *np) 
	r = clk_round_rate(clk[IMX5_CLK_USBOH3_PER_GATE], 54000000);

	clk_set_rate(clk[IMX5_CLK_USBOH3_PER_GATE], r);



	imx_register_uart_clocks(uart_clks_mx50_mx53);

	imx_register_uart_clocks(5);

}

CLK_OF_DECLARE(imx53_ccm, "fsl,imx53-ccm", mx53_clocks_init);

drivers/clk/imx/clk-imx6q.c

+1 −15
Original line number Diff line number Diff line
@@ -140,13 +140,6 @@ static inline int clk_on_imx6dl(void) 
	return of_machine_is_compatible("fsl,imx6dl");

}



static const int uart_clk_ids[] __initconst = {

	IMX6QDL_CLK_UART_IPG,

	IMX6QDL_CLK_UART_SERIAL,

};



static struct clk **uart_clks[ARRAY_SIZE(uart_clk_ids) + 1] __initdata;



static int ldb_di_sel_by_clock_id(int clock_id)

{

	switch (clock_id) {
@@ -440,7 +433,6 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) 
	struct device_node *np;

	void __iomem *anatop_base, *base;

	int ret;

	int i;



	clk_hw_data = kzalloc(struct_size(clk_hw_data, hws,

					  IMX6QDL_CLK_END), GFP_KERNEL);
@@ -982,12 +974,6 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node) 
			       hws[IMX6QDL_CLK_PLL3_USB_OTG]->clk);

	}



	for (i = 0; i < ARRAY_SIZE(uart_clk_ids); i++) {

		int index = uart_clk_ids[i];



		uart_clks[i] = &hws[index]->clk;

	}



	imx_register_uart_clocks(uart_clks);

	imx_register_uart_clocks(1);

}

CLK_OF_DECLARE(imx6q, "fsl,imx6q-ccm", imx6q_clocks_init);