Commit 751321b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux 

Pull RTC fix from Alexandre Belloni:
 "A single fix for this cycle. It is worth taking it for 4.10 so that
  distributions will not have CONFIG_RTC_DRV_JZ4740 switching from m to
  y in their config.

  Summary:
   - Allow jz4740 to build as a module again by using kernel_halt()"

* tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  rtc: jz4740: make the driver buildable as a module again
parents 566cf877 586655d2

drivers/rtc/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -1551,12 +1551,15 @@ config RTC_DRV_MPC5121 
	  will be called rtc-mpc5121.



config RTC_DRV_JZ4740

	bool "Ingenic JZ4740 SoC"

	tristate "Ingenic JZ4740 SoC"

	depends on MACH_INGENIC || COMPILE_TEST

	help

	  If you say yes here you get support for the Ingenic JZ47xx SoCs RTC

	  controllers.



	  This driver can also be buillt as a module. If so, the module

	  will be called rtc-jz4740.



config RTC_DRV_LPC24XX

	tristate "NXP RTC for LPC178x/18xx/408x/43xx"

	depends on ARCH_LPC18XX || COMPILE_TEST

drivers/rtc/rtc-jz4740.c

+10 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/clk.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/reboot.h>
@@ -294,7 +295,7 @@ static void jz4740_rtc_power_off(void) 
			     JZ_REG_RTC_RESET_COUNTER, reset_counter_ticks);



	jz4740_rtc_poweroff(dev_for_power_off);

	machine_halt();

	kernel_halt();

}



static const struct of_device_id jz4740_rtc_of_match[] = {
@@ -302,6 +303,7 @@ static const struct of_device_id jz4740_rtc_of_match[] = { 
	{ .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)

{
@@ -429,6 +431,7 @@ static const struct platform_device_id jz4740_rtc_ids[] = { 
	{ "jz4780-rtc", ID_JZ4780 },

	{}

};

MODULE_DEVICE_TABLE(platform, jz4740_rtc_ids);



static struct platform_driver jz4740_rtc_driver = {

	.probe	 = jz4740_rtc_probe,
@@ -440,4 +443,9 @@ static struct platform_driver jz4740_rtc_driver = { 
	.id_table = jz4740_rtc_ids,

};



builtin_platform_driver(jz4740_rtc_driver);
 
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");

CRA Git | Maintained and supported by SUSTech CRA and CCSE