arm: rockchip: use read_cpuid_part instead of read_cpuid_part_number

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

diff --git a/arch/arm/mach-rockchip/common.c b/arch/arm/mach-rockchip/common.c
index 84f73659517958ecd07ebaba0970592c6d069c42..510e4da5bc745cb214680f9f036300dfe383ad45 100755 (executable)
--- 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 d155b5c34506ef7dad5c12b5eade4c8f1b862474..14317d7d1bed7fd209740353fa09bfcf7f088640 100644 (file)
--- 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 e567c09ebc978db4bac26e2df867108efecd9303..4004fa45909aa775289ec1e74445bfe2fac6af14 100644 (file)
--- 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);