diff options
Diffstat (limited to 'drivers/clocksource')
-rw-r--r-- | drivers/clocksource/acpi_pm.c | 2 | ||||
-rw-r--r-- | drivers/clocksource/cyclone.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c index 066dc77433d5..7ad3be8c0f49 100644 --- a/drivers/clocksource/acpi_pm.c +++ b/drivers/clocksource/acpi_pm.c | |||
@@ -32,7 +32,7 @@ | |||
32 | */ | 32 | */ |
33 | u32 pmtmr_ioport __read_mostly; | 33 | u32 pmtmr_ioport __read_mostly; |
34 | 34 | ||
35 | #define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */ | 35 | #define ACPI_PM_MASK CLOCKSOURCE_MASK(24) /* limit it to 24 bits */ |
36 | 36 | ||
37 | static inline u32 read_pmtmr(void) | 37 | static inline u32 read_pmtmr(void) |
38 | { | 38 | { |
diff --git a/drivers/clocksource/cyclone.c b/drivers/clocksource/cyclone.c index 5906a0af825d..bf4d3d50d1c4 100644 --- a/drivers/clocksource/cyclone.c +++ b/drivers/clocksource/cyclone.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #define CYCLONE_MPCS_OFFSET 0x51A8 /* offset to select register */ | 14 | #define CYCLONE_MPCS_OFFSET 0x51A8 /* offset to select register */ |
15 | #define CYCLONE_MPMC_OFFSET 0x51D0 /* offset to count register */ | 15 | #define CYCLONE_MPMC_OFFSET 0x51D0 /* offset to count register */ |
16 | #define CYCLONE_TIMER_FREQ 99780000 /* 100Mhz, but not really */ | 16 | #define CYCLONE_TIMER_FREQ 99780000 /* 100Mhz, but not really */ |
17 | #define CYCLONE_TIMER_MASK 0xFFFFFFFF /* 32 bit mask */ | 17 | #define CYCLONE_TIMER_MASK CLOCKSOURCE_MASK(32) /* 32 bit mask */ |
18 | 18 | ||
19 | int use_cyclone = 0; | 19 | int use_cyclone = 0; |
20 | static void __iomem *cyclone_ptr; | 20 | static void __iomem *cyclone_ptr; |
@@ -28,7 +28,7 @@ static struct clocksource clocksource_cyclone = { | |||
28 | .name = "cyclone", | 28 | .name = "cyclone", |
29 | .rating = 250, | 29 | .rating = 250, |
30 | .read = read_cyclone, | 30 | .read = read_cyclone, |
31 | .mask = (cycle_t)CYCLONE_TIMER_MASK, | 31 | .mask = CYCLONE_TIMER_MASK, |
32 | .mult = 10, | 32 | .mult = 10, |
33 | .shift = 0, | 33 | .shift = 0, |
34 | .is_continuous = 1, | 34 | .is_continuous = 1, |