Skip to content

Commit

Permalink
m68knommu: make persistent clock code consistent with m68k
Browse files Browse the repository at this point in the history 
The read_persistent_clock() code is different on m68knommu, for really no
reason. With a few changes to support function names and some code
re-organization the code can be made the same.

This will make it easier to merge the arch/m68k/kernel/time.c for m68k and
m68knommu in a future patch.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
  • Loading branch information
Greg Ungerer committed Mar 4, 2012
1 parent d3f033f commit 9517746
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 46 deletions.
2 changes: 0 additions & 2 deletions arch/m68k/include/asm/machdep.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ extern unsigned int (*mach_get_ss)(void);
extern int (*mach_get_rtc_pll)(struct rtc_pll_info *);
extern int (*mach_set_rtc_pll)(struct rtc_pll_info *);
extern int (*mach_set_clock_mmss)(unsigned long);
extern void (*mach_gettod)(int *year, int *mon, int *day, int *hour,
int *min, int *sec);
extern void (*mach_reset)( void );
extern void (*mach_halt)( void );
extern void (*mach_power_off)( void );
Expand Down
2 changes: 2 additions & 0 deletions arch/m68k/kernel/setup_no.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <linux/init.h>
#include <linux/initrd.h>
#include <linux/root_dev.h>
#include <linux/rtc.h>

#include <asm/setup.h>
#include <asm/irq.h>
Expand All @@ -48,6 +49,7 @@ char __initdata command_line[COMMAND_LINE_SIZE];

/* machine dependent timer functions */
int (*mach_set_clock_mmss)(unsigned long);
int (*mach_hwclk) (int, struct rtc_time*);

/* machine dependent reboot functions */
void (*mach_reset)(void);
Expand Down
36 changes: 12 additions & 24 deletions arch/m68k/kernel/time_no.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,11 @@
#include <linux/profile.h>
#include <linux/time.h>
#include <linux/timex.h>
#include <linux/rtc.h>

#include <asm/machdep.h>
#include <asm/irq_regs.h>

#define TICK_SIZE (tick_nsec / 1000)

/* machine dependent timer functions */
void (*mach_gettod)(int*, int*, int*, int*, int*, int*);

static inline int set_rtc_mmss(unsigned long nowtime)
{
if (mach_set_clock_mmss)
Expand All @@ -55,28 +51,20 @@ irqreturn_t arch_timer_interrupt(int irq, void *dummy)
}
#endif

static unsigned long read_rtc_mmss(void)
{
unsigned int year, mon, day, hour, min, sec;

if (mach_gettod) {
mach_gettod(&year, &mon, &day, &hour, &min, &sec);
if ((year += 1900) < 1970)
year += 100;
} else {
year = 1970;
mon = day = 1;
hour = min = sec = 0;
}


return mktime(year, mon, day, hour, min, sec);
}

void read_persistent_clock(struct timespec *ts)
{
ts->tv_sec = read_rtc_mmss();
struct rtc_time time;
ts->tv_sec = 0;
ts->tv_nsec = 0;

if (mach_hwclk) {
mach_hwclk(0, &time);

if ((time.tm_year += 1900) < 1970)
time.tm_year += 100;
ts->tv_sec = mktime(time.tm_year, time.tm_mon, time.tm_mday,
time.tm_hour, time.tm_min, time.tm_sec);
}
}

int update_persistent_clock(struct timespec now)
Expand Down
5 changes: 3 additions & 2 deletions arch/m68k/platform/68328/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/rtc.h>
#include <asm/system.h>
#include <asm/machdep.h>
#include <asm/MC68328.h>
Expand All @@ -26,7 +27,7 @@

/***************************************************************************/

void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);
int m68328_hwclk(int set, struct rtc_time *t);

/***************************************************************************/

Expand All @@ -48,7 +49,7 @@ void config_BSP(char *command, int len)
printk(KERN_INFO "68328 support Kenneth Albanowski <kjahds@kjshds.com>\n");
printk(KERN_INFO "68328/Pilot support Bernhard Kuhn <kuhn@lpr.e-technik.tu-muenchen.de>\n");

mach_gettod = m68328_timer_gettod;
mach_hwclk = m68328_hwclk;
mach_reset = m68328_reset;
}

Expand Down
18 changes: 11 additions & 7 deletions arch/m68k/platform/68328/timers.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/clocksource.h>
#include <linux/rtc.h>
#include <asm/setup.h>
#include <asm/system.h>
#include <asm/pgtable.h>
Expand Down Expand Up @@ -119,14 +120,17 @@ void hw_timer_init(void)

/***************************************************************************/

void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec)
int m68328_hwclk(int set, struct rtc_time *t)
{
long now = RTCTIME;

*year = *mon = *day = 1;
*hour = (now >> 24) % 24;
*min = (now >> 16) % 60;
*sec = now % 60;
if (!set) {
long now = RTCTIME;
t->tm_year = t->tm_mon = t->tm_mday = 1;
t->tm_hour = (now >> 24) % 24;
t->tm_min = (now >> 16) % 60;
t->tm_sec = now % 60;
}

return 0;
}

/***************************************************************************/
8 changes: 1 addition & 7 deletions arch/m68k/platform/68360/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,6 @@ void hw_timer_init(void)
pquicc->timer_tgcr = tgcr_save;
}

void BSP_gettod (int *yearp, int *monp, int *dayp,
int *hourp, int *minp, int *secp)
{
}

int BSP_set_clock_mmss(unsigned long nowtime)
{
#if 0
Expand Down Expand Up @@ -181,6 +176,5 @@ void config_BSP(char *command, int len)
scc1_hwaddr = "\00\01\02\03\04\05";
#endif

mach_gettod = BSP_gettod;
mach_reset = BSP_reset;
mach_reset = BSP_reset;
}
5 changes: 3 additions & 2 deletions arch/m68k/platform/68EZ328/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/rtc.h>
#include <asm/system.h>
#include <asm/pgtable.h>
#include <asm/machdep.h>
Expand All @@ -25,7 +26,7 @@

/***************************************************************************/

void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);
int m68328_hwclk(int set, struct rtc_time *t);

/***************************************************************************/

Expand Down Expand Up @@ -69,7 +70,7 @@ void config_BSP(char *command, int len)
else command[0] = 0;
#endif

mach_gettod = m68328_timer_gettod;
mach_hwclk = m68328_hwclk;
mach_reset = m68ez328_reset;
}

Expand Down
5 changes: 3 additions & 2 deletions arch/m68k/platform/68VZ328/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <linux/netdevice.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/rtc.h>

#include <asm/system.h>
#include <asm/pgtable.h>
Expand All @@ -33,7 +34,7 @@

/***************************************************************************/

void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);
int m68328_hwclk(int set, struct rtc_time *t);

/***************************************************************************/
/* Init Drangon Engine hardware */
Expand Down Expand Up @@ -181,7 +182,7 @@ void config_BSP(char *command, int size)

init_hardware(command, size);

mach_gettod = m68328_timer_gettod;
mach_hwclk = m68328_hwclk;
mach_reset = m68vz328_reset;
}

Expand Down

0 comments on commit 9517746

Please sign in to comment.