Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-01 10:42:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clk: imx: clk-audiomix: Add reset controller

Browse Source 
Audiomix block control can be a reset controller for
Enhanced Audio Return Channel (EARC), which is one of
modules in this audiomix subsystem.

The reset controller is supported by the auxiliary device
framework.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.kernel.org/r/1718350923-21392-3-git-send-email-shengjiu.wang@nxp.com
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
This commit is contained in:
Shengjiu Wang 2024-06-14 15:42:00 +08:00 committed by Abel Vesa
parent d7d9ef1f40
commit 6f0e817175
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/clk/imx/Kconfig
View File

@ -81,6 +81,7 @@ config CLK_IMX8MP
tristate "IMX8MP CCM Clock Driver" tristate "IMX8MP CCM Clock Driver"
depends on ARCH_MXC || COMPILE_TEST depends on ARCH_MXC || COMPILE_TEST
select MXC_CLK select MXC_CLK
select AUXILIARY_BUS if RESET_CONTROLLER
help help
Build the driver for i.MX8MP CCM Clock Driver Build the driver for i.MX8MP CCM Clock Driver

63
drivers/clk/imx/clk-imx8mp-audiomix.c
View File

@ -5,6 +5,7 @@
* Copyright (C) 2022 Marek Vasut <marex@denx.de> * Copyright (C) 2022 Marek Vasut <marex@denx.de>
*/ */
#include <linux/auxiliary_bus.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/io.h> #include <linux/io.h>
@ -13,6 +14,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/slab.h>
#include <dt-bindings/clock/imx8mp-clock.h> #include <dt-bindings/clock/imx8mp-clock.h>
@ -217,6 +219,63 @@ struct clk_imx8mp_audiomix_priv {
struct clk_hw_onecell_data clk_data; struct clk_hw_onecell_data clk_data;
}; };
#if IS_ENABLED(CONFIG_RESET_CONTROLLER)
static void clk_imx8mp_audiomix_reset_unregister_adev(void *_adev)
{
struct auxiliary_device *adev = _adev;
auxiliary_device_delete(adev);
auxiliary_device_uninit(adev);
}
static void clk_imx8mp_audiomix_reset_adev_release(struct device *dev)
{
struct auxiliary_device *adev = to_auxiliary_dev(dev);
kfree(adev);
}
static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev,
struct clk_imx8mp_audiomix_priv *priv)
{
struct auxiliary_device *adev __free(kfree) = NULL;
int ret;
if (!of_property_present(dev->of_node, "#reset-cells"))
return 0;
adev = kzalloc(sizeof(*adev), GFP_KERNEL);
if (!adev)
return -ENOMEM;
adev->name = "reset";
adev->dev.parent = dev;
adev->dev.release = clk_imx8mp_audiomix_reset_adev_release;
ret = auxiliary_device_init(adev);
if (ret)
return ret;
ret = auxiliary_device_add(adev);
if (ret) {
auxiliary_device_uninit(adev);
return ret;
}
return devm_add_action_or_reset(dev, clk_imx8mp_audiomix_reset_unregister_adev,
no_free_ptr(adev));
}
#else /* !CONFIG_RESET_CONTROLLER */
static int clk_imx8mp_audiomix_reset_controller_register(struct clk_imx8mp_audiomix_priv *priv)
{
return 0;
}
#endif /* !CONFIG_RESET_CONTROLLER */
static void clk_imx8mp_audiomix_save_restore(struct device *dev, bool save) static void clk_imx8mp_audiomix_save_restore(struct device *dev, bool save)
{ {
struct clk_imx8mp_audiomix_priv *priv = dev_get_drvdata(dev); struct clk_imx8mp_audiomix_priv *priv = dev_get_drvdata(dev);
@ -337,6 +396,10 @@ static int clk_imx8mp_audiomix_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_clk_register; goto err_clk_register;
ret = clk_imx8mp_audiomix_reset_controller_register(dev, priv);
if (ret)
goto err_clk_register;
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);
return 0; return 0;