Browse Source

rtc: jz4740: make the driver builtin only

Since the driver is now calling machine_halt() that is not exported, it has
to be built in the kernel. Building it as a module will fail at linking
time.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Alexandre Belloni 8 years ago
parent
commit
b9168c539c
2 changed files with 2 additions and 13 deletions
  1. 1 4
      drivers/rtc/Kconfig
  2. 1 9
      drivers/rtc/rtc-jz4740.c

+ 1 - 4
drivers/rtc/Kconfig

@@ -1550,15 +1550,12 @@ config RTC_DRV_MPC5121
 	  will be called rtc-mpc5121.
 	  will be called rtc-mpc5121.
 
 
 config RTC_DRV_JZ4740
 config RTC_DRV_JZ4740
-	tristate "Ingenic JZ4740 SoC"
+	bool "Ingenic JZ4740 SoC"
 	depends on MACH_INGENIC || COMPILE_TEST
 	depends on MACH_INGENIC || COMPILE_TEST
 	help
 	help
 	  If you say yes here you get support for the Ingenic JZ47xx SoCs RTC
 	  If you say yes here you get support for the Ingenic JZ47xx SoCs RTC
 	  controllers.
 	  controllers.
 
 
-	  This driver can also be buillt as a module. If so, the module
-	  will be called rtc-jz4740.
-
 config RTC_DRV_LPC24XX
 config RTC_DRV_LPC24XX
 	tristate "NXP RTC for LPC178x/18xx/408x/43xx"
 	tristate "NXP RTC for LPC178x/18xx/408x/43xx"
 	depends on ARCH_LPC18XX || COMPILE_TEST
 	depends on ARCH_LPC18XX || COMPILE_TEST

+ 1 - 9
drivers/rtc/rtc-jz4740.c

@@ -17,7 +17,6 @@
 #include <linux/clk.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/of_device.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
 #include <linux/platform_device.h>
 #include <linux/reboot.h>
 #include <linux/reboot.h>
@@ -303,7 +302,6 @@ static const struct of_device_id jz4740_rtc_of_match[] = {
 	{ .compatible = "ingenic,jz4780-rtc", .data = (void *)ID_JZ4780 },
 	{ .compatible = "ingenic,jz4780-rtc", .data = (void *)ID_JZ4780 },
 	{},
 	{},
 };
 };
-MODULE_DEVICE_TABLE(of, jz4740_rtc_of_match);
 
 
 static int jz4740_rtc_probe(struct platform_device *pdev)
 static int jz4740_rtc_probe(struct platform_device *pdev)
 {
 {
@@ -431,7 +429,6 @@ static const struct platform_device_id jz4740_rtc_ids[] = {
 	{ "jz4780-rtc", ID_JZ4780 },
 	{ "jz4780-rtc", ID_JZ4780 },
 	{}
 	{}
 };
 };
-MODULE_DEVICE_TABLE(platform, jz4740_rtc_ids);
 
 
 static struct platform_driver jz4740_rtc_driver = {
 static struct platform_driver jz4740_rtc_driver = {
 	.probe	 = jz4740_rtc_probe,
 	.probe	 = jz4740_rtc_probe,
@@ -443,9 +440,4 @@ static struct platform_driver jz4740_rtc_driver = {
 	.id_table = jz4740_rtc_ids,
 	.id_table = jz4740_rtc_ids,
 };
 };
 
 
-module_platform_driver(jz4740_rtc_driver);
-
-MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("RTC driver for the JZ4740 SoC\n");
-MODULE_ALIAS("platform:jz4740-rtc");
+builtin_platform_driver(jz4740_rtc_driver);