[PATCH v7 2/5] clk: imx: clk-audiomix: Add reset controller

[Marco Felsch]

On 24-06-13, Shengjiu Wang wrote:
> On Thu, Jun 13, 2024 at 4:20 PM Marco Felsch <m.felsch at pengutronix.de> wrote:
> >
> > On 24-06-13, Shengjiu Wang wrote:
> > > 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 at nxp.com>
> > > Reviewed-by: Frank Li <Frank.Li at nxp.com>
> > > ---
> > >  drivers/clk/imx/Kconfig               |  1 +
> > >  drivers/clk/imx/clk-imx8mp-audiomix.c | 63 +++++++++++++++++++++++++++
> > >  2 files changed, 64 insertions(+)
> > >
> > > diff --git a/drivers/clk/imx/Kconfig b/drivers/clk/imx/Kconfig
> > > index 6da0fba68225..9edfb030bea9 100644
> > > --- a/drivers/clk/imx/Kconfig
> > > +++ b/drivers/clk/imx/Kconfig
> > > @@ -81,6 +81,7 @@ config CLK_IMX8MP
> > >       tristate "IMX8MP CCM Clock Driver"
> > >       depends on ARCH_MXC || COMPILE_TEST
> > >       select MXC_CLK
> > > +     select AUXILIARY_BUS
> >
> >         select AUXILIARY_BUS if RESET_CONTROLLER
> 
> Do we really need this change?
> 
> I checked other drivers like MCHP_CLK_MPFS, but they don't have
> this condition also.

Since you made the whole reset optional I would like to pull reset
dependency optional as well e.g. pulling it only if you really use it.
In the end the RESET_CONTROLLER is enabled most the time.

> > >       help
> > >           Build the driver for i.MX8MP CCM Clock Driver
> > >
> > > diff --git a/drivers/clk/imx/clk-imx8mp-audiomix.c b/drivers/clk/imx/clk-imx8mp-audiomix.c
> > > index b381d6f784c8..517b1f88661b 100644
> > > --- a/drivers/clk/imx/clk-imx8mp-audiomix.c
> > > +++ b/drivers/clk/imx/clk-imx8mp-audiomix.c
> > > @@ -5,6 +5,7 @@
> > >   * Copyright (C) 2022 Marek Vasut <marex at denx.de>
> > >   */
> > >
> > > +#include <linux/auxiliary_bus.h>
> > >  #include <linux/clk-provider.h>
> > >  #include <linux/device.h>
> > >  #include <linux/io.h>
> > > @@ -13,6 +14,7 @@
> > >  #include <linux/of.h>
> > >  #include <linux/platform_device.h>
> > >  #include <linux/pm_runtime.h>
> > > +#include <linux/slab.h>
> >                 ^
> > This is an unrelated change.
> 
> This is for the fix of this issue
> 
> https://lore.kernel.org/oe-kbuild-all/202405201844.zf7UkDmq-lkp@intel.com/

Thanks for the link.

Regards,
  Marco

> Best regards
> Shengjiu wang
> 
> >
> > Regards,
> >   Marco
> >
> > >
> > >  #include <dt-bindings/clock/imx8mp-clock.h>
> > >
> > > @@ -217,6 +219,63 @@ struct clk_imx8mp_audiomix_priv {
> > >       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)
> > >  {
> > >       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)
> > >               goto err_clk_register;
> > >
> > > +     ret = clk_imx8mp_audiomix_reset_controller_register(dev, priv);
> > > +     if (ret)
> > > +             goto err_clk_register;
> > > +
> > >       pm_runtime_put_sync(dev);
> > >       return 0;
> > >
> > > --
> > > 2.34.1
> > >
> > >
> > >
>