diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-14 11:22:22 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-14 11:22:22 -0700 |
| commit | 05f689400ea5fa3d71af82f910c8b140f87ad1f3 (patch) | |
| tree | 39fa8ddb5163661361dbc5b2ab11f4e331492ead /arch/arm/mach-omap2/id.c | |
| parent | 17fe12c5a7bd674c1e6dca9cf1e250f9cd7b96b1 (diff) | |
| parent | 02b7b94ee98a0a463195d148e5c5885a218ee16f (diff) | |
| download | talos-op-linux-05f689400ea5fa3d71af82f910c8b140f87ad1f3.tar.gz talos-op-linux-05f689400ea5fa3d71af82f910c8b140f87ad1f3.zip | |
Merge branches 'devel-mux' and 'devel-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 3168b17bc264..2537090aa33a 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -84,6 +84,11 @@ EXPORT_SYMBOL(omap_type); #define OMAP_TAP_DIE_ID_2 0x0220 #define OMAP_TAP_DIE_ID_3 0x0224 +#define OMAP_TAP_DIE_ID_44XX_0 0x0200 +#define OMAP_TAP_DIE_ID_44XX_1 0x0208 +#define OMAP_TAP_DIE_ID_44XX_2 0x020c +#define OMAP_TAP_DIE_ID_44XX_3 0x0210 + #define read_tap_reg(reg) __raw_readl(tap_base + (reg)) struct omap_id { @@ -107,6 +112,14 @@ static u16 tap_prod_id; void omap_get_die_id(struct omap_die_id *odi) { + if (cpu_is_omap44xx()) { + 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); + odi->id_3 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_3); + + return; + } odi->id_0 = read_tap_reg(OMAP_TAP_DIE_ID_0); odi->id_1 = read_tap_reg(OMAP_TAP_DIE_ID_1); odi->id_2 = read_tap_reg(OMAP_TAP_DIE_ID_2); |
