diff options
| author | S. Fricke <sfricke@data-modul.com> | 2013-06-04 15:07:57 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-05 08:51:52 +0200 |
| commit | e69ab77f794862bb3bc0fa807d7c9050228bb679 (patch) | |
| tree | 0c0d25abe8e61570c2563fbc4a7a7827df87482d /arch/arm/mach-imx/imx6.c | |
| parent | ebefdd4e0d4dde71cf4e7340de7c3a67a5dd36b5 (diff) | |
| download | barebox-e69ab77f794862bb3bc0fa807d7c9050228bb679.tar.gz barebox-e69ab77f794862bb3bc0fa807d7c9050228bb679.tar.xz | |
ARM i.MX6: set imx6 silicon revision
This is mainly a backport of the imx6_revision function of
arch/arm/mach-imx/mach-imx6q.c in the linux kernel sources.
Signed-off-by: S. Fricke <sfricke@data-modul.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/imx6.c')
| -rw-r--r-- | arch/arm/mach-imx/imx6.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx6.c b/arch/arm/mach-imx/imx6.c index 5c20aa1841..1d69ec8ca9 100644 --- a/arch/arm/mach-imx/imx6.c +++ b/arch/arm/mach-imx/imx6.c @@ -16,8 +16,11 @@ #include <io.h> #include <sizes.h> #include <mach/generic.h> +#include <mach/revision.h> #include <mach/imx6-regs.h> +#define SI_REV 0x260 + void imx6_init_lowlevel(void) { void __iomem *aips1 = (void *)MX6_AIPS1_ON_BASE_ADDR; @@ -55,8 +58,31 @@ void imx6_init_lowlevel(void) static int imx6_init(void) { + u32 rev; + u32 mx6_silicon_revision; + imx6_boot_save_loc((void *)MX6_SRC_BASE_ADDR); + rev = readl(MX6_ANATOP_BASE_ADDR + SI_REV); + switch (rev & 0xff) { + case 0x00: + mx6_silicon_revision = IMX_CHIP_REV_1_0; + break; + + case 0x01: + mx6_silicon_revision = IMX_CHIP_REV_1_1; + break; + + case 0x02: + mx6_silicon_revision = IMX_CHIP_REV_1_2; + break; + + default: + mx6_silicon_revision = IMX_CHIP_REV_UNKNOWN; + } + + imx_set_silicon_revision("i.MX6", mx6_silicon_revision); + if (of_get_root_node()) return 0; |