From: Olof Johansson <olof@lixom.net>
Date: Mon, 26 May 2014 20:21:16 +0000 (-0700)
Subject: Merge branch 'mvebu/soc-orion5x' into next/dt
X-Git-Tag: firefly_0821_release~176^2~3465^2~44^2~9
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=805e55d568e231b6f25cdf79d0a0239d8236f35e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'mvebu/soc-orion5x' into next/dt

Merging in a local copy from the next/soc branch to avoid some annoying
context conflicts in the dts Makefile.

* mvebu/soc-orion5x: (29 commits)
  ARM: orion: remove no longer needed gpio DT code
  ARM: orion: remove no longer needed DT IRQ code
  ARM: orion5x: convert Maxtor Shared Storage II to the Device Tree
  ARM: orion5x: convert d2net to Device Tree
  ARM: orion5x: convert RD-88F5182 to Device Tree
  ARM: orion5x: remove unneeded code for edmini_v2
  ARM: orion5x: keep TODO list in edmini_v2 DT
  ARM: orion5x: use DT to describe NOR on edmini_v2
  ARM: orion5x: use DT to describe EHCI on edmini_v2
  ARM: orion5x: use DT to describe I2C devices on edmini_v2
  ARM: orion5x: convert edmini_v2 to DT pinctrl
  ARM: orion5x: add standard pinctrl configs for sata0 and sata1
  ARM: orion5x: add Device Bus description at SoC level
  ARM: orion5x: update I2C description at SoC level
  ARM: orion5x: enable pinctrl driver at SoC level
  ARM: orion5x: switch to DT interrupts and timer
  ARM: orion: switch to a per-platform handle_irq() function
  ARM: orion5x: convert to use 'clocks' property for UART controllers
  ARM: orion5x: switch to use the clock driver for DT platforms
  ARM: orion5x: add interrupt for Ethernet in Device Tree
  ...
---

805e55d568e231b6f25cdf79d0a0239d8236f35e