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

Commit b2994d31 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C2443/S3C2416: add s3c_rtc_setname and rename rtc devices 



As the S3C24xx SoCs use the same rtc device a renaming capability like in
the adc driver is necessary.

This patch adds a s3c_rtc_setname function and names the rtc devices for
S3C2443 and S3C2416 accordingly.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 25c1a246

arch/arm/mach-s3c2416/s3c2416.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include <plat/fb-core.h>

#include <plat/nand-core.h>

#include <plat/adc-core.h>

#include <plat/rtc-core.h>



static struct map_desc s3c2416_iodesc[] __initdata = {

	IODESC_ENT(WATCHDOG),
@@ -101,6 +102,7 @@ int __init s3c2416_init(void) 
	s3c_fb_setname("s3c2443-fb");



	s3c_adc_setname("s3c2416-adc");

	s3c_rtc_setname("s3c2416-rtc");



#ifdef CONFIG_PM

	register_syscore_ops(&s3c2416_pm_syscore_ops);

arch/arm/mach-s3c2443/s3c2443.c

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <plat/fb-core.h>

#include <plat/nand-core.h>

#include <plat/adc-core.h>

#include <plat/rtc-core.h>



static struct map_desc s3c2443_iodesc[] __initdata = {

	IODESC_ENT(WATCHDOG),
@@ -73,6 +74,7 @@ int __init s3c2443_init(void) 
	s3c_fb_setname("s3c2443-fb");



	s3c_adc_setname("s3c2443-adc");

	s3c_rtc_setname("s3c2443-rtc");



	/* change WDT IRQ number */

	s3c_device_wdt.resource[1].start = IRQ_S3C2443_WDT;

arch/arm/plat-samsung/include/plat/rtc-core.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/plat-samsung/include/plat/rtc-core.h

 *

 * Copyright (c) 2011 Heiko Stuebner <heiko@sntech.de>

 *

 * Samsung RTC Controller core functions

 *

 * 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.

*/



#ifndef __ASM_PLAT_RTC_CORE_H

#define __ASM_PLAT_RTC_CORE_H __FILE__



/* These functions are only for use with the core support code, such as

 * the cpu specific initialisation code

 */



/* re-define device name depending on support. */

static inline void s3c_rtc_setname(char *name)

{

#if defined(CONFIG_SAMSUNG_DEV_RTC) || defined(CONFIG_PLAT_S3C24XX)

	s3c_device_rtc.name = name;

#endif

}



#endif /* __ASM_PLAT_RTC_CORE_H */