From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Nov 2013 07:49:45 +0000 (+0900)
Subject: Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.13-rc1~159
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aac59e3efce3dca787b11e34726001603ce3d161;p=profile%2Fcommon%2Fkernel-common.git

Merge tag 'soc-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC platform changes from Olof Johansson:
 "New and updated SoC support.  Among the things new for this release
  are:

   - More support for the AM33xx platforms from TI
   - Tegra 124 support, and some updates to older tegra families as well
   - imx cleanups and updates across the board
   - A rename of Broadcom's Mobile platforms which were introduced as
     ARCH_BCM, and turned out to be too broad a name.  New name is
     ARCH_BCM_MOBILE.
   - A whole bunch of updates and fixes for integrator, making the
     platform code more modern and switches over to DT-only booting.
   - Support for two new Renesas shmobile chipsets.  Next up for them is
     more work on consolidation instead of introduction of new
     non-multiplatform SoCs, we're all looking forward to that!
   - Misc cleanups for older Samsung platforms, some Allwinner updates,
     etc"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (159 commits)
  ARM: bcm281xx: Add ARCH_BCM_MOBILE to bcm config
  ARM: bcm_defconfig: Run "make savedefconfig"
  ARM: bcm281xx: Add ARCH Timers to config
  rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm)
  ARM: vexpress: Enable platform-specific options in defconfig
  ARM: vexpress: Make defconfig work again
  ARM: sunxi: remove .init_time hooks
  ARM: imx: enable suspend for imx6sl
  ARM: imx: ensure dsm_request signal is not asserted when setting LPM
  ARM: imx6q: call WB and RBC configuration from imx6q_pm_enter()
  ARM: imx6q: move low-power code out of clock driver
  ARM: imx: drop extern with function prototypes in common.h
  ARM: imx: reset core along with enable/disable operation
  ARM: imx: do not return from imx_cpu_die() call
  ARM: imx_v6_v7_defconfig: Select CONFIG_PROVE_LOCKING
  ARM: imx_v6_v7_defconfig: Enable LEDS_GPIO related options
  ARM: mxs_defconfig: Turn off CONFIG_DEBUG_GPIO
  ARM: imx: replace imx6q_restart() with mxc_restart()
  ARM: mach-imx: mm-imx5: Retrieve iomuxc base address from dt
  ARM: mach-imx: mm-imx5: Retrieve tzic base address from dt
  ...
---

aac59e3efce3dca787b11e34726001603ce3d161
diff --cc arch/arm/Kconfig
index e98261c,bca9f94..9bd3a85
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -736,9 -742,7 +738,8 @@@ config ARCH_S3C64X
  	select S3C_DEV_NAND
  	select S3C_GPIO_TRACK
  	select SAMSUNG_ATAGS
- 	select SAMSUNG_CLKSRC
  	select SAMSUNG_GPIOLIB_4BIT
 +	select SAMSUNG_WAKEMASK
  	select SAMSUNG_WDT_RESET
  	select USB_ARCH_HAS_OHCI
  	help
diff --cc arch/arm/mach-highbank/Kconfig
index 616408d,965623d..fe98df4
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@@ -10,8 -10,10 +10,9 @@@ config ARCH_HIGHBAN
  	select ARM_ERRATA_775420
  	select ARM_ERRATA_798181
  	select ARM_GIC
+ 	select ARM_PSCI
  	select ARM_TIMER_SP804
  	select CACHE_L2X0
 -	select CLKDEV_LOOKUP
  	select COMMON_CLK
  	select CPU_V7
  	select GENERIC_CLOCKEVENTS
diff --cc arch/arm/mach-shmobile/include/mach/r8a7778.h
index 48933def,dbe221a..441886c
--- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h
@@@ -21,8 -22,18 +22,15 @@@
  #include <linux/sh_eth.h>
  #include <linux/platform_data/camera-rcar.h>
  
+ /* HPB-DMA slave IDs */
+ enum {
+ 	HPBDMA_SLAVE_DUMMY,
+ 	HPBDMA_SLAVE_SDHI0_TX,
+ 	HPBDMA_SLAVE_SDHI0_RX,
+ };
+ 
  extern void r8a7778_add_standard_devices(void);
  extern void r8a7778_add_standard_devices_dt(void);
 -extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata);
 -extern void r8a7778_add_vin_device(int id,
 -				   struct rcar_vin_platform_data *pdata);
  extern void r8a7778_add_dt_devices(void);
  
  extern void r8a7778_init_late(void);