From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Nov 2011 04:02:35 +0000 (-0700)
Subject: Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc
X-Git-Tag: v3.2-rc1~89
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=367069f16e32e188d4687fe2c3e30f2ca583836f;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc

* 'next/dt' of git://git.linaro.org/people/arnd/arm-soc:
  ARM: gic: use module.h instead of export.h
  ARM: gic: fix irq_alloc_descs handling for sparse irq
  ARM: gic: add OF based initialization
  ARM: gic: add irq_domain support
  irq: support domains with non-zero hwirq base
  of/irq: introduce of_irq_init
  ARM: at91: add at91sam9g20 and Calao USB A9G20 DT support
  ARM: at91: dt: at91sam9g45 family and board device tree files
  arm/mx5: add device tree support for imx51 babbage
  arm/mx5: add device tree support for imx53 boards
  ARM: msm: Add devicetree support for msm8660-surf
  msm_serial: Add devicetree support
  msm_serial: Use relative resources for iomem

Fix up conflicts in arch/arm/mach-at91/{at91sam9260.c,at91sam9g45.c}
---

367069f16e32e188d4687fe2c3e30f2ca583836f
diff --cc arch/arm/common/gic.c
index a8fc6b2,bf0e134..0e6ae47
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@@ -84,9 -89,9 +89,9 @@@ static inline unsigned int gic_irq(stru
   */
  static void gic_mask_irq(struct irq_data *d)
  {
- 	u32 mask = 1 << (d->irq % 32);
+ 	u32 mask = 1 << (gic_irq(d) % 32);
  
 -	spin_lock(&irq_controller_lock);
 +	raw_spin_lock(&irq_controller_lock);
  	writel_relaxed(mask, gic_dist_base(d) + GIC_DIST_ENABLE_CLEAR + (gic_irq(d) / 32) * 4);
  	if (gic_arch_extn.irq_mask)
  		gic_arch_extn.irq_mask(d);
@@@ -95,9 -100,9 +100,9 @@@
  
  static void gic_unmask_irq(struct irq_data *d)
  {
- 	u32 mask = 1 << (d->irq % 32);
+ 	u32 mask = 1 << (gic_irq(d) % 32);
  
 -	spin_lock(&irq_controller_lock);
 +	raw_spin_lock(&irq_controller_lock);
  	if (gic_arch_extn.irq_unmask)
  		gic_arch_extn.irq_unmask(d);
  	writel_relaxed(mask, gic_dist_base(d) + GIC_DIST_ENABLE_SET + (gic_irq(d) / 32) * 4);
diff --cc arch/arm/mach-at91/at91sam9260.c
index a9be758,f4518b4..b84a9f6
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@@ -199,8 -199,14 +199,16 @@@ static struct clk_lookup periph_clocks_
  	CLKDEV_CON_DEV_ID("t4_clk", "atmel_tcb.1", &tc4_clk),
  	CLKDEV_CON_DEV_ID("t5_clk", "atmel_tcb.1", &tc5_clk),
  	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk),
+ 	/* more usart lookup table for DT entries */
+ 	CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),
+ 	CLKDEV_CON_DEV_ID("usart", "fffb0000.serial", &usart0_clk),
+ 	CLKDEV_CON_DEV_ID("usart", "fffb4000.serial", &usart1_clk),
+ 	CLKDEV_CON_DEV_ID("usart", "fffb8000.serial", &usart2_clk),
+ 	CLKDEV_CON_DEV_ID("usart", "fffd0000.serial", &usart3_clk),
+ 	CLKDEV_CON_DEV_ID("usart", "fffd4000.serial", &usart4_clk),
+ 	CLKDEV_CON_DEV_ID("usart", "fffd8000.serial", &usart5_clk),
 +	/* fake hclk clock */
 +	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
  };
  
  static struct clk_lookup usart_clocks_lookups[] = {
diff --cc arch/arm/mach-at91/at91sam9g45.c
index 29def90,0fe1c30..318b040
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@@ -222,9 -216,12 +222,15 @@@ static struct clk_lookup periph_clocks_
  	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tcb0_clk),
  	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),
  	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),
 +	CLKDEV_CON_DEV_ID(NULL, "atmel-trng", &trng_clk),
+ 	/* more usart lookup table for DT entries */
+ 	CLKDEV_CON_DEV_ID("usart", "ffffee00.serial", &mck),
+ 	CLKDEV_CON_DEV_ID("usart", "fff8c000.serial", &usart0_clk),
+ 	CLKDEV_CON_DEV_ID("usart", "fff90000.serial", &usart1_clk),
+ 	CLKDEV_CON_DEV_ID("usart", "fff94000.serial", &usart2_clk),
+ 	CLKDEV_CON_DEV_ID("usart", "fff98000.serial", &usart3_clk),
 +	/* fake hclk clock */
 +	CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
  };
  
  static struct clk_lookup usart_clocks_lookups[] = {