From: Kevin Hilman Date: Wed, 21 Aug 2013 21:53:49 +0000 (-0700) Subject: Merge tag 'sunxi-dt-for-3.12' of https://github.com/mripard/linux into next/dt X-Git-Tag: Ubuntu-5.13.0-19.19~21583^2~7 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7a37ffa07bfb80d22c1e91705f39079b504056b4;p=mirror_ubuntu-jammy-kernel.git Merge tag 'sunxi-dt-for-3.12' of https://github.com/mripard/linux into next/dt Allwinner sunXi DT additions for 3.12 - Cleanups and few fixes to the DTSI - A few additions to the A10s olinuxino board * tag 'sunxi-dt-for-3.12' of https://github.com/mripard/linux: ARM: sunxi: dt: Add device tree for Mele A1000 ARM: sun5i: dt: Fix A13 SoC bus base address ARM: sun5i: a13: Remove useless simple-bus reg property ARM: sun5i: dt: Fix A10s SoC bus base address ARM: sun5i: a10s: Remove useless simple-bus reg property ARM: sun4i: dt: Fix A10 SoC bus base address ARM: sun4i: a10: Remove useless simple-bus reg property ARM: sunxi: make the leds' names conform to the current naming convention ARM: sun5i: dt: Add AT24 device on A10S-OLinuXino-Micro ARM: sun5i: dt: Enable I2C controllers on A10S-OLinuXino-Micro ARM: sun5i: dt: Add I2C controller nodes to the A10S dtsi ARM: sun5i: dt: Add I2C muxings for sun5i A10S Signed-off-by: Kevin Hilman --- 7a37ffa07bfb80d22c1e91705f39079b504056b4