Merge tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Tue, 7 May 2013 18:22:14 +0000 (11:22 -0700)]
Pull ARM SoC late cleanups from Arnd Bergmann:
 "These are cleanups and smaller changes that either depend on earlier
  feature branches or came in late during the development cycle.  We
  normally try to get all cleanups early, so these are the exceptions:

   - A follow-up on the clocksource reworks, hopefully the last time we
     need to merge clocksource subsystem changes through arm-soc.

     A first set of patches was part of the original 3.10 arm-soc
     cleanup series because of interdependencies with timer drivers now
     moved out of arch/arm.

   - Migrating the SPEAr13xx platform away from using auxdata for DMA
     channel descriptions towards using information in device tree,
     based on the earlier SPEAr multiplatform series

   - A few follow-ups on the Atmel SAMA5 support and other changes for
     Atmel at91 based on the larger at91 reworks.

   - Moving the armada irqchip implementation to drivers/irqchip

   - Several OMAP cleanups following up on the larger series already
     merged in 3.10."

* tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (50 commits)
  ARM: OMAP4: change the device names in usb_bind_phy
  ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
  ARM: SPEAr: conditionalize SMP code
  ARM: arch_timer: Silence debug preempt warnings
  ARM: OMAP: remove unused variable
  serial: amba-pl011: fix !CONFIG_DMA_ENGINE case
  ata: arasan: remove the need for platform_data
  ARM: at91/sama5d34ek.dts: remove not needed compatibility string
  ARM: at91: dts: add MCI DMA support
  ARM: at91: dts: add i2c dma support
  ARM: at91: dts: set #dma-cells to the correct value
  ARM: at91: suspend both memory controllers on at91sam9263
  irqchip: armada-370-xp: slightly cleanup irq controller driver
  irqchip: armada-370-xp: move IRQ handler to avoid forward declaration
  irqchip: move IRQ driver for Armada 370/XP
  ARM: mvebu: move L2 cache initialization in init_early()
  devtree: add binding documentation for sp804
  ARM: integrator-cp: convert use CLKSRC_OF for timer init
  ARM: versatile: use OF init for sp804 timer
  ARM: versatile: add versatile dtbs to dtbs target
  ...

21 files changed:
1  2 
arch/arm/Kconfig
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/at91sam9x5.dtsi
arch/arm/boot/dts/spear1340.dtsi
arch/arm/kernel/sched_clock.c
arch/arm/mach-at91/cpuidle.c
arch/arm/mach-at91/setup.c
arch/arm/mach-mvebu/Makefile
arch/arm/mach-mvebu/armada-370-xp.c
arch/arm/mach-omap2/timer.c
arch/arm/mach-shmobile/setup-r8a7740.c
arch/arm/mach-spear/Makefile
arch/arm/mach-vexpress/v2m.c
drivers/clocksource/Kconfig
drivers/clocksource/exynos_mct.c
drivers/irqchip/Makefile
drivers/irqchip/irq-armada-370-xp.c
drivers/tty/serial/amba-pl011.c
include/linux/of.h

@@@ -1059,6 -1172,8 +1059,7 @@@ config PLAT_VERSATIL
  config ARM_TIMER_SP804
        bool
        select CLKSRC_MMIO
+       select CLKSRC_OF if OF
 -      select HAVE_SCHED_CLOCK
  
  source arch/arm/mm/Kconfig
  
Simple merge
Simple merge
Simple merge
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8010000 0x100>;
                                interrupts = <9 4 6>;
+                               dmas = <&dma0 1 7>,
+                                      <&dma0 1 8>;
+                               dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&pinctrl_i2c0>;
                                status = "disabled";
                        };
  
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8014000 0x100>;
                                interrupts = <10 4 6>;
+                               dmas = <&dma1 1 5>,
+                                      <&dma1 1 6>;
+                               dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&pinctrl_i2c1>;
                                status = "disabled";
                        };
  
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8018000 0x100>;
                                interrupts = <11 4 6>;
+                               dmas = <&dma0 1 9>,
+                                      <&dma0 1 10>;
+                               dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&pinctrl_i2c2>;
                                status = "disabled";
                        };
  
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -5,6 -5,6 +5,6 @@@ AFLAGS_coherency_ll.o            := -Wa,-march=ar
  
  obj-y                          += system-controller.o
  obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o
- obj-$(CONFIG_ARCH_MVEBU)       += coherency.o coherency_ll.o pmsu.o irq-armada-370-xp.o
 -obj-$(CONFIG_ARCH_MVEBU)       += addr-map.o coherency.o coherency_ll.o pmsu.o
++obj-$(CONFIG_ARCH_MVEBU)       += coherency.o coherency_ll.o pmsu.o
  obj-$(CONFIG_SMP)                += platsmp.o headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)        += hotplug.o
@@@ -19,7 -19,8 +19,9 @@@
  #include <linux/time-armada-370-xp.h>
  #include <linux/clk/mvebu.h>
  #include <linux/dma-mapping.h>
 +#include <linux/mbus.h>
+ #include <linux/irqchip.h>
+ #include <asm/hardware/cache-l2x0.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  #include <asm/mach/time.h>
@@@ -58,20 -57,9 +60,24 @@@ void __init armada_370_xp_init_early(vo
         */
        init_dma_coherent_pool_size(SZ_1M);
  
 +      /*
 +       * This initialization will be replaced by a DT-based
 +       * initialization once the mvebu-mbus driver gains DT support.
 +       */
 +      if (of_machine_is_compatible("marvell,armada370"))
 +              mbus_soc_name = "marvell,armada370-mbus";
 +      else
 +              mbus_soc_name = "marvell,armadaxp-mbus";
 +
 +      mvebu_mbus_init(mbus_soc_name,
 +                      ARMADA_370_XP_MBUS_WINS_BASE,
 +                      ARMADA_370_XP_MBUS_WINS_SIZE,
 +                      ARMADA_370_XP_SDRAM_WINS_BASE,
 +                      ARMADA_370_XP_SDRAM_WINS_SIZE);
++
+ #ifdef CONFIG_CACHE_L2X0
+       l2x0_of_init(0, ~0UL);
+ #endif
  }
  
  static void __init armada_370_xp_dt_init(void)
Simple merge
@@@ -1029,8 -904,8 +1029,7 @@@ DT_MACHINE_START(R8A7740_DT, "Generic R
        .map_io         = r8a7740_map_io,
        .init_early     = r8a7740_add_early_devices_dt,
        .init_irq       = r8a7740_init_irq,
 -      .handle_irq     = shmobile_handle_irq_intc,
        .init_machine   = r8a7740_add_standard_devices_dt,
-       .init_time      = shmobile_timer_init,
        .dt_compat      = r8a7740_boards_compat_dt,
  MACHINE_END
  
Simple merge
  #include <linux/regulator/fixed.h>
  #include <linux/regulator/machine.h>
  #include <linux/vexpress.h>
 +#include <linux/clk-provider.h>
 +#include <linux/clkdev.h>
  
- #include <asm/arch_timer.h>
  #include <asm/mach-types.h>
  #include <asm/sizes.h>
  #include <asm/mach/arch.h>
@@@ -430,29 -428,11 +427,11 @@@ void __init v2m_dt_init_early(void
  
  static void __init v2m_dt_timer_init(void)
  {
-       struct device_node *node = NULL;
 -      vexpress_clk_of_init();
 +      of_clk_init(NULL);
  
        clocksource_of_init();
-       do {
-               node = of_find_compatible_node(node, NULL, "arm,sp804");
-       } while (node && vexpress_get_site_by_node(node) != VEXPRESS_SITE_MB);
-       if (node) {
-               pr_info("Using SP804 '%s' as a clock & events source\n",
-                               node->full_name);
-               WARN_ON(clk_register_clkdev(of_clk_get_by_name(node,
-                               "timclken1"), "v2m-timer0", "sp804"));
-               WARN_ON(clk_register_clkdev(of_clk_get_by_name(node,
-                               "timclken2"), "v2m-timer1", "sp804"));
-               v2m_sp804_init(of_iomap(node, 0),
-                               irq_of_parse_and_map(node, 0));
-       }
-       arch_timer_of_register();
  
-       if (arch_timer_sched_clock_init() != 0)
-               versatile_sched_clock_init(vexpress_get_24mhz_clock_base(),
+       versatile_sched_clock_init(vexpress_get_24mhz_clock_base(),
                                24000000);
  }
  
Simple merge
Simple merge
@@@ -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_MXS)                        += irq-mxs.o
  obj-$(CONFIG_ARCH_S3C24XX)            += irq-s3c24xx.o
  obj-$(CONFIG_METAG)                   += irq-metag-ext.o
  obj-$(CONFIG_METAG_PERFCOUNTER_IRQS)  += irq-metag.o
Simple merge
@@@ -1094,9 -988,10 +1106,9 @@@ static inline bool pl011_dma_rx_running
        return uap->using_rx_dma && uap->dmarx.running;
  }
  
 -
  #else
  /* Blank functions if the DMA engine is not available */
- static inline void pl011_dma_probe(struct uart_amba_port *uap)
+ static inline void pl011_dma_probe(struct device *dev, struct uart_amba_port *uap)
  {
  }
  
Simple merge