Merge branch 'heads/soc2' into next

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/Makefile
Simple merge

diff --cc arch/arm/mach-shmobile/board-lager.c
Simple merge

diff --cc arch/arm/mach-shmobile/include/mach/r8a7778.h
index fdbd37df15434b6c902c9b341e33c1c1a2f270da,dbe221a484d5da01d61edba3a00e0aa3fae44c85..441886c9714baddffb609247b872fca7054c514a
--- 1/arch/arm/mach-shmobile/include/mach/r8a7778.h
--- 2/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);

diff --cc arch/arm/mach-shmobile/setup-r8a7778.c
Simple merge