Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-15 18:04:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] ppc64: rename pSeries rtc functions into rtas_*

Browse Source 
The rtc rtas functions are not pSeries specific but can
also be used by BPA and other SLOF based platforms

Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Arnd Bergmann 2005-06-23 09:43:18 +10:00 committed by Paul Mackerras
parent 10f7e7c15e
commit 773bf9c469
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/ppc64/kernel/pSeries_setup.c
View File

@ -73,9 +73,6 @@
extern void pSeries_final_fixup(void); extern void pSeries_final_fixup(void);
extern void pSeries_get_boot_time(struct rtc_time *rtc_time);
extern void pSeries_get_rtc_time(struct rtc_time *rtc_time);
extern int pSeries_set_rtc_time(struct rtc_time *rtc_time);
extern void find_udbg_vterm(void); extern void find_udbg_vterm(void);
extern void system_reset_fwnmi(void); /* from head.S */ extern void system_reset_fwnmi(void); /* from head.S */
extern void machine_check_fwnmi(void); /* from head.S */ extern void machine_check_fwnmi(void); /* from head.S */
@ -534,9 +531,9 @@ struct machdep_calls __initdata pSeries_md = {
.halt = rtas_halt, .halt = rtas_halt,
.panic = rtas_os_term, .panic = rtas_os_term,
.cpu_die = pSeries_mach_cpu_die, .cpu_die = pSeries_mach_cpu_die,
.get_boot_time = pSeries_get_boot_time, .get_boot_time = rtas_get_boot_time,
.get_rtc_time = pSeries_get_rtc_time, .get_rtc_time = rtas_get_rtc_time,
.set_rtc_time = pSeries_set_rtc_time, .set_rtc_time = rtas_set_rtc_time,
.calibrate_decr = generic_calibrate_decr, .calibrate_decr = generic_calibrate_decr,
.progress = pSeries_progress, .progress = pSeries_progress,
.check_legacy_ioport = pSeries_check_legacy_ioport, .check_legacy_ioport = pSeries_check_legacy_ioport,

6
arch/ppc64/kernel/rtc.c
View File

@ -301,7 +301,7 @@ void iSeries_get_boot_time(struct rtc_time *tm)
#ifdef CONFIG_PPC_RTAS #ifdef CONFIG_PPC_RTAS
#define MAX_RTC_WAIT 5000 /* 5 sec */ #define MAX_RTC_WAIT 5000 /* 5 sec */
#define RTAS_CLOCK_BUSY (-2) #define RTAS_CLOCK_BUSY (-2)
void pSeries_get_boot_time(struct rtc_time *rtc_tm) void rtas_get_boot_time(struct rtc_time *rtc_tm)
{ {
int ret[8]; int ret[8];
int error, wait_time; int error, wait_time;
@ -336,7 +336,7 @@ void pSeries_get_boot_time(struct rtc_time *rtc_tm)
* and if a delay is needed to read the clock. In this case we just * and if a delay is needed to read the clock. In this case we just
* silently return without updating rtc_tm. * silently return without updating rtc_tm.
*/ */
void pSeries_get_rtc_time(struct rtc_time *rtc_tm) void rtas_get_rtc_time(struct rtc_time *rtc_tm)
{ {
int ret[8]; int ret[8];
int error, wait_time; int error, wait_time;
@ -371,7 +371,7 @@ void pSeries_get_rtc_time(struct rtc_time *rtc_tm)
rtc_tm->tm_year = ret[0] - 1900; rtc_tm->tm_year = ret[0] - 1900;
} }
int pSeries_set_rtc_time(struct rtc_time *tm) int rtas_set_rtc_time(struct rtc_time *tm)
{ {
int error, wait_time; int error, wait_time;
unsigned long max_wait_tb; unsigned long max_wait_tb;

5
include/asm-ppc64/rtas.h
View File

@ -188,6 +188,11 @@ extern int rtas_set_power_level(int powerdomain, int level, int *setlevel);
extern int rtas_set_indicator(int indicator, int index, int new_value); extern int rtas_set_indicator(int indicator, int index, int new_value);
extern void rtas_initialize(void); extern void rtas_initialize(void);
struct rtc_time;
extern void rtas_get_boot_time(struct rtc_time *rtc_time);
extern void rtas_get_rtc_time(struct rtc_time *rtc_time);
extern int rtas_set_rtc_time(struct rtc_time *rtc_time);
/* Given an RTAS status code of 9900..9905 compute the hinted delay */ /* Given an RTAS status code of 9900..9905 compute the hinted delay */
unsigned int rtas_extended_busy_delay_time(int status); unsigned int rtas_extended_busy_delay_time(int status);
static inline int rtas_is_extended_busy(int status) static inline int rtas_is_extended_busy(int status)