From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 28 Mar 2013 11:25:51 +0000 (+0100)
Subject: Merge branch 'prima2/multiplatform' into next/multiplatform
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=063ab6daeb2ba5ef8f47c3fc04a749936c62d5bb;p=linux-beck.git

Merge branch 'prima2/multiplatform' into next/multiplatform

This series enables multiplatform support on the SIRF prima2/marco/atlas6
platform. The code was already quite tidy, so this is a relatively simple
change, and it follows similar changes we made to other ARMv7 based
platforms recently.

* prima2/multiplatform:
  ARM: sirf: enable support in multi_v7_defconfig
  ARM: sirf: enable multiplatform support
  ARM: sirf: use clocksource_of infrastructure
  ARM: sirf: move debug-macro.S to include/debug/sirf.S
  ARM: sirf: enable sparse IRQ
  ARM: sirf: move irq driver to drivers/irqchip
  ARM: sirf: fix prima2 interrupt lookup
  pinctrl: sirf: convert to linear irq domain
  clocksource: make CLOCKSOURCE_OF_DECLARE type safe
  ARM/dts: prima2: add .dtsi for atlas6 and .dts for atla6-evb board
  arm: prima2: add new SiRFatlas6 machine in common board
  ARM: smp_twd: convert to use CLKSRC_OF init
  clocksource: tegra20: use the device_node pointer passed to init
  clocksource: pass DT node pointer to init functions
  clocksource: add empty version of clocksource_of_init

Conflicts:
	arch/arm/configs/multi_v7_defconfig
	arch/arm/mach-spear/spear13xx.c
Tested-by: Barry Song <Barry.Song@csr.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

063ab6daeb2ba5ef8f47c3fc04a749936c62d5bb
diff --cc arch/arm/Kconfig.debug
index 5115ff9e8a2a,a69334d7f2b3..fd17127b4188
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -605,9 -590,9 +605,10 @@@ config DEBUG_LL_INCLUD
  				 DEBUG_IMX6Q_UART
  	default "debug/highbank.S" if DEBUG_HIGHBANK_UART
  	default "debug/mvebu.S" if DEBUG_MVEBU_UART
 +	default "debug/nomadik.S" if DEBUG_NOMADIK_UART
  	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
  	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
+ 	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
  	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
  	default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
  	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
diff --cc arch/arm/configs/multi_v7_defconfig
index 3bf0c543216a,44ec305c2c91..e3f2f6a5709b
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -44,9 -41,10 +47,11 @@@ CONFIG_IPMI_HANDLER=
  CONFIG_IPMI_SI=y
  CONFIG_I2C=y
  CONFIG_I2C_DESIGNWARE_PLATFORM=y
+ CONFIG_I2C_SIRF=y
  CONFIG_SPI=y
  CONFIG_SPI_PL022=y
+ CONFIG_SPI_SIRF=y
 +CONFIG_GPIO_PL061=y
  CONFIG_FB=y
  CONFIG_FB_ARMCLCD=y
  CONFIG_FRAMEBUFFER_CONSOLE=y
@@@ -66,4 -63,4 +71,5 @@@ CONFIG_RTC_CLASS=
  CONFIG_RTC_DRV_PL031=y
  CONFIG_DMADEVICES=y
  CONFIG_PL330_DMA=y
+ CONFIG_SIRF_DMA=y
 +CONFIG_DW_DMAC=y
diff --cc arch/arm/mach-spear/spear13xx.c
index 1b97e8623472,25a10191b021..6dd208997176
--- a/arch/arm/mach-spear/spear13xx.c
+++ b/arch/arm/mach-spear/spear13xx.c
@@@ -20,12 -21,10 +21,11 @@@
  #include <linux/of.h>
  #include <asm/hardware/cache-l2x0.h>
  #include <asm/mach/map.h>
- #include <asm/smp_twd.h>
 -#include <mach/dma.h>
 -#include <mach/generic.h>
 +#include "generic.h"
  #include <mach/spear.h>
  
 +#include "spear13xx-dma.h"
 +
  /* common dw_dma filter routine to be used by peripherals */
  bool dw_dma_filter(struct dma_chan *chan, void *slave)
  {