diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-11 10:29:08 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-11 10:29:08 +0400 |
| commit | 812655e9c199c13cad206b40237463f861e3c5a6 (patch) | |
| tree | c213966f2d17b5becc76c8fca1c45db867ef6726 /arch/arm/mach-omap2/io.c | |
| parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
| parent | 2c65e7440d56b3b285d1c95563b4dcce8e40dea3 (diff) | |
| download | linux-812655e9c199c13cad206b40237463f861e3c5a6.tar.xz | |
Merge tag 'omap-cleanup-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2
Clean up to make it easier to add support for new SoCs.
Note that these have a merge dependency to omap-devel-hwmod-for-v3.5
branch for the Makefile changes.
By Paul Walmsley (37) and others
via Tony Lindgren
* tag 'omap-cleanup-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (55 commits)
GPMC: add ECC control definitions
ARM: OMAP2+: dmtimer: remove redundant sysconfig context restore
ARM: OMAP: AM35xx: convert 3517 detection/flags to AM35xx
ARM: OMAP: AM35xx: remove redunant cpu_is checks for AM3505
ARM: OMAP2+: dma: Define dma capabilities register bitfields and use them.
ARM: OMAP4: Reduce the static IO mapping
ARM: All OMAP2PLUS machines use omap2 directory so just add one entry
ARM: OMAP: dma: Make use of cpu_class_is_omap2() to avoid future patching.
ARM: OMAP4: Remove un-used WakeupGen register defines.
ARM: OMAP2+: Clean up wrapping multiple objects in Makefile
ARM: OMAP4: Don't compile cm2xxx_3xxx.c for OMAP4 only builds.
ARM: OMAP4: hwmod data: add DEBUGSS skeleton
ARM: OMAP4: hwmod data: add PRCM and related IP blocks
ARM: OMAP4: hwmod data: add System Control Module
ARM: OMAP4: hwmod data: add the OCP-WP IP block
ARM: OMAP4: hwmod data: add OCM RAM IP block
ARM: OMAP4: hwmod data: add remaining USB-related IP blocks
ARM: OMAP4: hwmod data: add some interconnect-related IP blocks
ARM: OMAP4: hwmod data: add McASP
ARM: OMAP4: hwmod data: add the Slimbus IP blocks
...
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 065bd768987c..595a5ddcad4b 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -215,41 +215,11 @@ static struct map_desc omap44xx_io_desc[] __initdata = { .type = MT_DEVICE, }, { - .virtual = OMAP44XX_GPMC_VIRT, - .pfn = __phys_to_pfn(OMAP44XX_GPMC_PHYS), - .length = OMAP44XX_GPMC_SIZE, - .type = MT_DEVICE, - }, - { - .virtual = OMAP44XX_EMIF1_VIRT, - .pfn = __phys_to_pfn(OMAP44XX_EMIF1_PHYS), - .length = OMAP44XX_EMIF1_SIZE, - .type = MT_DEVICE, - }, - { - .virtual = OMAP44XX_EMIF2_VIRT, - .pfn = __phys_to_pfn(OMAP44XX_EMIF2_PHYS), - .length = OMAP44XX_EMIF2_SIZE, - .type = MT_DEVICE, - }, - { - .virtual = OMAP44XX_DMM_VIRT, - .pfn = __phys_to_pfn(OMAP44XX_DMM_PHYS), - .length = OMAP44XX_DMM_SIZE, - .type = MT_DEVICE, - }, - { .virtual = L4_PER_44XX_VIRT, .pfn = __phys_to_pfn(L4_PER_44XX_PHYS), .length = L4_PER_44XX_SIZE, .type = MT_DEVICE, }, - { - .virtual = L4_EMU_44XX_VIRT, - .pfn = __phys_to_pfn(L4_EMU_44XX_PHYS), - .length = L4_EMU_44XX_SIZE, - .type = MT_DEVICE, - }, #ifdef CONFIG_OMAP4_ERRATA_I688 { .virtual = OMAP4_SRAM_VA, |