• Linus Torvalds's avatar
    Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 30b84288
    Linus Torvalds authored
    Pull arm-soc: soc specific changes (part 2) from Olof Johansson:
     "This adds support for the spear13xx platform, which has first been
      under review a long time ago and finally been completed after generic
      spear work has gone into the clock, dt and pinctrl branches.
    
      Also a number of updates for the samsung socs are part of this branch."
    
    Fix up trivial conflicts in drivers/gpio/gpio-samsung.c that look much
    worse than they are: the exonys5 init code was refactored in commit
    fd454997 ("gpio: samsung: refactor gpiolib init for exynos4/5"), and
    then commit f10590c9 ("ARM: EXYNOS: add GPC4 bank instance") added a
    new gpio chip define and did tiny updates to the init code.
    
    So the conflict diff looks like hell, but it's actually a fairly simple
    change.
    
    * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
      ARM: exynos: fix building with CONFIG_OF disabled
      ARM: EXYNOS: Add AUXDATA for i2c controllers
      ARM: dts: Update device tree source files for EXYNOS5250
      ARM: EXYNOS: Add device tree support for interrupt combiner
      ARM: EXYNOS: Add irq_domain support for interrupt combiner
      ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5
      ARM: EXYNOS: update irqs for EXYNOS5250 SoC
      ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll
      ARM: EXYNOS: add GPC4 bank instance
      ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition
      ARM: EXYNOS: Modify the GIC physical address for static io-mapping
      ARM: EXYNOS: Add watchdog timer clock instance
      pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res
      SPEAr: Update MAINTAINERS and Documentation
      SPEAr13xx: Add defconfig
      SPEAr13xx: Add compilation support
      SPEAr13xx: Add dts and dtsi files
      pinctrl: Add SPEAr13xx pinctrl drivers
      pinctrl: SPEAr: Create macro for declaring GPIO PINS
      SPEAr13xx: Add common clock framework support
      ...
    30b84288
map.h 8.6 KB