From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Sep 2012 20:22:21 +0000 (-0700)
Subject: Merge branch 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux into... 
X-Git-Tag: upstream/snapshot3+hdmi~6519^2^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=80868a36913e11cfcd06764699b4284d34be0e59;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux into late/kirkwood

* 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux:
  ARM: Dove: allow PCI to be disabled
  ARM: dove: SolidRun CuBox DT
  ARM: dove: add device tree descriptors
  ARM: dove: add device tree based machine descriptor
  ARM: dove: add crypto engine
  ARM: dove: add clock gating control
  ARM: dove: unify clock setup
  ARM: initial DTS support for km_kirkwood
  arm: add documentation describing Marvell families of SoC
  ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar
  ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar
  ARM: Kirkwood: Iomega ix2-200 DT support

Context conflicts in arch/arm/Kconfig and arch/arm/mach-dove/common.c.

The new device trees added to arch/arm/mach-kirkwood/Makefile.boot are
kept and dealt with in a separate changeset, since moving them out to
the new Makefile in this merge commit doesn't work well.

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

80868a36913e11cfcd06764699b4284d34be0e59
diff --cc arch/arm/Kconfig
index f416422,95041b9..5876aef
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -537,10 -561,24 +537,11 @@@ config ARCH_IXP4X
  config ARCH_DOVE
  	bool "Marvell Dove"
  	select CPU_V7
- 	select PCI
  	select ARCH_REQUIRE_GPIOLIB
  	select GENERIC_CLOCKEVENTS
+ 	select MIGHT_HAVE_PCI
 -	select NEED_MACH_IO_H
  	select PLAT_ORION
+ 	select USB_ARCH_HAS_EHCI
  	help
  	  Support for the Marvell Dove SoC 88AP510
  
diff --cc arch/arm/mach-dove/common.c
index 950ad95,b12d11a..28475bb
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@@ -275,11 -351,11 +340,11 @@@ void __init dove_sdio1_init(void
  
  void __init dove_init(void)
  {
- 	printk(KERN_INFO "Dove 88AP510 SoC, ");
- 	printk(KERN_INFO "TCLK = %dMHz\n", (get_tclk() + 499999) / 1000000);
+ 	pr_info("Dove 88AP510 SoC, TCLK = %d MHz.\n",
+ 		(dove_tclk + 499999) / 1000000);
  
  #ifdef CONFIG_CACHE_TAUROS2
 -	tauros2_init();
 +	tauros2_init(0);
  #endif
  	dove_setup_cpu_mbus();
  
diff --cc arch/arm/mach-kirkwood/Makefile.boot
index 760a0ef,5edef8e..d90b3cb
--- a/arch/arm/mach-kirkwood/Makefile.boot
+++ b/arch/arm/mach-kirkwood/Makefile.boot
@@@ -1,3 -1,17 +1,7 @@@
     zreladdr-y	+= 0x00008000
  params_phys-y	:= 0x00000100
  initrd_phys-y	:= 0x00800000
+ 
 -dtb-$(CONFIG_MACH_DREAMPLUG_DT) += kirkwood-dreamplug.dtb
 -dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns320.dtb
 -dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb
 -dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb
 -dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb
 -dtb-$(CONFIG_MACH_TS219_DT)	+= kirkwood-ts219-6281.dtb
 -dtb-$(CONFIG_MACH_TS219_DT)	+= kirkwood-ts219-6282.dtb
 -dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb
 -dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lschlv2.dtb
 -dtb-$(CONFIG_MACH_LSXL_DT) += kirkwood-lsxhl.dtb
+ dtb-$(CONFIG_MACH_IOMEGA_IX2_200_DT) += kirkwood-iomega_ix2_200.dtb
+ dtb-$(CONFIG_MACH_DOCKSTAR_DT) += kirkwood-dockstar.dtb
+ dtb-$(CONFIG_MACH_KM_KIRKWOOD_DT) += kirkwood-km_kirkwood.dtb