• Linus Torvalds's avatar
    Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 1bfecd93
    Linus Torvalds authored
    Pull "ARM: board specific updates" from Arnd Bergmann/Olof Johansson:
     "These changes are all specific to one board only.  We're trying to
      keep the number of board files low, but generally board level updates
      are ok on platforms that are working on moving towards DT based
      probing, which will eventually lead to removing them.
    
      The board-ams-delta.c board file gets a conflict between the removal
      of ams_delta_config and the addition of a lot of other data.  The
      Kconfig file has two changes in the same line, and in exynos, the
      power domain cleanup conflicts with the addition of the image sensor
      device.
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      [olof: Amended a fix for a mismerge to board-omap4panda.c]
      Signed-off-by: Olof Johansson <olof@lixom.net>"
    
    Fixed up some fairly trivial conflicts manually.
    
    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits)
      i.MX35-PDK: Add Camera support
      ARM : mx35: 3ds-board: add framebuffer device
      pxa/hx4700: Remove pcmcia platform_device structure
      ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
      ARM: pxa/hx4700: Remove unwanted request for GPIO105
      ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board
      ARM: EXYNOS: Register JPEG on nuri
      ARM: EXYNOS: Register JPEG on universal_c210
      ARM: S5PV210: Enable JPEG on SMDKV210
      ARM: S5PV210: Add JPEG board definition
      ARM: EXYNOS: Enable JPEG on Origen
      ARM: EXYNOS: Enable JPEG on SMDKV310
      ARM: EXYNOS: Add __init attribute to universal_camera_init()
      ARM: EXYNOS: Add __init attribute to nuri_camera_init()
      ARM: S5PV210: Enable FIMC on SMDKC110
      ARM: S5PV210: Enable FIMC on SMDKV210
      ARM: S5PV210: Enable MFC on SMDKC110
      ARM: S5PV210: Enable MFC on SMDKV210
      ARM: EXYNOS: Enable G2D on SMDKV310
      ARM: tegra: update defconfig
      ...
    1bfecd93
mach-origen.c 18.1 KB