From: Olof Johansson <olof@lixom.net>
Date: Thu, 29 Aug 2013 21:00:28 +0000 (-0700)
Subject: Merge tag 'sunxi-dt-for-3.12-4' of https://github.com/mripard/linux into late/all
X-Git-Tag: next-20130912~99^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ef2fd3b15bd2da46e13cc61d475286e5e6026211;p=karo-tx-linux.git

Merge tag 'sunxi-dt-for-3.12-4' of https://github.com/mripard/linux into late/all

From Maxime Ripard:
Allwinner DT changes for 3.12, take 3 and 4

These patches add support for:
  - The cubieboard2 board
  - The pinctrl driver that got merged for the A20 and A31
  - The associated muxing for the A20 and A31 boards already supported
  - Enables the gated clocks on the A10s, A20 and A31 DTSI.

* tag 'sunxi-dt-for-3.12-4' of https://github.com/mripard/linux:
  ARM: sun7i: Enable the A20 clocks in the DTSI
  ARM: sun6i: Enable clock support in the DTSI
  ARM: sun5i: dt: Use the A10s gates in the DTSI
  ARM: sun7i: Add Cubieboard2 Device Tree
  ARM: sun7i: a20-olinuxino: Enable the user LED
  ARM: sun7i: a20-olinuxino: Enable UARTs muxing
  ARM: sun7i: DT: Add UART muxing options to the DTSI
  ARM: sun7i: Add the PIO controller node to the DTSI
  ARM: sun6i: colombus: Add uart0 muxing
  ARM: sun6i: Add UART0 muxing options
  ARM: sunxi: dt: Add PIO controller to A31 DTSI

Signed-off-by: Olof Johansson <olof@lixom.net>
---

ef2fd3b15bd2da46e13cc61d475286e5e6026211