| Message ID | 1716188963-16175-3-git-send-email-shengjiu.wang@nxp.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | clk: imx: clk-audiomix: Improvement for audiomix | expand |
Hi Shengjiu,
kernel test robot noticed the following build warnings:
[auto build test WARNING on abelvesa/clk/imx]
[also build test WARNING on linus/master next-20240520]
[cannot apply to pza/reset/next shawnguo/for-next robh/for-next pza/imx-drm/next v6.9]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Shengjiu-Wang/dt-bindings-clock-imx8mp-Add-reset-cells-property/20240520-153230
base: https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
patch link: https://lore.kernel.org/r/1716188963-16175-3-git-send-email-shengjiu.wang%40nxp.com
patch subject: [PATCH v4 2/5] clk: imx: clk-audiomix: Add reset controller
config: m68k-allyesconfig (https://download.01.org/0day-ci/archive/20240520/202405201844.zf7UkDmq-lkp@intel.com/config)
compiler: m68k-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240520/202405201844.zf7UkDmq-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202405201844.zf7UkDmq-lkp@intel.com/
All warnings (new ones prefixed by >>):
drivers/clk/imx/clk-imx8mp-audiomix.c: In function 'clk_imx8mp_audiomix_reset_adev_release':
drivers/clk/imx/clk-imx8mp-audiomix.c:235:9: error: implicit declaration of function 'kfree'; did you mean 'vfree'? [-Werror=implicit-function-declaration]
235 | kfree(adev);
| ^~~~~
| vfree
drivers/clk/imx/clk-imx8mp-audiomix.c: In function 'clk_imx8mp_audiomix_reset_controller_register':
drivers/clk/imx/clk-imx8mp-audiomix.c:244:16: error: implicit declaration of function 'kzalloc'; did you mean 'vzalloc'? [-Werror=implicit-function-declaration]
244 | adev = kzalloc(sizeof(*adev), GFP_KERNEL);
| ^~~~~~~
| vzalloc
>> drivers/clk/imx/clk-imx8mp-audiomix.c:244:14: warning: assignment to 'struct auxiliary_device *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
244 | adev = kzalloc(sizeof(*adev), GFP_KERNEL);
| ^
cc1: some warnings being treated as errors
vim +244 drivers/clk/imx/clk-imx8mp-audiomix.c
237
238 static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev,
239 struct clk_imx8mp_audiomix_priv *priv)
240 {
241 struct auxiliary_device *adev;
242 int ret;
243
> 244 adev = kzalloc(sizeof(*adev), GFP_KERNEL);
245 if (!adev)
246 return -ENOMEM;
247
248 adev->name = "reset";
249 adev->dev.parent = dev;
250 adev->dev.release = clk_imx8mp_audiomix_reset_adev_release;
251
252 ret = auxiliary_device_init(adev);
253 if (ret) {
254 kfree(adev);
255 return ret;
256 }
257
258 ret = auxiliary_device_add(adev);
259 if (ret) {
260 auxiliary_device_uninit(adev);
261 kfree(adev);
262 return ret;
263 }
264
265 return devm_add_action_or_reset(dev, clk_imx8mp_audiomix_reset_unregister_adev, adev);
266 }
267
Hi Shengjiu, kernel test robot noticed the following build errors: [auto build test ERROR on abelvesa/clk/imx] [also build test ERROR on linus/master next-20240520] [cannot apply to pza/reset/next shawnguo/for-next robh/for-next pza/imx-drm/next v6.9] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Shengjiu-Wang/dt-bindings-clock-imx8mp-Add-reset-cells-property/20240520-153230 base: https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx patch link: https://lore.kernel.org/r/1716188963-16175-3-git-send-email-shengjiu.wang%40nxp.com patch subject: [PATCH v4 2/5] clk: imx: clk-audiomix: Add reset controller config: m68k-allyesconfig (https://download.01.org/0day-ci/archive/20240520/202405202110.K51viYoO-lkp@intel.com/config) compiler: m68k-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240520/202405202110.K51viYoO-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202405202110.K51viYoO-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/clk/imx/clk-imx8mp-audiomix.c: In function 'clk_imx8mp_audiomix_reset_adev_release': >> drivers/clk/imx/clk-imx8mp-audiomix.c:235:9: error: implicit declaration of function 'kfree'; did you mean 'vfree'? [-Werror=implicit-function-declaration] 235 | kfree(adev); | ^~~~~ | vfree drivers/clk/imx/clk-imx8mp-audiomix.c: In function 'clk_imx8mp_audiomix_reset_controller_register': >> drivers/clk/imx/clk-imx8mp-audiomix.c:244:16: error: implicit declaration of function 'kzalloc'; did you mean 'vzalloc'? [-Werror=implicit-function-declaration] 244 | adev = kzalloc(sizeof(*adev), GFP_KERNEL); | ^~~~~~~ | vzalloc drivers/clk/imx/clk-imx8mp-audiomix.c:244:14: warning: assignment to 'struct auxiliary_device *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 244 | adev = kzalloc(sizeof(*adev), GFP_KERNEL); | ^ cc1: some warnings being treated as errors vim +235 drivers/clk/imx/clk-imx8mp-audiomix.c 230 231 static void clk_imx8mp_audiomix_reset_adev_release(struct device *dev) 232 { 233 struct auxiliary_device *adev = to_auxiliary_dev(dev); 234 > 235 kfree(adev); 236 } 237 238 static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev, 239 struct clk_imx8mp_audiomix_priv *priv) 240 { 241 struct auxiliary_device *adev; 242 int ret; 243 > 244 adev = kzalloc(sizeof(*adev), GFP_KERNEL); 245 if (!adev) 246 return -ENOMEM; 247 248 adev->name = "reset"; 249 adev->dev.parent = dev; 250 adev->dev.release = clk_imx8mp_audiomix_reset_adev_release; 251 252 ret = auxiliary_device_init(adev); 253 if (ret) { 254 kfree(adev); 255 return ret; 256 } 257 258 ret = auxiliary_device_add(adev); 259 if (ret) { 260 auxiliary_device_uninit(adev); 261 kfree(adev); 262 return ret; 263 } 264 265 return devm_add_action_or_reset(dev, clk_imx8mp_audiomix_reset_unregister_adev, adev); 266 } 267
On Mon, May 20, 2024 at 03:09:20PM +0800, 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@nxp.com> > --- > drivers/clk/imx/Kconfig | 1 + > drivers/clk/imx/clk-imx8mp-audiomix.c | 61 +++++++++++++++++++++++++++ > 2 files changed, 62 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 > 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..d2eaabe431cd 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@denx.de> > */ > > +#include <linux/auxiliary_bus.h> > #include <linux/clk-provider.h> > #include <linux/device.h> > #include <linux/io.h> > @@ -217,6 +218,62 @@ 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; > + int ret; > + > + adev = kzalloc(sizeof(*adev), GFP_KERNEL); You may use scoped free struct auxiliary_device *adev __free(kfree) = 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) { > + kfree(adev); > + return ret; > + } if use scoped free, if (ret) return ret; > + > + ret = auxiliary_device_add(adev); > + if (ret) { > + auxiliary_device_uninit(adev); > + kfree(adev); > + return ret; the same here. > + } > + > + return devm_add_action_or_reset(dev, clk_imx8mp_audiomix_reset_unregister_adev, adev); if use scope free 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 +394,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 >
Hi Shengjiu,
kernel test robot noticed the following build errors:
[auto build test ERROR on abelvesa/clk/imx]
[also build test ERROR on linus/master next-20240520]
[cannot apply to pza/reset/next shawnguo/for-next robh/for-next pza/imx-drm/next v6.9]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Shengjiu-Wang/dt-bindings-clock-imx8mp-Add-reset-cells-property/20240520-153230
base: https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk/imx
patch link: https://lore.kernel.org/r/1716188963-16175-3-git-send-email-shengjiu.wang%40nxp.com
patch subject: [PATCH v4 2/5] clk: imx: clk-audiomix: Add reset controller
config: hexagon-allyesconfig (https://download.01.org/0day-ci/archive/20240521/202405210036.hMLQ7OGl-lkp@intel.com/config)
compiler: clang version 19.0.0git (https://github.com/llvm/llvm-project fa9b1be45088dce1e4b602d451f118128b94237b)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240521/202405210036.hMLQ7OGl-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202405210036.hMLQ7OGl-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from drivers/clk/imx/clk-imx8mp-audiomix.c:11:
In file included from include/linux/io.h:13:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:547:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
547 | val = __raw_readb(PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:560:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
560 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu'
37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x))
| ^
In file included from drivers/clk/imx/clk-imx8mp-audiomix.c:11:
In file included from include/linux/io.h:13:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:573:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
573 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu'
35 | #define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
| ^
In file included from drivers/clk/imx/clk-imx8mp-audiomix.c:11:
In file included from include/linux/io.h:13:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:584:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
584 | __raw_writeb(value, PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:594:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
594 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:604:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
604 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
>> drivers/clk/imx/clk-imx8mp-audiomix.c:235:2: error: call to undeclared function 'kfree'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
235 | kfree(adev);
| ^
drivers/clk/imx/clk-imx8mp-audiomix.c:235:2: note: did you mean 'vfree'?
include/linux/vmalloc.h:162:13: note: 'vfree' declared here
162 | extern void vfree(const void *addr);
| ^
>> drivers/clk/imx/clk-imx8mp-audiomix.c:244:9: error: call to undeclared function 'kzalloc'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
244 | adev = kzalloc(sizeof(*adev), GFP_KERNEL);
| ^
drivers/clk/imx/clk-imx8mp-audiomix.c:244:9: note: did you mean 'vzalloc'?
include/linux/vmalloc.h:142:14: note: 'vzalloc' declared here
142 | extern void *vzalloc(unsigned long size) __alloc_size(1);
| ^
>> drivers/clk/imx/clk-imx8mp-audiomix.c:244:7: error: incompatible integer to pointer conversion assigning to 'struct auxiliary_device *' from 'int' [-Wint-conversion]
244 | adev = kzalloc(sizeof(*adev), GFP_KERNEL);
| ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/clk/imx/clk-imx8mp-audiomix.c:254:3: error: call to undeclared function 'kfree'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
254 | kfree(adev);
| ^
drivers/clk/imx/clk-imx8mp-audiomix.c:261:3: error: call to undeclared function 'kfree'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
261 | kfree(adev);
| ^
6 warnings and 5 errors generated.
vim +/kfree +235 drivers/clk/imx/clk-imx8mp-audiomix.c
230
231 static void clk_imx8mp_audiomix_reset_adev_release(struct device *dev)
232 {
233 struct auxiliary_device *adev = to_auxiliary_dev(dev);
234
> 235 kfree(adev);
236 }
237
238 static int clk_imx8mp_audiomix_reset_controller_register(struct device *dev,
239 struct clk_imx8mp_audiomix_priv *priv)
240 {
241 struct auxiliary_device *adev;
242 int ret;
243
> 244 adev = kzalloc(sizeof(*adev), GFP_KERNEL);
245 if (!adev)
246 return -ENOMEM;
247
248 adev->name = "reset";
249 adev->dev.parent = dev;
250 adev->dev.release = clk_imx8mp_audiomix_reset_adev_release;
251
252 ret = auxiliary_device_init(adev);
253 if (ret) {
254 kfree(adev);
255 return ret;
256 }
257
258 ret = auxiliary_device_add(adev);
259 if (ret) {
260 auxiliary_device_uninit(adev);
261 kfree(adev);
262 return ret;
263 }
264
265 return devm_add_action_or_reset(dev, clk_imx8mp_audiomix_reset_unregister_adev, adev);
266 }
267
On Mon, May 20, 2024 at 11:44 PM Frank Li <Frank.li@nxp.com> wrote: > > On Mon, May 20, 2024 at 03:09:20PM +0800, 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@nxp.com> > > --- > > drivers/clk/imx/Kconfig | 1 + > > drivers/clk/imx/clk-imx8mp-audiomix.c | 61 +++++++++++++++++++++++++++ > > 2 files changed, 62 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 > > 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..d2eaabe431cd 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@denx.de> > > */ > > > > +#include <linux/auxiliary_bus.h> > > #include <linux/clk-provider.h> > > #include <linux/device.h> > > #include <linux/io.h> > > @@ -217,6 +218,62 @@ 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; > > + int ret; > > + > > + adev = kzalloc(sizeof(*adev), GFP_KERNEL); > > > You may use scoped free > > struct auxiliary_device *adev __free(kfree) = kzalloc(sizeof(*adev), GFP_KERNEL); Ok, will update the code best regards Shengjiu Wang > > > + 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) { > > + kfree(adev); > > + return ret; > > + } > > if use scoped free, > > if (ret) > return ret; > > > + > > + ret = auxiliary_device_add(adev); > > + if (ret) { > > + auxiliary_device_uninit(adev); > > + kfree(adev); > > + return ret; > > the same here. > > > + } > > + > > + return devm_add_action_or_reset(dev, clk_imx8mp_audiomix_reset_unregister_adev, adev); > > if use scope free > 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 +394,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 > >
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 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..d2eaabe431cd 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@denx.de> */ +#include <linux/auxiliary_bus.h> #include <linux/clk-provider.h> #include <linux/device.h> #include <linux/io.h> @@ -217,6 +218,62 @@ 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; + int ret; + + 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) { + kfree(adev); + return ret; + } + + ret = auxiliary_device_add(adev); + if (ret) { + auxiliary_device_uninit(adev); + kfree(adev); + return ret; + } + + return devm_add_action_or_reset(dev, clk_imx8mp_audiomix_reset_unregister_adev, 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 +394,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;
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> --- drivers/clk/imx/Kconfig | 1 + drivers/clk/imx/clk-imx8mp-audiomix.c | 61 +++++++++++++++++++++++++++ 2 files changed, 62 insertions(+)