From: Huang, Tao Date: Wed, 20 May 2015 08:01:55 +0000 (+0800) Subject: arm: rockchip: use read_cpuid_part instead of read_cpuid_part_number X-Git-Tag: firefly_0821_release~4154 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d2cd7b632132b73d2a90917b565463cf81a552e1;p=firefly-linux-kernel-4.4.55.git arm: rockchip: use read_cpuid_part instead of read_cpuid_part_number Signed-off-by: Huang, Tao --- diff --git a/arch/arm/mach-rockchip/common.c b/arch/arm/mach-rockchip/common.c index 84f736595179..510e4da5bc74 100755 --- a/arch/arm/mach-rockchip/common.c +++ b/arch/arm/mach-rockchip/common.c @@ -120,7 +120,7 @@ static int __init rockchip_pl330_l2_cache_init(void) void __iomem *base; u32 aux[2] = { 0, ~0 }, prefetch, power; - if (read_cpuid_part_number() != ARM_CPU_PART_CORTEX_A9) + if (read_cpuid_part() != ARM_CPU_PART_CORTEX_A9) return -ENODEV; np = of_find_compatible_node(NULL, NULL, "rockchip,pl310-cache"); diff --git a/arch/arm/mach-rockchip/cpuidle.c b/arch/arm/mach-rockchip/cpuidle.c index d155b5c34506..14317d7d1bed 100644 --- a/arch/arm/mach-rockchip/cpuidle.c +++ b/arch/arm/mach-rockchip/cpuidle.c @@ -43,7 +43,7 @@ static int __init rockchip_ca9_cpuidle_init(void) if (!cpu_is_rockchip()) return -ENODEV; - if (read_cpuid_part_number() != ARM_CPU_PART_CORTEX_A9) + if (read_cpuid_part() != ARM_CPU_PART_CORTEX_A9) return -ENODEV; np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-gic"); if (!np) diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index e567c09ebc97..4004fa45909a 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/arch/arm/mach-rockchip/platsmp.c @@ -97,7 +97,7 @@ static int __init rockchip_smp_prepare_bootram(void) } /* set the boot function for the bootram code */ - if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9) + if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) rockchip_boot_fn = virt_to_phys(rockchip_a9_secondary_startup); else rockchip_boot_fn = virt_to_phys(secondary_startup);