From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 29 Mar 2014 01:03:39 +0000 (+0100)
Subject: Merge tag 'exynos-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene... 
X-Git-Tag: v3.15-rc1~74^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e0c42ea3d2c8e24e6ad27a6d749b3085f1a2430;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'exynos-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup3

Merge "Exynos cleanup for v3.15" from Kukjin Kim:

- reorganize code for
- add support reserve memory for mfc-v7
- consolidate exynos4 and exynos5 machine codes
- add generic compatible strings for exynos4 and exynos5
- update DT with generic compatible strings
- move clk related dt-binding header file in dt-bindings/clock

* tag 'exynos-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock
  ARM: dts: Update Exynos DT files with generic compatible strings
  ARM: EXYNOS: Add generic compatible strings
  ARM: EXYNOS: Consolidate exynos4 and exynos5 machine files
  ARM: EXYNOS: Consolidate CPU init code
  ARM: SAMSUNG: Introduce generic Exynos4 and 5 helpers
  ARM: EXYNOS: Add support to reserve memory for MFC-v7
  ARM: SAMSUNG: Reorganize calls to reserve memory for MFC

Conflicts:
	arch/arm/mach-exynos/exynos.c

Signed-off-by; Arnd Bergmann <arnd@arndb.de>
---

9e0c42ea3d2c8e24e6ad27a6d749b3085f1a2430
diff --cc arch/arm/boot/dts/exynos4212.dtsi
index ceefc711793ca,34e578d15301c..3c00e6ec93027
--- a/arch/arm/boot/dts/exynos4212.dtsi
+++ b/arch/arm/boot/dts/exynos4212.dtsi
@@@ -20,13 -20,18 +20,13 @@@
  #include "exynos4x12.dtsi"
  
  / {
- 	compatible = "samsung,exynos4212";
+ 	compatible = "samsung,exynos4212", "samsung,exynos4";
  
 -	gic: interrupt-controller@10490000 {
 -		cpu-offset = <0x8000>;
 +	combiner: interrupt-controller@10440000 {
 +		samsung,combiner-nr = <18>;
  	};
  
 -	interrupt-controller@10440000 {
 -		samsung,combiner-nr = <18>;
 -		interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
 -			     <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
 -			     <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
 -			     <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,
 -			     <0 107 0>, <0 108 0>;
 +	gic: interrupt-controller@10490000 {
 +		cpu-offset = <0x8000>;
  	};
  };
diff --cc arch/arm/boot/dts/exynos4412.dtsi
index a40b6e20e92f1,eaa67899ed31b..15d3c0ac2f5f7
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@@ -20,13 -20,19 +20,13 @@@
  #include "exynos4x12.dtsi"
  
  / {
- 	compatible = "samsung,exynos4412";
+ 	compatible = "samsung,exynos4412", "samsung,exynos4";
  
 -	gic: interrupt-controller@10490000 {
 -		cpu-offset = <0x4000>;
 -	};
 -
 -	interrupt-controller@10440000 {
 +	combiner: interrupt-controller@10440000 {
  		samsung,combiner-nr = <20>;
 -		interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
 -			     <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
 -			     <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
 -			     <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,
 -			     <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>;
  	};
  
 +	gic: interrupt-controller@10490000 {
 +		cpu-offset = <0x4000>;
 +	};
  };
diff --cc arch/arm/mach-exynos/Makefile
index 58fe9e6f542f1,71df742fee250..a656dbe3b78c8
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@@ -12,9 -12,9 +12,9 @@@ obj-				:
  
  # Core
  
- obj-$(CONFIG_ARCH_EXYNOS)	+= common.o
+ obj-$(CONFIG_ARCH_EXYNOS)	+= exynos.o
  
 -obj-$(CONFIG_S5P_PM)		+= pm.o
 +obj-$(CONFIG_PM_SLEEP)		+= pm.o sleep.o
  obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
  obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
  
diff --cc arch/arm/mach-exynos/exynos.c
index e98ddadc5f748,fd3664f7244aa..4987ec7711c3a
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@@ -9,40 -9,27 +9,27 @@@
   * published by the Free Software Foundation.
   */
  
- #include <linux/kernel.h>
- #include <linux/bitops.h>
- #include <linux/interrupt.h>
- #include <linux/irq.h>
- #include <linux/irqchip.h>
+ #include <linux/init.h>
  #include <linux/io.h>
- #include <linux/device.h>
- #include <linux/gpio.h>
- #include <clocksource/samsung_pwm.h>
- #include <linux/sched.h>
- #include <linux/serial_core.h>
+ #include <linux/kernel.h>
 +#include <linux/serial_s3c.h>
  #include <linux/of.h>
- #include <linux/of_fdt.h>
- #include <linux/of_irq.h>
- #include <linux/pm_domain.h>
- #include <linux/export.h>
- #include <linux/irqdomain.h>
  #include <linux/of_address.h>
- #include <linux/irqchip/arm-gic.h>
- #include <linux/irqchip/chained_irq.h>
+ #include <linux/of_fdt.h>
+ #include <linux/of_platform.h>
  #include <linux/platform_device.h>
+ #include <linux/pm_domain.h>
  
- #include <asm/proc-fns.h>
- #include <asm/exception.h>
+ #include <asm/cacheflush.h>
  #include <asm/hardware/cache-l2x0.h>
+ #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
- #include <asm/mach/irq.h>
- #include <asm/cacheflush.h>
+ #include <asm/memory.h>
  
  #include <plat/cpu.h>
- #include <plat/pm.h>
 -#include <plat/regs-serial.h>
  
  #include "common.h"
+ #include "mfc.h"
  #include "regs-pmu.h"
  
  #define L2_AUX_VAL 0x7C470001