diff mbox series

[V2,1/3] reset: imx7: Support module build

Message ID 1593443129-18766-1-git-send-email-Anson.Huang@nxp.com
State New
Headers show
Series [V2,1/3] reset: imx7: Support module build | expand

Commit Message

Anson Huang June 29, 2020, 3:05 p.m. UTC
Add module device table, author, description and license to support
module build, and CONFIG_RESET_IMX7 is changed to default 'y' ONLY
for i.MX7D, other platforms need to select it in defconfig.

Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
Changes since V1:
	- make it default 'y' for SOC_IMX7D;
	- add module author, description;
	- use device_initcall instead of builtin_platform_driver() to support
	  module unload.
---
 drivers/reset/Kconfig      |  5 +++--
 drivers/reset/reset-imx7.c | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

Comments

Philipp Zabel July 20, 2020, 9:22 a.m. UTC | #1
On Mon, 2020-06-29 at 23:05 +0800, Anson Huang wrote:
> Add module device table, author, description and license to support
> module build, and CONFIG_RESET_IMX7 is changed to default 'y' ONLY
> for i.MX7D, other platforms need to select it in defconfig.
> 
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> Changes since V1:
> 	- make it default 'y' for SOC_IMX7D;
> 	- add module author, description;
> 	- use device_initcall instead of builtin_platform_driver() to support
> 	  module unload.
> ---
>  drivers/reset/Kconfig      |  5 +++--
>  drivers/reset/reset-imx7.c | 14 ++++++++++++--
>  2 files changed, 15 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
> index d9efbfd..19f9773 100644
> --- a/drivers/reset/Kconfig
> +++ b/drivers/reset/Kconfig
> @@ -65,9 +65,10 @@ config RESET_HSDK
>  	  This enables the reset controller driver for HSDK board.
>  
>  config RESET_IMX7
> -	bool "i.MX7/8 Reset Driver" if COMPILE_TEST
> +	tristate "i.MX7/8 Reset Driver"
>  	depends on HAS_IOMEM
> -	default SOC_IMX7D || (ARM64 && ARCH_MXC)
> +	depends on SOC_IMX7D || (ARM64 && ARCH_MXC) || COMPILE_TEST
> +	default y if SOC_IMX7D
>  	select MFD_SYSCON
>  	help
>  	  This enables the reset controller driver for i.MX7 SoCs.
> diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
> index d170fe6..c710f789 100644
> --- a/drivers/reset/reset-imx7.c
> +++ b/drivers/reset/reset-imx7.c
> @@ -8,7 +8,7 @@
>   */
>  
>  #include <linux/mfd/syscon.h>
> -#include <linux/mod_devicetable.h>
> +#include <linux/module.h>
>  #include <linux/of_device.h>
>  #include <linux/platform_device.h>
>  #include <linux/reset-controller.h>
> @@ -386,6 +386,7 @@ static const struct of_device_id imx7_reset_dt_ids[] = {
>  	{ .compatible = "fsl,imx8mp-src", .data = &variant_imx8mp },
>  	{ /* sentinel */ },
>  };
> +MODULE_DEVICE_TABLE(of, imx7_reset_dt_ids);
>  
>  static struct platform_driver imx7_reset_driver = {
>  	.probe	= imx7_reset_probe,
> @@ -394,4 +395,13 @@ static struct platform_driver imx7_reset_driver = {
>  		.of_match_table	= imx7_reset_dt_ids,
>  	},
>  };
> -builtin_platform_driver(imx7_reset_driver);
> +
> +static int __init imx7_reset_init(void)
> +{
> +	return platform_driver_register(&imx7_reset_driver);
> +}
> +device_initcall(imx7_reset_init);

Shouldn't this use module_platform_driver instead?

regards
Philipp
Anson Huang July 20, 2020, 1:52 p.m. UTC | #2
Hi, Philipp


> Subject: Re: [PATCH V2 1/3] reset: imx7: Support module build
> 
> On Mon, 2020-06-29 at 23:05 +0800, Anson Huang wrote:
> > Add module device table, author, description and license to support
> > module build, and CONFIG_RESET_IMX7 is changed to default 'y' ONLY for
> > i.MX7D, other platforms need to select it in defconfig.
> >
> > Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> > ---
> > Changes since V1:
> > 	- make it default 'y' for SOC_IMX7D;
> > 	- add module author, description;
> > 	- use device_initcall instead of builtin_platform_driver() to support
> > 	  module unload.
> > ---
> >  drivers/reset/Kconfig      |  5 +++--
> >  drivers/reset/reset-imx7.c | 14 ++++++++++++--
> >  2 files changed, 15 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index
> > d9efbfd..19f9773 100644
> > --- a/drivers/reset/Kconfig
> > +++ b/drivers/reset/Kconfig
> > @@ -65,9 +65,10 @@ config RESET_HSDK
> >  	  This enables the reset controller driver for HSDK board.
> >
> >  config RESET_IMX7
> > -	bool "i.MX7/8 Reset Driver" if COMPILE_TEST
> > +	tristate "i.MX7/8 Reset Driver"
> >  	depends on HAS_IOMEM
> > -	default SOC_IMX7D || (ARM64 && ARCH_MXC)
> > +	depends on SOC_IMX7D || (ARM64 && ARCH_MXC) || COMPILE_TEST
> > +	default y if SOC_IMX7D
> >  	select MFD_SYSCON
> >  	help
> >  	  This enables the reset controller driver for i.MX7 SoCs.
> > diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
> > index d170fe6..c710f789 100644
> > --- a/drivers/reset/reset-imx7.c
> > +++ b/drivers/reset/reset-imx7.c
> > @@ -8,7 +8,7 @@
> >   */
> >
> >  #include <linux/mfd/syscon.h>
> > -#include <linux/mod_devicetable.h>
> > +#include <linux/module.h>
> >  #include <linux/of_device.h>
> >  #include <linux/platform_device.h>
> >  #include <linux/reset-controller.h>
> > @@ -386,6 +386,7 @@ static const struct of_device_id imx7_reset_dt_ids[]
> = {
> >  	{ .compatible = "fsl,imx8mp-src", .data = &variant_imx8mp },
> >  	{ /* sentinel */ },
> >  };
> > +MODULE_DEVICE_TABLE(of, imx7_reset_dt_ids);
> >
> >  static struct platform_driver imx7_reset_driver = {
> >  	.probe	= imx7_reset_probe,
> > @@ -394,4 +395,13 @@ static struct platform_driver imx7_reset_driver = {
> >  		.of_match_table	= imx7_reset_dt_ids,
> >  	},
> >  };
> > -builtin_platform_driver(imx7_reset_driver);
> > +
> > +static int __init imx7_reset_init(void) {
> > +	return platform_driver_register(&imx7_reset_driver);
> > +}
> > +device_initcall(imx7_reset_init);
> 
> Shouldn't this use module_platform_driver instead?

Agreed, module_platform_driver() is better, will improve it in V3.

Thanks,
Anson
diff mbox series

Patch

diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index d9efbfd..19f9773 100644
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -65,9 +65,10 @@  config RESET_HSDK
 	  This enables the reset controller driver for HSDK board.
 
 config RESET_IMX7
-	bool "i.MX7/8 Reset Driver" if COMPILE_TEST
+	tristate "i.MX7/8 Reset Driver"
 	depends on HAS_IOMEM
-	default SOC_IMX7D || (ARM64 && ARCH_MXC)
+	depends on SOC_IMX7D || (ARM64 && ARCH_MXC) || COMPILE_TEST
+	default y if SOC_IMX7D
 	select MFD_SYSCON
 	help
 	  This enables the reset controller driver for i.MX7 SoCs.
diff --git a/drivers/reset/reset-imx7.c b/drivers/reset/reset-imx7.c
index d170fe6..c710f789 100644
--- a/drivers/reset/reset-imx7.c
+++ b/drivers/reset/reset-imx7.c
@@ -8,7 +8,7 @@ 
  */
 
 #include <linux/mfd/syscon.h>
-#include <linux/mod_devicetable.h>
+#include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/reset-controller.h>
@@ -386,6 +386,7 @@  static const struct of_device_id imx7_reset_dt_ids[] = {
 	{ .compatible = "fsl,imx8mp-src", .data = &variant_imx8mp },
 	{ /* sentinel */ },
 };
+MODULE_DEVICE_TABLE(of, imx7_reset_dt_ids);
 
 static struct platform_driver imx7_reset_driver = {
 	.probe	= imx7_reset_probe,
@@ -394,4 +395,13 @@  static struct platform_driver imx7_reset_driver = {
 		.of_match_table	= imx7_reset_dt_ids,
 	},
 };
-builtin_platform_driver(imx7_reset_driver);
+
+static int __init imx7_reset_init(void)
+{
+	return platform_driver_register(&imx7_reset_driver);
+}
+device_initcall(imx7_reset_init);
+
+MODULE_AUTHOR("Andrey Smirnov <andrew.smirnov@gmail.com>");
+MODULE_DESCRIPTION("NXP i.MX7 reset driver");
+MODULE_LICENSE("GPL v2");