omap3: Use a define for reboot reason offset

This introduces a define for the offset to the reboot reason, rather than
hardcoding it.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/cpu/armv7/omap3/boot.c b/arch/arm/cpu/armv7/omap3/boot.c
index 259c210015e4355012f8284dbfe9dbfc0952f2db..64b242b752b2058d7d5b45effe4453f0907d25eb 100644 (file)
--- a/arch/arm/cpu/armv7/omap3/boot.c
+++ b/arch/arm/cpu/armv7/omap3/boot.c
@@ -65,7 +65,8 @@ int omap_reboot_mode(char *mode, unsigned int length)
        if (length < 2)
                return -1;
 
-       reboot_mode = readl((u32 *)(OMAP34XX_SCRATCHPAD + 4));
+       reboot_mode = readl((u32 *)(OMAP34XX_SCRATCHPAD +
+               OMAP_REBOOT_REASON_OFFSET));
 
        c = (reboot_mode >> 24) & 0xff;
        if (c != 'B')
@@ -85,7 +86,7 @@ int omap_reboot_mode(char *mode, unsigned int length)
 
 int omap_reboot_mode_clear(void)
 {
-       writel(0, (u32 *)(OMAP34XX_SCRATCHPAD + 4));
+       writel(0, (u32 *)(OMAP34XX_SCRATCHPAD + OMAP_REBOOT_REASON_OFFSET));
 
        return 0;
 }
@@ -96,7 +97,8 @@ int omap_reboot_mode_store(char *mode)
 
        reboot_mode = 'B' << 24 | 'M' << 16 | mode[0];
 
-       writel(reboot_mode, (u32 *)(OMAP34XX_SCRATCHPAD + 4));
+       writel(reboot_mode, (u32 *)(OMAP34XX_SCRATCHPAD +
+               OMAP_REBOOT_REASON_OFFSET));
 
        return 0;
 }

diff --git a/arch/arm/include/asm/arch-omap3/omap.h b/arch/arm/include/asm/arch-omap3/omap.h
index 4044b8d72582ac22d327c765b6168a0af7894062..bc0e02a200cb35658f767191f7e26f9a71ac3a32 100644 (file)
--- a/arch/arm/include/asm/arch-omap3/omap.h
+++ b/arch/arm/include/asm/arch-omap3/omap.h
@@ -249,6 +249,8 @@ struct gpio {
 /* ABB tranxdone mask */
 #define OMAP_ABB_MPU_TXDONE_MASK       (0x1 << 26)
 
+#define OMAP_REBOOT_REASON_OFFSET      0x04
+
 /* Boot parameters */
 #ifndef __ASSEMBLY__
 struct omap_boot_parameters {