Skip to content
  • Linus Torvalds's avatar
    Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 44d82e29
    Linus Torvalds authored
    Pull arm-soc Marvell Orion device-tree updates from Olof Johansson:
     "This contains a set of device-tree conversions for Marvell Orion
      platforms that were staged early but took a few tries to get the
      branch into a format where it was suitable for us to pick up.
    
      Given that most people working on these platforms are hobbyists with
      limited time, we were a bit more flexible with merging it even though
      it came in late."
    
    * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
      ARM: Kirkwood: Replace mrvl with marvell
      ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.
      ARM: Kirkwood: Describe Dreamplug LEDs in DT.
      ARM: Kirkwood: Describe iConnects LEDs in DT.
      ARM: Kirkwood: Describe iConnects temperature sensor in DT.
      ARM: Kirkwood: Describe IB62x0 LEDs in DT.
      ARM: Kirkwood: Describe IB62x0 gpio-keys in DT.
      ARM: Kirkwood: Describe DNS32? gpio-keys in DT.
      ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsi
      ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindings
      ARM: Kirkwood: Describe DNS325 temperature sensor in DT.
      ARM: Kirkwood: Use DT to configure SATA device.
      ARM: kirkwood: use devicetree for SPI on dreamplug
      ARM: kirkwood: Add LS-XHL and LS-CHLv2 support
      ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net
      ARM: Kirkwood: Add basic device tree support for QNAP TS219.
      ATA: sata_mv: Add device tree support
      ARM: Orion: DTify the watchdog timer.
      ARM: Orion: Add arch support needed for I2C via DT.
      ARM: kirkwood: use devicetree for orion-spi
      ...
    
    Conflicts:
    	drivers/watchdog/orion_wdt.c
    44d82e29