diff options
Diffstat (limited to 'arch/arm/mach-imx/hardware.h')
| -rw-r--r-- | arch/arm/mach-imx/hardware.h | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/arch/arm/mach-imx/hardware.h b/arch/arm/mach-imx/hardware.h index 89dc771baadf..378fa846bf99 100644 --- a/arch/arm/mach-imx/hardware.h +++ b/arch/arm/mach-imx/hardware.h @@ -89,27 +89,21 @@ * AIPS1 0x53f00000+0x100000 -> 0xf5700000+0x100000 * AIPS2 0x63f00000+0x100000 -> 0xf5300000+0x100000 * mx6q: - * SCU 0x00a00000+0x004000 -> 0xf4000000+0x004000 + * OCRAMS 0x008f8000+0x004000 -> 0xf48f8000+0x004000 + * IRAM 0x00900000+0x040000 -> 0xf4900000+0x040000 + * SCU 0x00a00000+0x004000 -> 0xf4a00000+0x004000 + * AIPS1 0x02000000+0x100000 -> 0xf4200000+0x100000 + * AIPS2 0x02100000+0x100000 -> 0xf4300000+0x100000 * CCM 0x020c4000+0x004000 -> 0xf42c4000+0x004000 * ANATOP 0x020c8000+0x004000 -> 0xf42c8000+0x004000 - * UART4 0x021f0000+0x004000 -> 0xf42f0000+0x004000 + * UART4 0x021f0000+0x004000 -> 0xf43f0000+0x004000 */ - #if defined(CONFIG_SOC_IMX6Q) || defined(CONFIG_SOC_IMX6SL) #define IMX_IO_P2V(x) ( \ - (((x) & 0x80000000) >> 7) | \ (0xf4000000 + \ - (((x) & 0x50000000) >> 6) + \ - (((x) & 0x0b000000) >> 4) + \ - (((x) & 0x00100000) << 5) + \ - (((x) & 0x000fffff)))) -#else -#define IMX_IO_P2V(x) ( \ - (((x) & 0x80000000) >> 7) | \ - (0xf4000000 + \ - (((x) & 0x50000000) >> 6) + \ - (((x) & 0x0b000000) >> 4) + \ - (((x) & 0x000fffff)))) -#endif + (((x) & 0x50000000) >> 4) + \ + (((x) & 0x0a000000) >> 4) + \ + (((x) & 0x00ffffff)))) + #define IMX_IO_ADDRESS(x) IOMEM(IMX_IO_P2V(x)) |