Commit 79b92ba0 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

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

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

Pull i.MX clk driver updates from Abel Vesa:

 - Minor clean-ups and error handling improvements in both composite-8m
   and SCU clock drivers
 - Fix for SAI_MCLK_SEL definition for i.MX8MP

* tag 'clk-imx-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux:
  clk: imx: imx8mp: Fix SAI_MCLK_SEL definition
  clk: imx: scu: Use common error handling code in imx_clk_scu_alloc_dev()
  clk: imx: composite-8m: Delete two unnecessary initialisations in __imx8m_clk_hw_composite()
  clk: imx: composite-8m: Less function calls in __imx8m_clk_hw_composite() after error detection
parents 6613476e 13269dc6

drivers/clk/imx/clk-composite-8m.c

+9 −7
Original line number Diff line number Diff line
@@ -212,15 +212,15 @@ struct clk_hw *__imx8m_clk_hw_composite(const char *name, 
{

	struct clk_hw *hw = ERR_PTR(-ENOMEM), *mux_hw;

	struct clk_hw *div_hw, *gate_hw = NULL;

	struct clk_divider *div = NULL;

	struct clk_divider *div;

	struct clk_gate *gate = NULL;

	struct clk_mux *mux = NULL;

	struct clk_mux *mux;

	const struct clk_ops *divider_ops;

	const struct clk_ops *mux_ops;



	mux = kzalloc(sizeof(*mux), GFP_KERNEL);

	if (!mux)

		goto fail;

		return ERR_CAST(hw);



	mux_hw = &mux->hw;

	mux->reg = reg;
@@ -230,7 +230,7 @@ struct clk_hw *__imx8m_clk_hw_composite(const char *name, 


	div = kzalloc(sizeof(*div), GFP_KERNEL);

	if (!div)

		goto fail;

		goto free_mux;



	div_hw = &div->hw;

	div->reg = reg;
@@ -260,7 +260,7 @@ struct clk_hw *__imx8m_clk_hw_composite(const char *name, 
	if (!mcore_booted) {

		gate = kzalloc(sizeof(*gate), GFP_KERNEL);

		if (!gate)

			goto fail;

			goto free_div;



		gate_hw = &gate->hw;

		gate->reg = reg;
@@ -272,13 +272,15 @@ struct clk_hw *__imx8m_clk_hw_composite(const char *name, 
			mux_hw, mux_ops, div_hw,

			divider_ops, gate_hw, &clk_gate_ops, flags);

	if (IS_ERR(hw))

		goto fail;

		goto free_gate;



	return hw;



fail:

free_gate:

	kfree(gate);

free_div:

	kfree(div);

free_mux:

	kfree(mux);

	return ERR_CAST(hw);

}

drivers/clk/imx/clk-imx8mp-audiomix.c

+8 −3
Original line number Diff line number Diff line
@@ -18,7 +18,12 @@ 


#define CLKEN0			0x000

#define CLKEN1			0x004

#define SAI_MCLK_SEL(n)		(0x300 + 4 * (n))	/* n in 0..5 */

#define SAI1_MCLK_SEL		0x300

#define SAI2_MCLK_SEL		0x304

#define SAI3_MCLK_SEL		0x308

#define SAI5_MCLK_SEL		0x30C

#define SAI6_MCLK_SEL		0x310

#define SAI7_MCLK_SEL		0x314

#define PDM_SEL			0x318

#define SAI_PLL_GNRL_CTL	0x400
@@ -95,13 +100,13 @@ static const struct clk_parent_data clk_imx8mp_audiomix_pll_bypass_sels[] = { 
		IMX8MP_CLK_AUDIOMIX_SAI##n##_MCLK1_SEL, {},		\

		clk_imx8mp_audiomix_sai##n##_mclk1_parents,		\

		ARRAY_SIZE(clk_imx8mp_audiomix_sai##n##_mclk1_parents), \

		SAI_MCLK_SEL(n), 1, 0					\

		SAI##n##_MCLK_SEL, 1, 0					\

	}, {								\

		"sai"__stringify(n)"_mclk2_sel",			\

		IMX8MP_CLK_AUDIOMIX_SAI##n##_MCLK2_SEL, {},		\

		clk_imx8mp_audiomix_sai_mclk2_parents,			\

		ARRAY_SIZE(clk_imx8mp_audiomix_sai_mclk2_parents),	\

		SAI_MCLK_SEL(n), 4, 1					\

		SAI##n##_MCLK_SEL, 4, 1					\

	}, {								\

		"sai"__stringify(n)"_ipg_cg",				\

		IMX8MP_CLK_AUDIOMIX_SAI##n##_IPG,			\

drivers/clk/imx/clk-scu.c

+10 −12
Original line number Diff line number Diff line
@@ -712,17 +712,13 @@ struct clk_hw *imx_clk_scu_alloc_dev(const char *name, 
	}



	ret = platform_device_add_data(pdev, &clk, sizeof(clk));

	if (ret) {

		platform_device_put(pdev);

		return ERR_PTR(ret);

	}

	if (ret)

		goto put_device;



	ret = driver_set_override(&pdev->dev, &pdev->driver_override,

				  "imx-scu-clk", strlen("imx-scu-clk"));

	if (ret) {

		platform_device_put(pdev);

		return ERR_PTR(ret);

	}

	if (ret)

		goto put_device;



	ret = imx_clk_scu_attach_pd(&pdev->dev, rsrc_id);

	if (ret)
@@ -730,13 +726,15 @@ struct clk_hw *imx_clk_scu_alloc_dev(const char *name, 
			name, ret);



	ret = platform_device_add(pdev);

	if (ret) {

		platform_device_put(pdev);

		return ERR_PTR(ret);

	}

	if (ret)

		goto put_device;



	/* For API backwards compatiblilty, simply return NULL for success */

	return NULL;



put_device:

	platform_device_put(pdev);

	return ERR_PTR(ret);

}



void imx_clk_scu_unregister(void)