• Linus Torvalds's avatar
    Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4bb2d100
    Linus Torvalds authored
    Pull "ARM: More SoC support updates" from Olof Johansson:
     "This branch contains a handful of updates of SoC base code that had
      dependencies on other external trees that have now been merged:
    
       * Support for the new EXYNOS5250 SoC from Samsung
       * SMP and power domain support for Tegra3 from NVIDIA
       * ux500 updates for exporting SoC information through sysfs"
    
    Fix up trivial merge conflicts as per Olof.
    
    * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (30 commits)
      ARM: mach-shmobile: ap4evb: Reserve DMA memory for the frame buffer
      ARM: EXYNOS: Fix compilation error with mach-exynos4-dt board
      ARM: dts: add initial dts file for EXYNOS5250, SMDK5250
      ARM: EXYNOS: add support device tree enabled board file for EXYNOS5
      ARM: EXYNOS: add support ARCH_EXYNOS5 for EXYNOS5 SoCs
      ARM: EXYNOS: add support get_core_count() for EXYNOS5250
      ARM: EXYNOS: support EINT for EXYNOS4 and EXYNOS5
      ARM: EXYNOS: add interrupt definitions for EXYNOS5250
      ARM: EXYNOS: add support for EXYNOS5250 SoC
      ARM: EXYNOS: add support uart for EXYNOS4 and EXYNOS5
      ARM: EXYNOS: add initial setup-i2c0 for EXYNOS5
      ARM: EXYNOS: add clock part for EXYNOS5250 SoC
      ARM: EXYNOS: use exynos_init_uarts() instead of exynos4_init_uarts()
      ARM: EXYNOS: to declare static for mach-exynos/common.c
      ARM: EXYNOS: Add clkdev lookup entry for lcd clock
      ARM: dt: Explicitly configure all serial ports on Tegra Cardhu
      ARM: tegra: support for secondary cores on Tegra30
      ARM: tegra: support for Tegra30 CPU powerdomains
      ARM: tegra: add support for Tegra30 powerdomains
      ARM: tegra: export tegra_powergate_is_powered()
      ...
    4bb2d100
Makefile 11.3 KB