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

* '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 <[email protected]>

diff --cc arch/arm/Kconfig
index f416422ddb0e00366669ea9d2b5a629fcf1df465,95041b9937dc76495c66ee8126a0115ab459a0f5..5876aef72dfe7617d804cde12108e23c9c5d06f8
--- 1/arch/arm/Kconfig
--- 2/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 NEED_MACH_IO_H
+       select MIGHT_HAVE_PCI
        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 950ad9533d19ea88ab7c9651f80cfcb9c0a04887,b12d11a5f2d0eabef342a2e3af5c40f6662a91a5..28475bb7d36f88324dc5bc8d67e806b9ea46df16
--- 1/arch/arm/mach-dove/common.c
--- 2/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 760a0efe7580b0dd194ff9bfe4295624336bb806,5edef8ef34bf6fb56a1d2c2cc795cdfd4bde3be1..d90b3cb0209ed2a5476432d945d2c44a31cc77d6
--- 1/arch/arm/mach-kirkwood/Makefile.boot
--- 2/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