From: Olof Johansson <olof@lixom.net>
Date: Wed, 21 Nov 2012 19:49:45 +0000 (-0800)
Subject: Merge branch 'zynq/multiplatform' of git://git.monstr.eu/linux-2.6-microblaze into... 
X-Git-Tag: firefly_0821_release~3680^2~1478^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3f54db784a6af9a6d53396949cbecf62edbad247;p=firefly-linux-kernel-4.4.55.git

Merge branch 'zynq/multiplatform' of git://git.monstr.eu/linux-2.6-microblaze into next/multiplatform

From Michal Simek:

This branch depends on arm-soc devel/debug_ll_init branch because
we needed Rob's "ARM: implement debug_ll_io_init()"
(sha1: afaee03511ba8002b26a9c6b1fe7d6baf33eac86)
patch.

This branch also depends on zynq/dt branch because of previous major
zynq changes.
zynq/cleanup branch is subset of zynq/dt.

* 'zynq/multiplatform' of git://git.monstr.eu/linux-2.6-microblaze:
  ARM: zynq: Remove all unused mach headers
  ARM: zynq: add support for ARCH_MULTIPLATFORM
  ARM: zynq: make use of debug_ll_io_init()
  ARM: zynq: remove TTC early mapping
  ARM: zynq: add clk binding support to the ttc
  ARM: zynq: use zynq clk bindings
  clk: Add support for fundamental zynq clks
  ARM: zynq: dts: split up device tree
  ARM: zynq: Allow UART1 to be used as DEBUG_LL console.
  ARM: zynq: dts: add description of the second uart
  ARM: zynq: move arm-specific sys_timer out of ttc
  zynq: move static peripheral mappings
  zynq: remove use of CLKDEV_LOOKUP
  zynq: use pl310 device tree bindings
  zynq: use GIC device tree bindings

Add/add conflict in arch/arm/Kconfig.debug.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

3f54db784a6af9a6d53396949cbecf62edbad247
diff --cc arch/arm/Kconfig
index 9277f503481c,28a204801ccf..d244249178b6
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1130,10 -1114,10 +1118,12 @@@ source "arch/arm/mach-versatile/Kconfig
  source "arch/arm/mach-vexpress/Kconfig"
  source "arch/arm/plat-versatile/Kconfig"
  
 +source "arch/arm/mach-vt8500/Kconfig"
 +
  source "arch/arm/mach-w90x900/Kconfig"
  
+ source "arch/arm/mach-zynq/Kconfig"
+ 
  # Definitions to make life easier
  config ARCH_ACORN
  	bool
diff --cc arch/arm/Kconfig.debug
index 96b9425219d9,d6bdad204d91..be70fe56bbeb
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -455,7 -435,7 +472,8 @@@ config DEBUG_LL_INCLUD
  	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
  	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
  		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1
 +	default "debug/tegra.S" if DEBUG_TEGRA_UART
+ 	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
  	default "mach/debug-macro.S"
  
  config EARLY_PRINTK
diff --cc arch/arm/Makefile
index 89087d599ad2,554cfac41429..aa90b6670794
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -199,8 -199,8 +199,7 @@@ machine-$(CONFIG_ARCH_ZYNQ)		+= zyn
  plat-$(CONFIG_ARCH_MXC)		+= mxc
  plat-$(CONFIG_ARCH_OMAP)	+= omap
  plat-$(CONFIG_ARCH_S3C64XX)	+= samsung
- plat-$(CONFIG_ARCH_ZYNQ)	+= versatile
  plat-$(CONFIG_PLAT_IOP)		+= iop
 -plat-$(CONFIG_PLAT_NOMADIK)	+= nomadik
  plat-$(CONFIG_PLAT_ORION)	+= orion
  plat-$(CONFIG_PLAT_PXA)		+= pxa
  plat-$(CONFIG_PLAT_S3C24XX)	+= s3c24xx samsung