Merge branch 'next/dt' into for-linus

Conflicts:
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-omap2/board-generic.c

diff --cc arch/arm/common/gic.c
index a8fc6b23759210750394c23e455e13fc886cad39,bf0e134e5206620cebdc16fba183a3ee72c57e4a..0e6ae470c94f26589c0721a059dfaded9b2f30b1
--- 1/arch/arm/common/gic.c
--- 2/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/Kconfig
Simple merge

diff --cc arch/arm/mach-at91/Makefile
Simple merge

diff --cc arch/arm/mach-at91/Makefile.boot
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260.c
index a9be75825e34a915f2b91a6967f7662bf3a96edf,f4518b49cb8274889e28c822527744bc95d0384a..b84a9f642f5953a5ff527d3b593b1a628b61232b
--- 1/arch/arm/mach-at91/at91sam9260.c
--- 2/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 29def9095ab197f28cbd885a628227fbd398e84d,0fe1c305e08215e1eb4b3d0089276e58db277b62..318b0407ea041fa8d8dae59c106d8427ea48b8ec
--- 1/arch/arm/mach-at91/at91sam9g45.c
--- 2/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[] = {

diff --cc drivers/of/irq.c
Simple merge

diff --cc drivers/tty/serial/msm_serial.c
Simple merge