From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Apr 2015 16:20:15 +0000 (-0700)
Subject: Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.1-rc1~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5ac320de1fe3ef5a5afa5f8a0cd19b0c5373a37;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'armsoc-multiplatform' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC multiplatform code changes from Olof Johansson:
 "The changes here belong to two main platforms:

   - Atmel At91 is flipping the bit and going multiplatform.  This
     includes some cleanups and removal of code, and the final flip of
     config dependencies

   - Shmobile has several platforms that are going multiplatform, but
     this branch also contains a bunch of cleanups that they weren't
     able to keep separate in a good way.  THere's also a removal of one
     of their SoCs and the corresponding boards (sh7372 and mackerel)"

* tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
  ARM: at91/pm: move AT91_MEMCTRL_* to pm.h
  ARM: at91/pm: move the standby functions to pm.c
  ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected
  ARM: at91: add a Kconfig dependency on multi-platform
  ARM: at91: drop AT91_TIMER_HZ
  ARM: at91: remove hardware.h
  ARM: at91: remove SoC headers
  ARM: at91: remove useless mach/cpu.h
  ARM: at91: remove unused headers
  ARM: at91: switch at91_dt_defconfig to multiplatform
  ARM: at91: switch to multiplatform
  ARM: shmobile: r8a7778: enable multiplatform target
  ARM: shmobile: bockw: add sound to DT
  ARM: shmobile: r8a7778: add sound to DT
  ARM: shmobile: bockw: add devices hooked up to i2c0 to DT
  DT: i2c: add trivial binding for OKI ML86V7667 video decoder
  ARM: shmobile: r8a7778: common clock framework CPG driver
  ARM: shmobile: bockw dts: set extal clock frequency
  ARM: shmobile: bockw dts: Move Ethernet node to BSC
  ARM: shmobile: r8a73a4: Remove legacy code
  ...
---

e5ac320de1fe3ef5a5afa5f8a0cd19b0c5373a37
diff --cc arch/arm/mach-shmobile/Makefile
index 3631d8b,d3aca07..89e463d
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -51,11 -46,8 +48,8 @@@ obj-$(CONFIG_SUSPEND)		+= suspend.
  obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
  obj-$(CONFIG_PM_RCAR)		+= pm-rcar.o
  obj-$(CONFIG_PM_RMOBILE)	+= pm-rmobile.o
 +obj-$(CONFIG_ARCH_RCAR_GEN2)	+= pm-rcar-gen2.o
  
- # special sh7372 handling for IRQ objects and low level sleep code
- obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o sleep-sh7372.o
- 
  # Board objects
  ifdef CONFIG_ARCH_SHMOBILE_MULTI
  obj-$(CONFIG_MACH_MARZEN)	+= board-marzen-reference.o
diff --cc arch/arm/mach-shmobile/common.h
index 1dc0971,8faf6e0..afc60ba
--- a/arch/arm/mach-shmobile/common.h
+++ b/arch/arm/mach-shmobile/common.h
@@@ -21,8 -21,9 +21,7 @@@ extern void shmobile_smp_scu_cpu_die(un
  extern int shmobile_smp_scu_cpu_kill(unsigned int cpu);
  struct clk;
  extern int shmobile_clk_init(void);
- extern void shmobile_handle_irq_intc(struct pt_regs *);
  extern struct platform_suspend_ops shmobile_suspend_ops;
 -struct cpuidle_driver;
 -extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
  
  #ifdef CONFIG_SUSPEND
  int shmobile_suspend_init(void);