diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
| commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
| tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /include/asm-arm/arch-omap/memory.h | |
| parent | 2fcf522509cceea524b6e7ece8fd6759b682175a (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-arm/arch-omap/memory.h')
| -rw-r--r-- | include/asm-arm/arch-omap/memory.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/asm-arm/arch-omap/memory.h b/include/asm-arm/arch-omap/memory.h index f6b57dd846a3..84f81e315a25 100644 --- a/include/asm-arm/arch-omap/memory.h +++ b/include/asm-arm/arch-omap/memory.h | |||
| @@ -36,12 +36,11 @@ | |||
| 36 | /* | 36 | /* |
| 37 | * Physical DRAM offset. | 37 | * Physical DRAM offset. |
| 38 | */ | 38 | */ |
| 39 | #if defined(CONFIG_ARCH_OMAP1) | ||
| 39 | #define PHYS_OFFSET (0x10000000UL) | 40 | #define PHYS_OFFSET (0x10000000UL) |
| 40 | 41 | #elif defined(CONFIG_ARCH_OMAP2) | |
| 41 | /* | 42 | #define PHYS_OFFSET (0x80000000UL) |
| 42 | * OMAP-1510 Local Bus address offset | 43 | #endif |
| 43 | */ | ||
| 44 | #define OMAP1510_LB_OFFSET (0x30000000UL) | ||
| 45 | 44 | ||
| 46 | /* | 45 | /* |
| 47 | * Conversion between SDRAM and fake PCI bus, used by USB | 46 | * Conversion between SDRAM and fake PCI bus, used by USB |
| @@ -64,6 +63,11 @@ | |||
| 64 | */ | 63 | */ |
| 65 | #ifdef CONFIG_ARCH_OMAP1510 | 64 | #ifdef CONFIG_ARCH_OMAP1510 |
| 66 | 65 | ||
| 66 | /* | ||
| 67 | * OMAP-1510 Local Bus address offset | ||
| 68 | */ | ||
| 69 | #define OMAP1510_LB_OFFSET (0x30000000UL) | ||
| 70 | |||
| 67 | #define virt_to_lbus(x) ((x) - PAGE_OFFSET + OMAP1510_LB_OFFSET) | 71 | #define virt_to_lbus(x) ((x) - PAGE_OFFSET + OMAP1510_LB_OFFSET) |
| 68 | #define lbus_to_virt(x) ((x) - OMAP1510_LB_OFFSET + PAGE_OFFSET) | 72 | #define lbus_to_virt(x) ((x) - OMAP1510_LB_OFFSET + PAGE_OFFSET) |
| 69 | #define is_lbus_device(dev) (cpu_is_omap1510() && dev && (strncmp(dev->bus_id, "ohci", 4) == 0)) | 73 | #define is_lbus_device(dev) (cpu_is_omap1510() && dev && (strncmp(dev->bus_id, "ohci", 4) == 0)) |