1. 26 Nov, 2012 5 commits
    • Olof Johansson's avatar
      Merge branch 'orion/dt' into next/dt · 61da823a
      Olof Johansson authored
      Merge in orion's cleanup branch together with the DT contents.  Ideally
      the cleanup branch should have been the base for the DT branch to avoid
      these, but that was missed when first merging. So we're doing it now to
      reduce the amount of silly conflicts due to internal tree organization.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      61da823a
    • Olof Johansson's avatar
      Merge branch 'orion/cleanup' into orion/dt · 52cfa7e5
      Olof Johansson authored
      Merge in the cleanups that should have been used as the base of the DT
      branch instead of letting the conflicts be exposed all the way up to
      the toplevel merges.
      
      All of these are caused by cleanups being done both in the cleanup branch
      and the dt branch, resulting in remove/remove conflicts of header files.
      
      By Andrew Lunn (3) and others
      via Jason Cooper
      * orion/cleanup:
        ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
        ARM: Kirkwood: checkpatch cleanups
        ARM: Kirkwood: Fix sparse warnings.
        ARM: Kirkwood: Remove unused includes
        ARM: kirkwood: cleanup lsxl board includes
      
      Remove/remove conflicts in:
      	arch/arm/mach-kirkwood/board-dockstar.c
      	arch/arm/mach-kirkwood/board-goflexnet.c
      	arch/arm/mach-kirkwood/board-lsxl.c
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      52cfa7e5
    • Olof Johansson's avatar
      Merge tag 'orion_dt_for_3.8' of git://git.infradead.org/users/jcooper/linux into next/dt · 0dfeada9
      Olof Johansson authored
      From Jason Cooper:
      orion dt for v3.8
      
       - ehci-orion dt binding
       - gpio-poweroff
       - use dt regulators
       - move mpp to DT/pinctrl
      
      Depends on:
      
       - orion/boards
      
          - merge conflicts
             - keep all 'select's in Kconfig
             - remove all #includes in board-*.c
      
       - pinctrl/devel up to:
      
          - 06763c74 pinctrl: mvebu: move to its own directory
      
      * tag 'orion_dt_for_3.8' of git://git.infradead.org/users/jcooper/linux: (211 commits)
        ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
        ARM: Kirkwood: Add support LED of OpenBlocks A6
        ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
        ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
        ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
        ARM: kirkwood: Add support DT of second I2C bus
        ARM: kirkwood: Convert mplcec4 board to pinctrl
        ARM: Kirkwood: Convert km_kirkwood to pinctrl
        ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
        ARM: Kirkwood: Convert IX2-200 to pinctrl.
        ARM: Kirkwood: Convert lsxl boards to pinctrl.
        ARM: Kirkwood: Convert ib62x0 to pinctrl.
        ARM: Kirkwood: Convert GoFlex Net to pinctrl.
        ARM: Kirkwood: Convert dreamplug to pinctrl.
        ARM: Kirkwood: Convert dockstar to pinctrl.
        ARM: Kirkwood: Convert dnskw to pinctrl
        ARM: Kirkwood: Convert iConnect to pinctrl.
        ARM: Kirkwood: Convert TS219 to pinctrl.
        ARM: Kirkwood: Add DTSI files for pinctrl
        ARM: Kirkwood: Make use of mvebu pincltl and gpio drivers
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0dfeada9
    • Olof Johansson's avatar
      Merge branch 'next/dt-samsung-2' of... · d408c5dc
      Olof Johansson authored
      Merge branch 'next/dt-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
      
      From Kukjin Kim:
      Here is second Samsung DT stuff for v3.8.
      
      This is including power domain DT support for exynos and Google ARM
      Chromebook, Snow board and exynos4210-origen updates.
      
      * 'next/dt-samsung-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: dts: Use drive strength 3 for SD pins for exynos4
        ARM: dts: Set up power domains for exynos4
        ARM: EXYNOS: Bind devices to power domains using DT
        ARM: EXYNOS: Fix power domain name initialization
        ARM: EXYNOS: Detect power domain state on registration from DT
        ARM: dts: Add vmmc fixed voltage regulator for exynos4210-origen
        ARM: dts: Update sdhci nodes for current bindings for exynos4210-origen
        ARM: dts: Update for pinctrl-samsung driver for exynos4210-origen
        ARM: dts: Split memory sections for exynos4210-origen
        ARM: EXYNOS: add all i2c busses to auxdata for DT
        ARM: dts: Add aliases for i2c controller for exynos4
        ARM: dts: Add board dts file for Snow board (ARM Chromebook)
        ARM: dts: Move the dwmmc aliases from smdk5250 dts to exynos
      
      Add/add conflicts resolved in arch/arm/boot/dts/exynos5250-smdk5250.dts
      and arch/arm/mach-exynos/mach-exynos5-dt.c.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      d408c5dc
    • Olof Johansson's avatar
      Merge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt · 8d2282a7
      Olof Johansson authored
      From Shawn Guo:
      They are a few mxs dts updates coming a little bit late.  I'm sending
      them as the second mxs/dt pull request for 3.8.  Please consider to
      pull.
      
      * tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
        ARM: dts: mxs: add oled support for the cfa-10036
        ARM: mxs: Add SchulerControl SPS1 DTS file
        ARM: imx23-olinuxino: Add spi support
      8d2282a7
  2. 24 Nov, 2012 35 commits