eaed435a7b
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPFmj/AAoJEIwa5zzehBx3utoP/2JKstlluwVdoIjzLDwJIZWS BiFO90iC6knKHb3c4ZXBNtD4yz8ImFGr2v3IY4pR+feECu+zS/AYeynrr4AjlaRj 2wHI3/Cl2VktlzUR0k1KqfNrt1HLpZ8myxJ/pKchU8+KnxeQwCdV7MzkxocO0Abs BQFhXj2WuS6b+H3kObrTy7n3tIyVeGUOW/bPU9TfWeRYEWBpGlqtPOH6A2cGi5e3 Iu9d9MPAiMt33+e7wZdmVHFky+ueqqeKevev+Vt8/JSJbPO7EseS/sbTOZH7Q1Yc BWe5iARFpV9viJJMlwlO+wJ08BrqzCZ6M/mBITMAZ+a/EMYRn0TwibsWDw1GcAsA H04Z1TW7pjni7SNFJavW3YWIR3TAKDZqwWbekGl2RzYqKmer1Hk6gwHAhxDQlMGY 2S7dSnw97zRA0WxW6kMPw5VY9VpDD1qjW+29UpEEePfAVhKkwE+lKYlX4k/l0ElC 9iYNoMVlhS4d5A7ZvhNU28XyGoxzAPNA4nC5OMUARZN++oSURDJ1kGNc73WQ8IbG x+zZ7AFvt7y8OgZqG4bE+SeiHlYVAjtyV08WLxtDx4vTyNYuiWIXguf2hLJWEJPY sqPGFHrMeh9YvYOXaa+DFb0fPkBJVJt663FPZ4TG2UBlphi26Ax5FtcnSBBvY4QV CCen+xhdxX/dp83A/A0k =ZgSs -----END PGP SIGNATURE----- Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree. * tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM i.MX: Update defconfig ARM i.MX: Merge i.MX5 support into mach-imx ARM i.MX5: remove unnecessary includes from board files Fix up fairly trivial conflicts due to various changes nearby in arch/arm/{mach,plat}-imx/{Kconfig,Makefile} Pull request had been sent to the wrong email address, but happened before the merge window closed. I'm merging the MX 5 consolidation, since it apparently will help the next development window and will avoid conflicts later as per Arnd.
188 lines
3.7 KiB
C
188 lines
3.7 KiB
C
/*
|
|
* Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
|
|
*
|
|
* The code contained herein is licensed under the GNU General Public
|
|
* License. You may obtain a copy of the GNU General Public License
|
|
* Version 2 or later at the following locations:
|
|
*
|
|
* http://www.opensource.org/licenses/gpl-license.html
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*
|
|
* This file contains the CPU initialization code.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <mach/hardware.h>
|
|
#include <linux/io.h>
|
|
|
|
static int mx5_cpu_rev = -1;
|
|
|
|
#define IIM_SREV 0x24
|
|
#define MX50_HW_ADADIG_DIGPROG 0xB0
|
|
|
|
static int get_mx51_srev(void)
|
|
{
|
|
void __iomem *iim_base = MX51_IO_ADDRESS(MX51_IIM_BASE_ADDR);
|
|
u32 rev = readl(iim_base + IIM_SREV) & 0xff;
|
|
|
|
switch (rev) {
|
|
case 0x0:
|
|
return IMX_CHIP_REVISION_2_0;
|
|
case 0x10:
|
|
return IMX_CHIP_REVISION_3_0;
|
|
default:
|
|
return IMX_CHIP_REVISION_UNKNOWN;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Returns:
|
|
* the silicon revision of the cpu
|
|
* -EINVAL - not a mx51
|
|
*/
|
|
int mx51_revision(void)
|
|
{
|
|
if (!cpu_is_mx51())
|
|
return -EINVAL;
|
|
|
|
if (mx5_cpu_rev == -1)
|
|
mx5_cpu_rev = get_mx51_srev();
|
|
|
|
return mx5_cpu_rev;
|
|
}
|
|
EXPORT_SYMBOL(mx51_revision);
|
|
|
|
#ifdef CONFIG_NEON
|
|
|
|
/*
|
|
* All versions of the silicon before Rev. 3 have broken NEON implementations.
|
|
* Dependent on link order - so the assumption is that vfp_init is called
|
|
* before us.
|
|
*/
|
|
static int __init mx51_neon_fixup(void)
|
|
{
|
|
if (!cpu_is_mx51())
|
|
return 0;
|
|
|
|
if (mx51_revision() < IMX_CHIP_REVISION_3_0 &&
|
|
(elf_hwcap & HWCAP_NEON)) {
|
|
elf_hwcap &= ~HWCAP_NEON;
|
|
pr_info("Turning off NEON support, detected broken NEON implementation\n");
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
late_initcall(mx51_neon_fixup);
|
|
#endif
|
|
|
|
static int get_mx53_srev(void)
|
|
{
|
|
void __iomem *iim_base = MX51_IO_ADDRESS(MX53_IIM_BASE_ADDR);
|
|
u32 rev = readl(iim_base + IIM_SREV) & 0xff;
|
|
|
|
switch (rev) {
|
|
case 0x0:
|
|
return IMX_CHIP_REVISION_1_0;
|
|
case 0x2:
|
|
return IMX_CHIP_REVISION_2_0;
|
|
case 0x3:
|
|
return IMX_CHIP_REVISION_2_1;
|
|
default:
|
|
return IMX_CHIP_REVISION_UNKNOWN;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Returns:
|
|
* the silicon revision of the cpu
|
|
* -EINVAL - not a mx53
|
|
*/
|
|
int mx53_revision(void)
|
|
{
|
|
if (!cpu_is_mx53())
|
|
return -EINVAL;
|
|
|
|
if (mx5_cpu_rev == -1)
|
|
mx5_cpu_rev = get_mx53_srev();
|
|
|
|
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);
|
|
|
|
static int __init post_cpu_init(void)
|
|
{
|
|
unsigned int reg;
|
|
void __iomem *base;
|
|
|
|
if (cpu_is_mx51() || cpu_is_mx53()) {
|
|
if (cpu_is_mx51())
|
|
base = MX51_IO_ADDRESS(MX51_AIPS1_BASE_ADDR);
|
|
else
|
|
base = MX53_IO_ADDRESS(MX53_AIPS1_BASE_ADDR);
|
|
|
|
__raw_writel(0x0, base + 0x40);
|
|
__raw_writel(0x0, base + 0x44);
|
|
__raw_writel(0x0, base + 0x48);
|
|
__raw_writel(0x0, base + 0x4C);
|
|
reg = __raw_readl(base + 0x50) & 0x00FFFFFF;
|
|
__raw_writel(reg, base + 0x50);
|
|
|
|
if (cpu_is_mx51())
|
|
base = MX51_IO_ADDRESS(MX51_AIPS2_BASE_ADDR);
|
|
else
|
|
base = MX53_IO_ADDRESS(MX53_AIPS2_BASE_ADDR);
|
|
|
|
__raw_writel(0x0, base + 0x40);
|
|
__raw_writel(0x0, base + 0x44);
|
|
__raw_writel(0x0, base + 0x48);
|
|
__raw_writel(0x0, base + 0x4C);
|
|
reg = __raw_readl(base + 0x50) & 0x00FFFFFF;
|
|
__raw_writel(reg, base + 0x50);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
postcore_initcall(post_cpu_init);
|