forked from luck/tmp_suning_uos_patched
ARM: OMAP5: id: Add cpu id for ES versions
Adding the OMAP5 ES1.0, 2.0 and OMAP5432 cpu revision detection support. Signed-off-by: R Sricharan <r.sricharan@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
This commit is contained in:
R Sricharan
Santosh Shilimkar
parent
b009366f28
commit
b13e80a8bf
|
|
@ -253,6 +253,10 @@
|
|||
/* TI81XX CONTROL_DEVCONF register offsets */
|
||||
#define TI81XX_CONTROL_DEVICE_ID (TI81XX_CONTROL_DEVCONF + 0x000)
|
||||
|
||||
/* OMAP54XX CONTROL STATUS register */
|
||||
#define OMAP5XXX_CONTROL_STATUS 0x134
|
||||
#define OMAP5_DEVICETYPE_MASK (0x7 << 6)
|
||||
|
||||
/*
|
||||
* REVISIT: This list of registers is not comprehensive - there are more
|
||||
* that should be added.
|
||||
|
|
|
|||
|
|
@ -50,6 +50,11 @@ int omap_type(void)
|
|||
val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
|
||||
} else if (cpu_is_omap44xx()) {
|
||||
val = omap_ctrl_readl(OMAP4_CTRL_MODULE_CORE_STATUS);
|
||||
} else if (soc_is_omap54xx()) {
|
||||
val = omap_ctrl_readl(OMAP5XXX_CONTROL_STATUS);
|
||||
val &= OMAP5_DEVICETYPE_MASK;
|
||||
val >>= 6;
|
||||
goto out;
|
||||
} else {
|
||||
pr_err("Cannot detect omap type!\n");
|
||||
goto out;
|
||||
|
|
@ -100,7 +105,7 @@ static u16 tap_prod_id;
|
|||
|
||||
void omap_get_die_id(struct omap_die_id *odi)
|
||||
{
|
||||
if (cpu_is_omap44xx()) {
|
||||
if (cpu_is_omap44xx() || soc_is_omap54xx()) {
|
||||
odi->id_0 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_0);
|
||||
odi->id_1 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_1);
|
||||
odi->id_2 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_2);
|
||||
|
|
@ -513,6 +518,41 @@ void __init omap4xxx_check_revision(void)
|
|||
((omap_rev() >> 12) & 0xf), ((omap_rev() >> 8) & 0xf));
|
||||
}
|
||||
|
||||
void __init omap5xxx_check_revision(void)
|
||||
{
|
||||
u32 idcode;
|
||||
u16 hawkeye;
|
||||
u8 rev;
|
||||
|
||||
idcode = read_tap_reg(OMAP_TAP_IDCODE);
|
||||
hawkeye = (idcode >> 12) & 0xffff;
|
||||
rev = (idcode >> 28) & 0xff;
|
||||
switch (hawkeye) {
|
||||
case 0xb942:
|
||||
switch (rev) {
|
||||
case 0:
|
||||
default:
|
||||
omap_revision = OMAP5430_REV_ES1_0;
|
||||
}
|
||||
break;
|
||||
|
||||
case 0xb998:
|
||||
switch (rev) {
|
||||
case 0:
|
||||
default:
|
||||
omap_revision = OMAP5432_REV_ES1_0;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
/* Unknown default to latest silicon rev as default*/
|
||||
omap_revision = OMAP5430_REV_ES1_0;
|
||||
}
|
||||
|
||||
pr_info("OMAP%04x ES%d.0\n",
|
||||
omap_rev() >> 16, ((omap_rev() >> 12) & 0xf));
|
||||
}
|
||||
|
||||
/*
|
||||
* Set up things for map_io and processor detection later on. Gets called
|
||||
* pretty much first thing from board init. For multi-omap, this gets
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
*
|
||||
* Written by Tony Lindgren <tony.lindgren@nokia.com>
|
||||
*
|
||||
* Added OMAP4 specific defines - Santosh Shilimkar<santosh.shilimkar@ti.com>
|
||||
* Added OMAP4/5 specific defines - Santosh Shilimkar<santosh.shilimkar@ti.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -70,6 +70,7 @@ unsigned int omap_rev(void);
|
|||
* cpu_is_omap443x(): True for OMAP4430
|
||||
* cpu_is_omap446x(): True for OMAP4460
|
||||
* cpu_is_omap447x(): True for OMAP4470
|
||||
* soc_is_omap543x(): True for OMAP5430, OMAP5432
|
||||
*/
|
||||
#define GET_OMAP_CLASS (omap_rev() & 0xff)
|
||||
|
||||
|
|
@ -122,6 +123,7 @@ IS_OMAP_CLASS(24xx, 0x24)
|
|||
IS_OMAP_CLASS(34xx, 0x34)
|
||||
IS_OMAP_CLASS(44xx, 0x44)
|
||||
IS_AM_CLASS(35xx, 0x35)
|
||||
IS_OMAP_CLASS(54xx, 0x54)
|
||||
IS_AM_CLASS(33xx, 0x33)
|
||||
|
||||
IS_TI_CLASS(81xx, 0x81)
|
||||
|
|
@ -133,6 +135,7 @@ IS_OMAP_SUBCLASS(363x, 0x363)
|
|||
IS_OMAP_SUBCLASS(443x, 0x443)
|
||||
IS_OMAP_SUBCLASS(446x, 0x446)
|
||||
IS_OMAP_SUBCLASS(447x, 0x447)
|
||||
IS_OMAP_SUBCLASS(543x, 0x543)
|
||||
|
||||
IS_TI_SUBCLASS(816x, 0x816)
|
||||
IS_TI_SUBCLASS(814x, 0x814)
|
||||
|
|
@ -156,6 +159,8 @@ IS_AM_SUBCLASS(335x, 0x335)
|
|||
#define cpu_is_omap443x() 0
|
||||
#define cpu_is_omap446x() 0
|
||||
#define cpu_is_omap447x() 0
|
||||
#define soc_is_omap54xx() 0
|
||||
#define soc_is_omap543x() 0
|
||||
|
||||
#if defined(MULTI_OMAP1)
|
||||
# if defined(CONFIG_ARCH_OMAP730)
|
||||
|
|
@ -291,6 +296,7 @@ IS_OMAP_TYPE(3430, 0x3430)
|
|||
#define cpu_is_omap2430() 0
|
||||
#define cpu_is_omap3430() 0
|
||||
#define cpu_is_omap3630() 0
|
||||
#define soc_is_omap5430() 0
|
||||
|
||||
/*
|
||||
* Whether we have MULTI_OMAP1 or not, we still need to distinguish
|
||||
|
|
@ -371,11 +377,18 @@ IS_OMAP_TYPE(3430, 0x3430)
|
|||
# define cpu_is_omap447x() is_omap447x()
|
||||
# endif
|
||||
|
||||
# if defined(CONFIG_SOC_OMAP5)
|
||||
# undef soc_is_omap54xx
|
||||
# undef soc_is_omap543x
|
||||
# define soc_is_omap54xx() is_omap54xx()
|
||||
# define soc_is_omap543x() is_omap543x()
|
||||
#endif
|
||||
|
||||
/* Macros to detect if we have OMAP1 or OMAP2 */
|
||||
#define cpu_class_is_omap1() (cpu_is_omap7xx() || cpu_is_omap15xx() || \
|
||||
cpu_is_omap16xx())
|
||||
#define cpu_class_is_omap2() (cpu_is_omap24xx() || cpu_is_omap34xx() || \
|
||||
cpu_is_omap44xx())
|
||||
cpu_is_omap44xx() || soc_is_omap54xx())
|
||||
|
||||
/* Various silicon revisions for omap2 */
|
||||
#define OMAP242X_CLASS 0x24200024
|
||||
|
|
@ -428,9 +441,14 @@ IS_OMAP_TYPE(3430, 0x3430)
|
|||
#define OMAP447X_CLASS 0x44700044
|
||||
#define OMAP4470_REV_ES1_0 (OMAP447X_CLASS | (0x10 << 8))
|
||||
|
||||
#define OMAP54XX_CLASS 0x54000054
|
||||
#define OMAP5430_REV_ES1_0 (OMAP54XX_CLASS | (0x30 << 16) | (0x10 << 8))
|
||||
#define OMAP5432_REV_ES1_0 (OMAP54XX_CLASS | (0x32 << 16) | (0x10 << 8))
|
||||
|
||||
void omap2xxx_check_revision(void);
|
||||
void omap3xxx_check_revision(void);
|
||||
void omap4xxx_check_revision(void);
|
||||
void omap5xxx_check_revision(void);
|
||||
void omap3xxx_check_features(void);
|
||||
void ti81xx_check_features(void);
|
||||
void omap4xxx_check_features(void);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user