diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-02-05 10:14:40 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-02-05 10:14:40 +0800 |
| commit | f662f52a91742f2aec738492eab87b937216d89f (patch) | |
| tree | 4950bc0dd10daf71849a5a3efbe0fb99b6184759 /arch/arm/mach-imx/cpu-imx5.c | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | 7356420cd34e40fe27bf26555b0bf3f2849a43dd (diff) | |
| download | linux-rt-f662f52a91742f2aec738492eab87b937216d89f.tar.gz | |
Merge tag 'imx-cleanup-3.9' into imx/soc
Diffstat (limited to 'arch/arm/mach-imx/cpu-imx5.c')
| -rw-r--r-- | arch/arm/mach-imx/cpu-imx5.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/arch/arm/mach-imx/cpu-imx5.c b/arch/arm/mach-imx/cpu-imx5.c index d88760014ff9..d7ce72252a4e 100644 --- a/arch/arm/mach-imx/cpu-imx5.c +++ b/arch/arm/mach-imx/cpu-imx5.c @@ -22,7 +22,6 @@ static int mx5_cpu_rev = -1; #define IIM_SREV 0x24 -#define MX50_HW_ADADIG_DIGPROG 0xB0 static int get_mx51_srev(void) { @@ -108,41 +107,3 @@ int mx53_revision(void) return mx5_cpu_rev; } EXPORT_SYMBOL(mx53_revision); - -static int get_mx50_srev(void) -{ - void __iomem *anatop = ioremap(MX50_ANATOP_BASE_ADDR, SZ_8K); - u32 rev; - - if (!anatop) { - mx5_cpu_rev = -EINVAL; - return 0; - } - - rev = readl(anatop + MX50_HW_ADADIG_DIGPROG); - rev &= 0xff; - - iounmap(anatop); - if (rev == 0x0) - return IMX_CHIP_REVISION_1_0; - else if (rev == 0x1) - return IMX_CHIP_REVISION_1_1; - return 0; -} - -/* - * Returns: - * the silicon revision of the cpu - * -EINVAL - not a mx50 - */ -int mx50_revision(void) -{ - if (!cpu_is_mx50()) - return -EINVAL; - - if (mx5_cpu_rev == -1) - mx5_cpu_rev = get_mx50_srev(); - - return mx5_cpu_rev; -} -EXPORT_SYMBOL(mx50_revision); |