• Linus Torvalds's avatar
    Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 95360fd6
    Linus Torvalds authored
    Pull ARM soc board specific updates from Olof Johansson:
     "Misc board updates:
       - Greg added a handful of boards to KS8695 (since he has stepped up
         to maintain it).
       - Qualcomm has added DT-only board support for a couple of their
         newer SoCs.
       - misc other updates for Samsung and Freescale boards."
    
    Fix up trivial conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
    due to gpio device data being added next to hdmi device data that got moved.
    
    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
      ARM: msm: Allow 8960 and 8660 to compile together
      ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
      ARM: EXYNOS: Add generic PWM lookup support for SMDKV310
      ARM: EXYNOS: Add generic PWM lookup support for SMDK4X12
      ARM: EXYNOS: Use generic pwm driver in Origen board
      ARM: shmobile: armadillo800eva: Add support RTC
      ARM: ks8695: add board support for the OpenGear boards based on the KS8695
      ARM: ks8695: add board support for the SnapGear boards based on the KS8695
      ARM: dts: Add heartbeat gpio-leds support to Origen
      ARM: dts: Use active low flag for gpio-keys on Origen
      ARM: shmobile: marzen: enable thermal sensor
      ARM: shmobile: marzen: fixup regulator id for smsc911x
      ARM: shmobile: marzen: add SDHI0 support
      ARM: mmp: enable debug uart port in defconfig
      ARM: mmp: implement DEBUG_LL port choice
      ARM: S3C64XX: Register audio platform devices for Bells on Cragganmore
      ARM: S3C64XX: Update configuration for WM5102 module on Cragganmore
      ARM: mx27pdk: Add audio support
      ARM: ttc_dkb: add nand support
    95360fd6
armadillo800eva_defconfig 3.98 KB