• A
    Merge branch 'prima2/multiplatform' into next/multiplatform · 063ab6da
    Arnd Bergmann 提交于
    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: NBarry Song <Barry.Song@csr.com>
    Signed-off-by: NArnd Bergmann <arnd@arndb.de>
    063ab6da
spear13xx.c 4.4 KB