From: Felipe Balbi <felipe.balbi@xxxxxxxxx>
Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
---
arch/arm/mach-omap1/id.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c
index 89bb875..dea9431 100644
--- a/arch/arm/mach-omap1/id.c
+++ b/arch/arm/mach-omap1/id.c
@@ -74,8 +74,8 @@ static u16 __init omap_get_jtag_id(void)
{
u32 prod_id, omap_id;
- prod_id = omap_readl(OMAP_PRODUCTION_ID_1);
- omap_id = omap_readl(OMAP32_ID_1);
+ prod_id = __raw_readl(OMAP_PRODUCTION_ID_1);
+ omap_id = __raw_readl(OMAP32_ID_1);
/* Check for unusable OMAP_PRODUCTION_ID_1 on 1611B/5912 and 730 */
if (((prod_id >> 20) == 0) || (prod_id == omap_id))
@@ -102,7 +102,7 @@ static u8 __init omap_get_die_rev(void)
{
u32 die_rev;
- die_rev = omap_readl(OMAP_DIE_ID_1);
+ die_rev = __raw_readl(OMAP_DIE_ID_1);
/* Check for broken OMAP_DIE_ID on early 1710 */
if (((die_rev >> 12) & 0xffff) == omap_get_jtag_id())
@@ -112,7 +112,7 @@ static u8 __init omap_get_die_rev(void)
if (die_rev)
return die_rev;
- die_rev = (omap_readl(OMAP32_ID_1) >> 28) & 0xf;
+ die_rev = (__raw_readl(OMAP32_ID_1) >> 28) & 0xf;
return die_rev;
}
@@ -127,25 +127,25 @@ void __init omap_check_revision(void)
jtag_id = omap_get_jtag_id();
die_rev = omap_get_die_rev();
- omap_id = omap_readl(OMAP32_ID_0);
+ omap_id = __raw_readl(OMAP32_ID_0);
#ifdef DEBUG
- printk(KERN_DEBUG "OMAP_DIE_ID_0: 0x%08x\n", omap_readl(OMAP_DIE_ID_0));
+ printk(KERN_DEBUG "OMAP_DIE_ID_0: 0x%08x\n", __raw_readl(OMAP_DIE_ID_0));
printk(KERN_DEBUG "OMAP_DIE_ID_1: 0x%08x DIE_REV: %i\n",
- omap_readl(OMAP_DIE_ID_1),
- (omap_readl(OMAP_DIE_ID_1) >> 17) & 0xf);
+ __raw_readl(OMAP_DIE_ID_1),
+ (__raw_readl(OMAP_DIE_ID_1) >> 17) & 0xf);
printk(KERN_DEBUG "OMAP_PRODUCTION_ID_0: 0x%08x\n",
- omap_readl(OMAP_PRODUCTION_ID_0));
+ __raw_readl(OMAP_PRODUCTION_ID_0));
printk(KERN_DEBUG "OMAP_PRODUCTION_ID_1: 0x%08x JTAG_ID: 0x%04x\n",
- omap_readl(OMAP_PRODUCTION_ID_1),
- omap_readl(OMAP_PRODUCTION_ID_1) & 0xffff);
- printk(KERN_DEBUG "OMAP32_ID_0: 0x%08x\n", omap_readl(OMAP32_ID_0));
- printk(KERN_DEBUG "OMAP32_ID_1: 0x%08x\n", omap_readl(OMAP32_ID_1));
+ __raw_readl(OMAP_PRODUCTION_ID_1),
+ __raw_readl(OMAP_PRODUCTION_ID_1) & 0xffff);
+ printk(KERN_DEBUG "OMAP32_ID_0: 0x%08x\n", __raw_readl(OMAP32_ID_0));
+ printk(KERN_DEBUG "OMAP32_ID_1: 0x%08x\n", __raw_readl(OMAP32_ID_1));
printk(KERN_DEBUG "JTAG_ID: 0x%04x DIE_REV: %i\n", jtag_id, die_rev);
#endif
- system_serial_high = omap_readl(OMAP_DIE_ID_0);
- system_serial_low = omap_readl(OMAP_DIE_ID_1);
+ system_serial_high = __raw_readl(OMAP_DIE_ID_0);
+ system_serial_low = __raw_readl(OMAP_DIE_ID_1);
/* First check only the major version in a safe way */
for (i = 0; i < ARRAY_SIZE(omap_ids); i++) {
--
1.6.0.2.307.gc427
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
