diff options
author | Olof Johansson <olof@lixom.net> | 2014-01-02 12:05:13 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-01-02 12:05:13 -0800 |
commit | c53cb8d6a2cbcf9d85f5129e9efd4a0275f89d03 (patch) | |
tree | 0741a7ef37628423775bced90039cd6bf70b0ae0 /arch/arm/lib | |
parent | dee4bd4c7ed2eac16f55806e0e49d34dfb3c79fd (diff) | |
parent | 81ee429ffdd021626bf191bb8a3ae886dd94adcc (diff) |
Merge tag 'sunxi-dt-for-3.14' of https://github.com/mripard/linux into next/dt
From Maxime Ripard:
Allwinner sunXi DT Additions for 3.14
Various DT related patches, but mostly:
- Support for the Olimex A13-olinuxino-micro
- Added the needed IP in the A31 for the HS timer support and SMP bringup
- A10 and A20 RTC
* tag 'sunxi-dt-for-3.14' of https://github.com/mripard/linux:
ARM: sun6i: dt: Add IP needed to bring up the additional cores
ARM: dts: sun5i: Add new sun5i-a13-olinuxino-micro board
ARM: sun6i: Add the reset controller to the DTSI
ARM: sunxi: dt: add EMAC aliases
ARM: dts: sun4i/sun7i: add RTC node
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/lib')
0 files changed, 0 insertions, 0 deletions