Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc

* 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
  ARM: mach-mxs: fix machines' initializers order
  mmc: mxcmmc: explicitly includes mach/hardware.h
  arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
  arm/imx: remove mx27_setup_weimcs() from mx27.h
  arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
  arm/imx: remove mx31_setup_weimcs() from mx31.h
  ARM: tegra: devices.c should include devices.h
  ARM: tegra: cpu-tegra: unexport two functions
  ARM: tegra: cpu-tegra: sparse type fix
  ARM: tegra: dma: staticify some tables and functions
  ARM: tegra: tegra2_clocks: don't export some tables
  ARM: tegra: tegra_powergate_is_powered should be static
  ARM: tegra: tegra_rtc_read_ms should be static
  ARM: tegra: tegra_init_cache should be static
  ARM: tegra: pcie: 0 -> NULL changes
  ARM: tegra: pcie: include board.h
  ARM: tegra: pcie: don't cast __iomem pointers
  ARM: tegra: tegra2_clocks: 0 -> NULL changes
  ARM: tegra: tegra2_clocks: don't cast __iomem pointers
  ARM: tegra: timer: don't cast __iomem pointers
  ...

Fix up trivial conflicts in
  arch/arm/mach-omap2/Makefile,
  arch/arm/mach-u300/{Makefile.boot,core.c}
  arch/arm/plat-{mxc,omap}/devices.c

5 files changed, 6 insertions, 176 deletions

diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index d6e5d306557b..1cbcd4fc1e17 100644
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -51,39 +51,12 @@ config MACH_U300_BS365
 
 endchoice
 
-choice
-        prompt "Memory configuration"
-        default MACH_U300_SINGLE_RAM
-        ---help---
-        You have to config the kernel according to the physical memory
-        configuration.
-
-config MACH_U300_SINGLE_RAM
-        bool "Single RAM"
-        help
-                Select this if you want support for Single RAM phones.
-
-config MACH_U300_DUAL_RAM
-        bool "Dual RAM"
-        help
-                Select this if you want support for Dual RAM phones.
-                This is two RAM memories on different EMIFs.
-endchoice
-
 config U300_DEBUG
         bool "Debug support for U300"
         depends on PM
         help
                 Debug support for U300 in sysfs, procfs etc.
 
-config MACH_U300_SEMI_IS_SHARED
-        bool "The SEMI is used by both the access and application side"
-        depends on MACH_U300
-        help
-                This makes it possible to use the SEMI (Shared External
-                Memory Interface) from both from access and application
-                side.
-
 config MACH_U300_SPIDUMMY
         bool "SSP/SPI dummy chip"
         select SPI
@@ -96,25 +69,6 @@ config MACH_U300_SPIDUMMY
                 you don't need it. Selecting this will activate the
                 SPI framework and ARM PL022 support.
 
-comment "All the settings below must match the bootloader's settings"
-
-config MACH_U300_ACCESS_MEM_SIZE
-       int "Access CPU memory allocation"
-       range 7 25
-       depends on MACH_U300_SINGLE_RAM
-       default 13
-       help
-                How much memory in MiB that the Access side CPU has allocated
-
-config MACH_U300_2MB_ALIGNMENT_FIX
-       bool "2MiB alignment fix"
-       depends on MACH_U300_SINGLE_RAM
-       default y
-       help
-                If yes and the Access side CPU has allocated an odd size in
-                MiB, this fix gives you one MiB extra that would otherwise be
-                lost due to Linux 2 MiB alignment policy.
-
 endmenu
 
 endif
diff --git a/arch/arm/mach-u300/Makefile.boot b/arch/arm/mach-u300/Makefile.boot
index 69357affbd77..87811de0bd94 100644
--- a/arch/arm/mach-u300/Makefile.boot
+++ b/arch/arm/mach-u300/Makefile.boot
@@ -1,15 +1,4 @@
-# Note: the following conditions must always be true:
-#   ZRELADDR == virt_to_phys(TEXTADDR)
-#   PARAMS_PHYS must be within 4MB of ZRELADDR
-#   INITRD_PHYS must be in RAM
-
-ifdef CONFIG_MACH_U300_SINGLE_RAM
-     zreladdr-y += 0x28E08000
-  params_phys-y := 0x28E00100
-else
-     zreladdr-y += 0x48008000
-  params_phys-y := 0x48000100
-endif
-
+   zreladdr-y   += 0x48008000
+params_phys-y   := 0x48000100
 # This isn't used.
-#initrd_phys-y  := 0x29800000
+#initrd_phys-y  := 0x48800000
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index f4ad6d2e26f3..ac0791e924bc 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -72,25 +72,6 @@ static struct map_desc u300_io_desc[] __initdata = {
                 .length         = SZ_32K,
                 .type           = MT_DEVICE,
         },
-        {
-                .virtual        = 0xffff2000, /* TCM memory */
-                .pfn            = __phys_to_pfn(0xffff2000),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        },
-
-        /*
-         * This overlaps with the IRQ vectors etc at 0xffff0000, so these
-         * may have to be moved to 0x00000000 in order to use the ROM.
-         */
-        /*
-        {
-                .virtual        = U300_BOOTROM_VIRT_BASE,
-                .pfn            = __phys_to_pfn(U300_BOOTROM_PHYS_BASE),
-                .length         = SZ_64K,
-                .type           = MT_ROM,
-        },
-        */
 };
 
 void __init u300_map_io(void)
@@ -367,51 +348,6 @@ static struct resource wdog_resources[] = {
         }
 };
 
-/* TODO: These should be protected by suitable #ifdef's */
-static struct resource ave_resources[] = {
-        {
-                .name  = "AVE3e I/O Area",
-                .start = U300_VIDEOENC_BASE,
-                .end   = U300_VIDEOENC_BASE + SZ_512K - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name  = "AVE3e IRQ0",
-                .start = IRQ_U300_VIDEO_ENC_0,
-                .end   = IRQ_U300_VIDEO_ENC_0,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name  = "AVE3e IRQ1",
-                .start = IRQ_U300_VIDEO_ENC_1,
-                .end   = IRQ_U300_VIDEO_ENC_1,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name  = "AVE3e Physmem Area",
-                .start = 0, /* 0 will be remapped to reserved memory */
-                .end   = SZ_1M - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        /*
-         * The AVE3e requires two regions of 256MB that it considers
-         * "invisible". The hardware will not be able to access these
-         * addresses, so they should never point to system RAM.
-         */
-        {
-                .name  = "AVE3e Reserved 0",
-                .start = 0xd0000000,
-                .end   = 0xd0000000 + SZ_256M - 1,
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name  = "AVE3e Reserved 1",
-                .start = 0xe0000000,
-                .end   = 0xe0000000 + SZ_256M - 1,
-                .flags = IORESOURCE_MEM,
-        },
-};
-
 static struct resource dma_resource[] = {
         {
                 .start = U300_DMAC_BASE,
@@ -1650,13 +1586,6 @@ static struct platform_device nand_device = {
         },
 };
 
-static struct platform_device ave_device = {
-        .name = "video_enc",
-        .id = -1,
-        .num_resources = ARRAY_SIZE(ave_resources),
-        .resource = ave_resources,
-};
-
 static struct platform_device dma_device = {
         .name           = "coh901318",
         .id             = -1,
@@ -1747,7 +1676,6 @@ static struct platform_device *platform_devs[] __initdata = {
         &gpio_device,
         &nand_device,
         &wdog_device,
-        &ave_device,
         &pinmux_device,
 };
 
@@ -1945,17 +1873,10 @@ void __init u300_init_devices(void)
         /* Register subdevices on the SPI bus */
         u300_spi_register_board_devices();
 
-#ifndef CONFIG_MACH_U300_SEMI_IS_SHARED
-        /*
-         * Enable SEMI self refresh. Self-refresh of the SDRAM is entered when
-         * both subsystems are requesting this mode.
-         * If we not share the Acc SDRAM, this is never the case. Therefore
-         * enable it here from the App side.
-         */
+        /* Enable SEMI self refresh */
         val = readw(U300_SYSCON_VBASE + U300_SYSCON_SMCR) |
                 U300_SYSCON_SMCR_SEMI_SREFREQ_ENABLE;
         writew(val, U300_SYSCON_VBASE + U300_SYSCON_SMCR);
-#endif /* CONFIG_MACH_U300_SEMI_IS_SHARED */
 }
 
 static int core_module_init(void)
diff --git a/arch/arm/mach-u300/include/mach/memory.h b/arch/arm/mach-u300/include/mach/memory.h
index 7034bae95de6..c808f347a081 100644
--- a/arch/arm/mach-u300/include/mach/memory.h
+++ b/arch/arm/mach-u300/include/mach/memory.h
@@ -13,25 +13,7 @@
 #ifndef __MACH_MEMORY_H
 #define __MACH_MEMORY_H
 
-#ifdef CONFIG_MACH_U300_DUAL_RAM
-
-#define PLAT_PHYS_OFFSET                UL(0x48000000)
-#define BOOT_PARAMS_OFFSET              0x100
-
-#else
-
-#ifdef CONFIG_MACH_U300_2MB_ALIGNMENT_FIX
-#define PLAT_PHYS_OFFSET (0x28000000 + \
-             (CONFIG_MACH_U300_ACCESS_MEM_SIZE - \
-             (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)
-#define BOOT_PARAMS_OFFSET (0x100 + \
-             (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1)*1024*1024*2)
-#else
-#define PLAT_PHYS_OFFSET (0x28000000 + \
-             (CONFIG_MACH_U300_ACCESS_MEM_SIZE +        \
-             (CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1))*1024*1024)
-#define BOOT_PARAMS_OFFSET 0x100
-#endif
-#endif
+#define PLAT_PHYS_OFFSET        UL(0x48000000)
+#define BOOT_PARAMS_OFFSET      0x100
 
 #endif
diff --git a/arch/arm/mach-u300/u300.c b/arch/arm/mach-u300/u300.c
index 80e7305589c6..89422ee7f3a8 100644
--- a/arch/arm/mach-u300/u300.c
+++ b/arch/arm/mach-u300/u300.c
@@ -23,21 +23,6 @@
 #include <asm/mach/arch.h>
 #include <asm/memory.h>
 
-static void __init u300_reserve(void)
-{
-        /*
-         * U300 - This platform family can share physical memory
-         * between two ARM cpus, one running Linux and the other
-         * running another OS.
-         */
-#ifdef CONFIG_MACH_U300_SINGLE_RAM
-#if ((CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1) == 1) && \
-        CONFIG_MACH_U300_2MB_ALIGNMENT_FIX
-        memblock_reserve(PHYS_OFFSET, 0x00100000);
-#endif
-#endif
-}
-
 static void __init u300_init_machine(void)
 {
         u300_init_devices();
@@ -63,7 +48,6 @@ MACHINE_START(U300, MACH_U300_STRING)
         /* Maintainer: Linus Walleij <linus.walleij@stericsson.com> */
         .atag_offset    = BOOT_PARAMS_OFFSET,
         .map_io         = u300_map_io,
-        .reserve        = u300_reserve,
         .init_irq       = u300_init_irq,
         .timer          = &u300_timer,
         .init_machine   = u300_init_machine,