• Arnd Bergmann's avatar
    Merge tag 'tegra-for-3.10-cleanup' of... · 8024206d
    Arnd Bergmann authored
    Merge tag 'tegra-for-3.10-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
    
    From Stephen Warren <swarren@wwwdotorg.org>:
    
    ARM: tegra: cleanup
    
    This branch includes various cleanup of the core Tegra support.
    
    * Unification of the separate board-dt-tegra*.c files into a single
      tegra.c, now that everything is DT-driven and basically identical.
    * Use of_clk_get() in the Tegra clocksource driver so that clocks are
      described in DT rather than hard-coding clock names.
    * Some cleanup of the PMC-related code, with the aim that the PMC
      "driver" contains more of the code that touches PMC registers, rather
      than spreading PMC register accesses through other files.
    * Conversion of the "PMC" driver to acquire resources describe in device
      tree rather than hard-coding them.
    * Use of common code for the CPU sleep TLB invalidation.
    
    This branch is based on the previous fixes pull request.
    
    * tag 'tegra-for-3.10-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
      ARM: tegra: use setup_mm_for_reboot rather than explicit pgd switch
      ARM: tegra: replace the CPU power on function with PMC call
      ARM: tegra: pmc: add power on function for secondary CPUs
      ARM: tegra: pmc: convert PMC driver to support DT only
      ARM: tegra: fix the PMC compatible string in DT
      ARM: tegra: pmc: add specific compatible DT string for Tegra30 and Tegra114
      ARM: tegra: refactor tegra{20,30}_boot_secondary
      clocksource: tegra: move to of_clk_get
      ARM: tegra: Unify Device tree board files
      ARM: tegra: Rename board-dt-tegra20.c to tegra.c
      ARM: tegra: Unify tegra{20,30,114}_init_early()
    
    Conflicts:
    	drivers/clocksource/tegra20_timer.c
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    8024206d
platsmp.c 4.46 KB