git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
loongson32
/
common
/
time.c
diff --git
a/arch/mips/loongson32/common/time.c
b/arch/mips/loongson32/common/time.c
index 0996b025eeefb0e6aee1081bd0360e6ff0d53b29..ff224f0020e504da5e45f6c0e0264eba526b1669 100644
(file)
--- a/
arch/mips/loongson32/common/time.c
+++ b/
arch/mips/loongson32/common/time.c
@@
-9,6
+9,7
@@
#include <linux/clk.h>
#include <linux/interrupt.h>
#include <linux/clk.h>
#include <linux/interrupt.h>
+#include <linux/sizes.h>
#include <asm/time.h>
#include <loongson1.h>
#include <asm/time.h>
#include <loongson1.h>
@@
-35,25
+36,25
@@
DEFINE_RAW_SPINLOCK(ls1x_timer_lock);
DEFINE_RAW_SPINLOCK(ls1x_timer_lock);
-static void __iomem *timer_base;
+static void __iomem *timer_
reg_
base;
static uint32_t ls1x_jiffies_per_tick;
static inline void ls1x_pwmtimer_set_period(uint32_t period)
{
static uint32_t ls1x_jiffies_per_tick;
static inline void ls1x_pwmtimer_set_period(uint32_t period)
{
- __raw_writel(period, timer_base + PWM_HRC);
- __raw_writel(period, timer_base + PWM_LRC);
+ __raw_writel(period, timer_
reg_
base + PWM_HRC);
+ __raw_writel(period, timer_
reg_
base + PWM_LRC);
}
static inline void ls1x_pwmtimer_restart(void)
{
}
static inline void ls1x_pwmtimer_restart(void)
{
- __raw_writel(0x0, timer_base + PWM_CNT);
- __raw_writel(INT_EN | CNT_EN, timer_base + PWM_CTRL);
+ __raw_writel(0x0, timer_
reg_
base + PWM_CNT);
+ __raw_writel(INT_EN | CNT_EN, timer_
reg_
base + PWM_CTRL);
}
void __init ls1x_pwmtimer_init(void)
{
}
void __init ls1x_pwmtimer_init(void)
{
- timer_
base = ioremap(LS1X_TIMER_BASE, 0xf
);
- if (!timer_base)
+ timer_
reg_base = ioremap_nocache(LS1X_TIMER_BASE, SZ_16
);
+ if (!timer_
reg_
base)
panic("Failed to remap timer registers");
ls1x_jiffies_per_tick = DIV_ROUND_CLOSEST(mips_hpt_frequency, HZ);
panic("Failed to remap timer registers");
ls1x_jiffies_per_tick = DIV_ROUND_CLOSEST(mips_hpt_frequency, HZ);
@@
-86,7
+87,7
@@
static cycle_t ls1x_clocksource_read(struct clocksource *cs)
*/
jifs = jiffies;
/* read the count */
*/
jifs = jiffies;
/* read the count */
- count = __raw_readl(timer_base + PWM_CNT);
+ count = __raw_readl(timer_
reg_
base + PWM_CNT);
/*
* It's possible for count to appear to go the wrong way for this
/*
* It's possible for count to appear to go the wrong way for this
@@
-131,7
+132,7
@@
static int ls1x_clockevent_set_state_periodic(struct clock_event_device *cd)
raw_spin_lock(&ls1x_timer_lock);
ls1x_pwmtimer_set_period(ls1x_jiffies_per_tick);
ls1x_pwmtimer_restart();
raw_spin_lock(&ls1x_timer_lock);
ls1x_pwmtimer_set_period(ls1x_jiffies_per_tick);
ls1x_pwmtimer_restart();
- __raw_writel(INT_EN | CNT_EN, timer_base + PWM_CTRL);
+ __raw_writel(INT_EN | CNT_EN, timer_
reg_
base + PWM_CTRL);
raw_spin_unlock(&ls1x_timer_lock);
return 0;
raw_spin_unlock(&ls1x_timer_lock);
return 0;
@@
-140,7
+141,7
@@
static int ls1x_clockevent_set_state_periodic(struct clock_event_device *cd)
static int ls1x_clockevent_tick_resume(struct clock_event_device *cd)
{
raw_spin_lock(&ls1x_timer_lock);
static int ls1x_clockevent_tick_resume(struct clock_event_device *cd)
{
raw_spin_lock(&ls1x_timer_lock);
- __raw_writel(INT_EN | CNT_EN, timer_base + PWM_CTRL);
+ __raw_writel(INT_EN | CNT_EN, timer_
reg_
base + PWM_CTRL);
raw_spin_unlock(&ls1x_timer_lock);
return 0;
raw_spin_unlock(&ls1x_timer_lock);
return 0;
@@
-149,8
+150,8
@@
static int ls1x_clockevent_tick_resume(struct clock_event_device *cd)
static int ls1x_clockevent_set_state_shutdown(struct clock_event_device *cd)
{
raw_spin_lock(&ls1x_timer_lock);
static int ls1x_clockevent_set_state_shutdown(struct clock_event_device *cd)
{
raw_spin_lock(&ls1x_timer_lock);
- __raw_writel(__raw_readl(timer_base + PWM_CTRL) & ~CNT_EN,
- timer_base + PWM_CTRL);
+ __raw_writel(__raw_readl(timer_
reg_
base + PWM_CTRL) & ~CNT_EN,
+ timer_
reg_
base + PWM_CTRL);
raw_spin_unlock(&ls1x_timer_lock);
return 0;
raw_spin_unlock(&ls1x_timer_lock);
return 0;
@@
-220,7
+221,7
@@
void __init plat_time_init(void)
#ifdef CONFIG_CEVT_CSRC_LS1X
/* setup LS1X PWM timer */
#ifdef CONFIG_CEVT_CSRC_LS1X
/* setup LS1X PWM timer */
- clk = clk_get(NULL, "ls1x
_
pwmtimer");
+ clk = clk_get(NULL, "ls1x
-
pwmtimer");
if (IS_ERR(clk))
panic("unable to get timer clock, err=%ld", PTR_ERR(clk));
if (IS_ERR(clk))
panic("unable to get timer clock, err=%ld", PTR_ERR(clk));