summaryrefslogtreecommitdiffstats
path: root/drivers/clocksource
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-06-24 19:43:15 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-07-18 12:29:02 +0100
commitaf040ffc9ba1e079ee4c0748aff64fa3d4716fa5 (patch)
tree03d58af8c3d16a777ee93e35d9f7aef15293a163 /drivers/clocksource
parentee2593ef5680a8646c6465ce998fea30b5af9b2b (diff)
downloadblackbird-op-linux-af040ffc9ba1e079ee4c0748aff64fa3d4716fa5.tar.gz
blackbird-op-linux-af040ffc9ba1e079ee4c0748aff64fa3d4716fa5.zip
ARM: make it easier to check the CPU part number correctly
Ensure that platform maintainers check the CPU part number in the right manner: the CPU part number is meaningless without also checking the CPU implement(e|o)r (choose your preferred spelling!) Provide an interface which returns both the implementer and part number together, and update the definitions to include the implementer. Mark the old function as being deprecated... indeed, using the old function with the definitions will now always evaluate as false, so people must update their un-merged code to the new function. While this could be avoided by adding new definitions, we'd also have to create new names for them which would be awkward. Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r--drivers/clocksource/arm_global_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/arm_global_timer.c b/drivers/clocksource/arm_global_timer.c
index 60e5a170c4d2..e6833771a716 100644
--- a/drivers/clocksource/arm_global_timer.c
+++ b/drivers/clocksource/arm_global_timer.c
@@ -250,7 +250,7 @@ static void __init global_timer_of_register(struct device_node *np)
* fire when the timer value is greater than or equal to. In previous
* revisions the comparators fired when the timer value was equal to.
*/
- if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9
+ if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9
&& (read_cpuid_id() & 0xf0000f) < 0x200000) {
pr_warn("global-timer: non support for this cpu version.\n");
return;
OpenPOWER on IntegriCloud