Unverified Commit 742d9808 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-drivers-6.12' of... 

Merge tag 'imx-drivers-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/drivers

i.MX drivers changes for 6.12:

- A couple of imx-weim bus driver changes from Wu Bo to support compile
  test and use devm_clk_get_enabled() helper to clean up code a bit

* tag 'imx-drivers-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  bus: imx-weim: change to use devm_clk_get_enabled() helper
  bus: imx-weim: support compile test

Link: https://lore.kernel.org/r/20240904143439.211552-1-shawnguo2@yeah.net


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 311ef883 2ea2113b

drivers/bus/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ config HISILICON_LPC 


config IMX_WEIM

	bool "Freescale EIM DRIVER"

	depends on ARCH_MXC

	depends on ARCH_MXC || COMPILE_TEST

	help

	  Driver for i.MX WEIM controller.

	  The WEIM(Wireless External Interface Module) works like a bus.

drivers/bus/imx-weim.c

+5 −9
Original line number Diff line number Diff line
@@ -282,22 +282,18 @@ static int weim_probe(struct platform_device *pdev) 
	dev_set_drvdata(&pdev->dev, priv);



	/* get the clock */

	clk = devm_clk_get(&pdev->dev, NULL);

	clk = devm_clk_get_enabled(&pdev->dev, NULL);

	if (IS_ERR(clk))

		return PTR_ERR(clk);



	ret = clk_prepare_enable(clk);

	if (ret)

		return ret;



	/* parse the device node */

	ret = weim_parse_dt(pdev);

	if (ret)

		clk_disable_unprepare(clk);

	else

		return ret;



	dev_info(&pdev->dev, "Driver registered.\n");



	return ret;

	return 0;

}



#if IS_ENABLED(CONFIG_OF_DYNAMIC)