From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 6 May 2013 21:43:45 +0000 (+0200)
Subject: Merge branch 'late/clksrc' into late/cleanup
X-Git-Tag: v3.10-rc1~62^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=442a33ebce9e02a2dd6662f16c9f2aad834d0115;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'late/clksrc' into late/cleanup

There is no reason to keep the clksrc cleanups separate from the
other cleanups, and this resolves some merge conflicts.

Conflicts:
	arch/arm/mach-spear/spear13xx.c
	drivers/irqchip/Makefile
---

442a33ebce9e02a2dd6662f16c9f2aad834d0115
diff --cc arch/arm/mach-omap2/board-am3517evm.c
index 2b9eb3d,191f976..d63f14b
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@@ -300,8 -362,12 +301,10 @@@ static void __init am3517_evm_init(void
  
  	/* Configure GPIO for EHCI port */
  	omap_mux_init_gpio(57, OMAP_PIN_OUTPUT);
+ 
+ 	usbhs_init_phys(phy_data, ARRAY_SIZE(phy_data));
  	usbhs_init(&usbhs_bdata);
  	am3517_evm_hecc_init(&am3517_evm_hecc_pdata);
 -	/* DSS */
 -	am3517_evm_display_init();
  
  	/* RTC - S35390A */
  	am3517_evm_rtc_init();
diff --cc arch/arm/mach-omap2/timer.c
index d00d89c,31109cb..fdf1c03
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -545,22 -545,19 +545,23 @@@ static inline void __init realtime_coun
  #endif
  
  #define OMAP_SYS_GP_TIMER_INIT(name, clkev_nr, clkev_src, clkev_prop,	\
- 			       clksrc_nr, clksrc_src)			\
+ 			       clksrc_nr, clksrc_src, clksrc_prop)	\
  void __init omap##name##_gptimer_timer_init(void)			\
  {									\
 +	if (omap_clk_init)						\
 +		omap_clk_init();					\
  	omap_dmtimer_init();						\
  	omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop);	\
- 	omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src);	\
+ 	omap2_gptimer_clocksource_init((clksrc_nr), clksrc_src,		\
+ 					clksrc_prop);			\
  }
  
  #define OMAP_SYS_32K_TIMER_INIT(name, clkev_nr, clkev_src, clkev_prop,	\
- 				clksrc_nr, clksrc_src)			\
+ 				clksrc_nr, clksrc_src, clksrc_prop)	\
  void __init omap##name##_sync32k_timer_init(void)		\
  {									\
 +	if (omap_clk_init)						\
 +		omap_clk_init();					\
  	omap_dmtimer_init();						\
  	omap2_gp_clockevent_init((clkev_nr), clkev_src, clkev_prop);	\
  	/* Enable the use of clocksource="gp_timer" kernel parameter */	\
diff --cc arch/arm/mach-spear/spear13xx.c
index 3975916,25a1019..3621599
--- a/arch/arm/mach-spear/spear13xx.c
+++ b/arch/arm/mach-spear/spear13xx.c
@@@ -15,13 -15,70 +15,13 @@@
  
  #include <linux/amba/pl022.h>
  #include <linux/clk.h>
+ #include <linux/clocksource.h>
 -#include <linux/dw_dmac.h>
  #include <linux/err.h>
  #include <linux/of.h>
  #include <asm/hardware/cache-l2x0.h>
  #include <asm/mach/map.h>
- #include <asm/smp_twd.h>
- #include "generic.h"
 -#include <mach/dma.h>
 -#include <mach/generic.h>
  #include <mach/spear.h>
 -
 -/* common dw_dma filter routine to be used by peripherals */
 -bool dw_dma_filter(struct dma_chan *chan, void *slave)
 -{
 -	struct dw_dma_slave *dws = (struct dw_dma_slave *)slave;
 -
 -	if (chan->device->dev == dws->dma_dev) {
 -		chan->private = slave;
 -		return true;
 -	} else {
 -		return false;
 -	}
 -}
 -
 -/* ssp device registration */
 -static struct dw_dma_slave ssp_dma_param[] = {
 -	{
 -		/* Tx */
 -		.cfg_hi = DWC_CFGH_DST_PER(DMA_REQ_SSP0_TX),
 -		.cfg_lo = 0,
 -		.src_master = DMA_MASTER_MEMORY,
 -		.dst_master = DMA_MASTER_SSP0,
 -	}, {
 -		/* Rx */
 -		.cfg_hi = DWC_CFGH_SRC_PER(DMA_REQ_SSP0_RX),
 -		.cfg_lo = 0,
 -		.src_master = DMA_MASTER_SSP0,
 -		.dst_master = DMA_MASTER_MEMORY,
 -	}
 -};
 -
 -struct pl022_ssp_controller pl022_plat_data = {
 -	.enable_dma = 1,
 -	.dma_filter = dw_dma_filter,
 -	.dma_rx_param = &ssp_dma_param[1],
 -	.dma_tx_param = &ssp_dma_param[0],
 -};
 -
 -/* CF device registration */
 -struct dw_dma_slave cf_dma_priv = {
 -	.cfg_hi = 0,
 -	.cfg_lo = 0,
 -	.src_master = 0,
 -	.dst_master = 0,
 -};
 -
 -/* dmac device registeration */
 -struct dw_dma_platform_data dmac_plat_data = {
 -	.nr_channels = 8,
 -	.chan_allocation_order = CHAN_ALLOCATION_DESCENDING,
 -	.chan_priority = CHAN_PRIORITY_DESCENDING,
 -	.block_size = 4095U,
 -	.nr_masters = 2,
 -	.data_width = { 3, 3, 0, 0 },
 -};
++#include "generic.h"
  
  void __init spear13xx_l2x0_init(void)
  {
diff --cc drivers/irqchip/Makefile
index dae27a7,acf9895..154722a
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@@ -2,7 -2,7 +2,8 @@@ obj-$(CONFIG_IRQCHIP)			+= irqchip.
  
  obj-$(CONFIG_ARCH_BCM2835)		+= irq-bcm2835.o
  obj-$(CONFIG_ARCH_EXYNOS)		+= exynos-combiner.o
 +obj-$(CONFIG_ARCH_MVEBU)		+= irq-armada-370-xp.o
+ obj-$(CONFIG_ARCH_S3C24XX)		+= irq-s3c24xx.o
  obj-$(CONFIG_METAG)			+= irq-metag-ext.o
  obj-$(CONFIG_METAG_PERFCOUNTER_IRQS)	+= irq-metag.o
  obj-$(CONFIG_ARCH_SUNXI)		+= irq-sunxi.o