From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 23 May 2011 17:05:10 +0000 (+0100)
Subject: Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic',... 
X-Git-Tag: v3.0-rc1~328^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=4b60e5f90dec4ae251386f20464336369e962e9c

Merge branches 'consolidate-clksrc', 'consolidate-flash', 'consolidate-generic', 'consolidate-smp', 'consolidate-stmp' and 'consolidate-zones' into consolidate
---

4b60e5f90dec4ae251386f20464336369e962e9c
diff --cc arch/arm/Kconfig
index 903c9c4bd68e,377a7a595b08,5b9f78b570e8,5b9f78b570e8,c9f69e0b1f55,5b9f78b570e8..9dd61014864b
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@@ -381,19 -378,18 -378,18 -378,18 -378,8 -378,18 +381,9 @@@@@@@ config ARCH_MX
      	help
      	  Support for Freescale MXS-based family of processors
      
---- -config ARCH_STMP3XXX
---- -	bool "Freescale STMP3xxx"
---- -	select CPU_ARM926T
---- -	select CLKDEV_LOOKUP
---- -	select ARCH_REQUIRE_GPIOLIB
---- -	select GENERIC_CLOCKEVENTS
---- -	select USB_ARCH_HAS_EHCI
---- -	help
---- -	  Support for systems based on the Freescale 3xxx CPUs.
---- -
      config ARCH_NETX
      	bool "Hilscher NetX based"
 +++++	select CLKSRC_MMIO
      	select CPU_ARM926T
      	select ARM_VIC
      	select GENERIC_CLOCKEVENTS
diff --cc arch/arm/mach-realview/core.c
index 9f5155507d27,c8ec08886633,75dbc8791d05,75dbc8791d05,75dbc8791d05,525ad17f8265..5c23450d2d1d
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@@@@@@ -56,48 -56,28 -56,48 -56,48 -56,48 -56,29 +56,9 @@@@@@@
      
      #include "core.h"
      
----- #ifdef CONFIG_ZONE_DMA
----- /*
-----  * Adjust the zones if there are restrictions for DMA access.
-----  */
----- void __init realview_adjust_zones(unsigned long *size, unsigned long *hole)
----- {
----- 	unsigned long dma_size = SZ_256M >> PAGE_SHIFT;
----- 
----- 	if (!machine_is_realview_pbx() || size[0] <= dma_size)
----- 		return;
----- 
----- 	size[ZONE_NORMAL] = size[0] - dma_size;
----- 	size[ZONE_DMA] = dma_size;
----- 	hole[ZONE_NORMAL] = hole[0];
----- 	hole[ZONE_DMA] = 0;
----- }
----- #endif
----- 
----- 
      #define REALVIEW_FLASHCTRL    (__io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_FLASH_OFFSET)
      
- ----static int realview_flash_init(void)
- ----{
- ----	u32 val;
- ----
- ----	val = __raw_readl(REALVIEW_FLASHCTRL);
- ----	val &= ~REALVIEW_FLASHPROG_FLVPPEN;
- ----	__raw_writel(val, REALVIEW_FLASHCTRL);
- ----
- ----	return 0;
- ----}
- ----
- ----static void realview_flash_exit(void)
- ----{
- ----	u32 val;
- ----
- ----	val = __raw_readl(REALVIEW_FLASHCTRL);
- ----	val &= ~REALVIEW_FLASHPROG_FLVPPEN;
- ----	__raw_writel(val, REALVIEW_FLASHCTRL);
- ----}
- ----
- ----static void realview_flash_set_vpp(int on)
+ ++++static void realview_flash_set_vpp(struct platform_device *pdev, int on)
      {
      	u32 val;