Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcd68a70 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Kyle McMartin
Browse files

powerpc: Hook up rtc-generic, and kill rtc-ppc 



PowerPC has been a long time user of the generic RTC abstraction, so hook up
rtc-generic:
  - Create the "rtc-generic" platform device if ppc_md.get_rtc_time is set,
  - Kill rtc-ppc, as rtc-generic offers the same functionality in a more
    generic way, and supports autoloading through udev.

Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Acked-by: default avatarAlessandro Zummo <a.zummo@towertech.it>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarKyle McMartin <kyle@mcmartin.ca>
parent 2ceb3ad7

arch/powerpc/kernel/time.c

+16 −0
Original line number Diff line number Diff line
@@ -1127,3 +1127,19 @@ void div128_by_32(u64 dividend_high, u64 dividend_low, 
	dr->result_low  = ((u64)y << 32) + z;



}



static int __init rtc_init(void)

{

	struct platform_device *pdev;



	if (!ppc_md.get_rtc_time)

		return -ENODEV;



	pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);

	if (IS_ERR(pdev))

		return PTR_ERR(pdev);



	return 0;

}



module_init(rtc_init);

drivers/rtc/Kconfig

+1 −9
Original line number Diff line number Diff line
@@ -692,20 +692,12 @@ config RTC_DRV_GENERIC 
	tristate "Generic RTC support"

	# Please consider writing a new RTC driver instead of using the generic

	# RTC abstraction

	depends on PARISC || M68K

	depends on PARISC || M68K || PPC

	help

	  Say Y or M here to enable RTC support on systems using the generic

	  RTC abstraction. If you do not know what you are doing, you should

	  just say Y.



config RTC_DRV_PPC

       tristate "PowerPC machine dependent RTC support"

       depends on PPC

       help

	 The PowerPC kernel has machine-specific functions for accessing

	 the RTC. This exposes that functionality through the generic RTC

	 class.



config RTC_DRV_PXA

       tristate "PXA27x/PXA3xx"

       depends on ARCH_PXA

drivers/rtc/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ obj-$(CONFIG_RTC_DRV_PCF8583) += rtc-pcf8583.o 
obj-$(CONFIG_RTC_DRV_PL030)	+= rtc-pl030.o

obj-$(CONFIG_RTC_DRV_PL031)	+= rtc-pl031.o

obj-$(CONFIG_RTC_DRV_GENERIC)	+= rtc-generic.o

obj-$(CONFIG_RTC_DRV_PPC)	+= rtc-ppc.o

obj-$(CONFIG_RTC_DRV_PXA)	+= rtc-pxa.o

obj-$(CONFIG_RTC_DRV_R9701)	+= rtc-r9701.o

obj-$(CONFIG_RTC_DRV_RS5C313)	+= rtc-rs5c313.o

drivers/rtc/rtc-ppc.c

deleted100644 → 0
+0 −69
Original line number Diff line number Diff line 
/*

 * RTC driver for ppc_md RTC functions

 *

 * © 2007 Red Hat, Inc.

 *

 * Author: David Woodhouse <dwmw2@infradead.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */





#include <linux/module.h>

#include <linux/err.h>

#include <linux/rtc.h>

#include <linux/platform_device.h>

#include <asm/machdep.h>



static int ppc_rtc_read_time(struct device *dev, struct rtc_time *tm)

{

	ppc_md.get_rtc_time(tm);

	return 0;

}



static int ppc_rtc_set_time(struct device *dev, struct rtc_time *tm)

{

	return ppc_md.set_rtc_time(tm);

}



static const struct rtc_class_ops ppc_rtc_ops = {

	.set_time = ppc_rtc_set_time,

	.read_time = ppc_rtc_read_time,

};



static struct rtc_device *rtc;

static struct platform_device *ppc_rtc_pdev;



static int __init ppc_rtc_init(void)

{

	if (!ppc_md.get_rtc_time || !ppc_md.set_rtc_time)

		return -ENODEV;



	ppc_rtc_pdev = platform_device_register_simple("ppc-rtc", 0, NULL, 0);

	if (IS_ERR(ppc_rtc_pdev))

		return PTR_ERR(ppc_rtc_pdev);



	rtc = rtc_device_register("ppc_md", &ppc_rtc_pdev->dev,

				  &ppc_rtc_ops, THIS_MODULE);

	if (IS_ERR(rtc)) {

		platform_device_unregister(ppc_rtc_pdev);

		return PTR_ERR(rtc);

	}



	return 0;

}



static void __exit ppc_rtc_exit(void)

{

	rtc_device_unregister(rtc);

	platform_device_unregister(ppc_rtc_pdev);

}



module_init(ppc_rtc_init);

module_exit(ppc_rtc_exit);



MODULE_LICENSE("GPL");

MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");

MODULE_DESCRIPTION("Generic RTC class driver for PowerPC");