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

Commit bad6a5c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc 

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc:
  powerpc/ps3: Add rtc-ps3
  powerpc: Hook up rtc-generic, and kill rtc-ppc
  m68k: Hook up rtc-generic
  parisc: rtc: Rename rtc-parisc to rtc-generic
  parisc: rtc: Add missing module alias
  parisc: rtc: platform_driver_probe() fixups
  parisc: rtc: get_rtc_time() returns unsigned int
parents 03c3fa0a 0b5f037a

arch/m68k/include/asm/rtc.h

+5 −2
Original line number Diff line number Diff line
@@ -36,13 +36,16 @@ static inline unsigned int get_rtc_time(struct rtc_time *time) 
	 * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated

	 * by the RTC when initially set to a non-zero value.

	 */

	if (mach_hwclk)

		mach_hwclk(0, time);

	return RTC_24H;

}



static inline int set_rtc_time(struct rtc_time *time)

{

	if (mach_hwclk)

		return mach_hwclk(1, time);

	return -EINVAL;

}



static inline unsigned int get_rtc_ss(void)

arch/m68k/kernel/time.c

+18 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/string.h>

#include <linux/mm.h>

#include <linux/rtc.h>

#include <linux/platform_device.h>



#include <asm/machdep.h>

#include <asm/io.h>
@@ -159,3 +160,20 @@ int do_settimeofday(struct timespec *tv) 
}



EXPORT_SYMBOL(do_settimeofday);





static int __init rtc_init(void)

{

	struct platform_device *pdev;



	if (!mach_hwclk)

		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);

arch/parisc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ config PARISC 
	select HAVE_IDE

	select HAVE_OPROFILE

	select RTC_CLASS

	select RTC_DRV_PARISC

	select RTC_DRV_GENERIC

	select INIT_ALL_POSSIBLE

	help

	  The PA-RISC microprocessor is designed by Hewlett-Packard and used

arch/parisc/kernel/time.c

+3 −3
Original line number Diff line number Diff line
@@ -216,14 +216,14 @@ void __init start_cpu_itimer(void) 
	per_cpu(cpu_data, cpu).it_value = next_tick;

}



static struct platform_device rtc_parisc_dev = {

	.name = "rtc-parisc",

static struct platform_device rtc_generic_dev = {

	.name = "rtc-generic",

	.id = -1,

};



static int __init rtc_init(void)

{

	if (platform_device_register(&rtc_parisc_dev) < 0)

	if (platform_device_register(&rtc_generic_dev) < 0)

		printk(KERN_ERR "unable to register rtc device...\n");



	/* not necessarily an error */

arch/powerpc/include/asm/ps3.h

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ enum ps3_param_av_multi_out { 


enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void);



extern u64 ps3_os_area_get_rtc_diff(void);

extern void ps3_os_area_set_rtc_diff(u64 rtc_diff);



/* dma routines */



enum ps3_dma_page_size {