lkml.org 
[lkml]   [2005]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/11] ppc64: rename pSeries rtc functions into rtas_*
    Date
    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>

    --
    arch/ppc64/kernel/pSeries_setup.c | 9 +++------
    arch/ppc64/kernel/rtc.c | 6 +++---
    include/asm-ppc64/rtas.h | 5 +++++
    3 files changed, 11 insertions(+), 9 deletions(-)

    --- linux-cg.orig/arch/ppc64/kernel/pSeries_setup.c 2005-06-21 03:15:26.961012552 -0400
    +++ linux-cg/arch/ppc64/kernel/pSeries_setup.c 2005-06-21 03:15:27.004006016 -0400
    @@ -73,9 +73,6 @@

    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 system_reset_fwnmi(void); /* from head.S */
    extern void machine_check_fwnmi(void); /* from head.S */
    @@ -534,9 +531,9 @@ struct machdep_calls __initdata pSeries_
    .halt = rtas_halt,
    .panic = rtas_os_term,
    .cpu_die = pSeries_mach_cpu_die,
    - .get_boot_time = pSeries_get_boot_time,
    - .get_rtc_time = pSeries_get_rtc_time,
    - .set_rtc_time = pSeries_set_rtc_time,
    + .get_boot_time = rtas_get_boot_time,
    + .get_rtc_time = rtas_get_rtc_time,
    + .set_rtc_time = rtas_set_rtc_time,
    .calibrate_decr = generic_calibrate_decr,
    .progress = pSeries_progress,
    .check_legacy_ioport = pSeries_check_legacy_ioport,
    --- linux-cg.orig/arch/ppc64/kernel/rtc.c 2005-06-21 03:15:21.762997888 -0400
    +++ linux-cg/arch/ppc64/kernel/rtc.c 2005-06-21 03:15:27.005005864 -0400
    @@ -303,7 +303,7 @@ void iSeries_get_boot_time(struct rtc_ti
    #ifdef CONFIG_PPC_RTAS
    #define MAX_RTC_WAIT 5000 /* 5 sec */
    #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 error, wait_time;
    @@ -338,7 +338,7 @@ void pSeries_get_boot_time(struct rtc_ti
    * and if a delay is needed to read the clock. In this case we just
    * 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 error, wait_time;
    @@ -373,7 +373,7 @@ void pSeries_get_rtc_time(struct rtc_tim
    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;
    unsigned long max_wait_tb;
    --- linux-cg.orig/include/asm-ppc64/rtas.h 2005-06-21 03:15:24.090910336 -0400
    +++ linux-cg/include/asm-ppc64/rtas.h 2005-06-21 03:15:44.352891944 -0400
    @@ -188,6 +188,11 @@ extern int rtas_set_power_level(int powe
    extern int rtas_set_indicator(int indicator, int index, int new_value);
    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 */
    unsigned int rtas_extended_busy_delay_time(int status);
    static inline int rtas_is_extended_busy(int status)
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-06-22 00:35    [W:0.024 / U:1.336 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site