mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-15 19:56:03 +00:00
Merge tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux into for-next
Merge "Allwinner DT changes for 3.16, take 2" from Maxime Ripard: - Introduction of a new board, the i12-tvbox - Enable the MMC and USB controllers on the Colombus - Add the enable-method to the A31 cpus - a few fixes * tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux: ARM: dts: sun7i: Add new i12-tvbox board ARM: dts: sun7i: cubietruck: set mmc3 bus-width property ARM: sun6i: Add MMC0 controller to the Colombus board ARM: sun6i: Fix OHCI2 node name ARM: sun6i: Enable USB Host support on the Colombus board ARM: sunxi: Add fixed 3V regulator ARM: sun6i: Define the A31 CPUs enable-method ARM: sunxi: dt: build DTs according to new MACH_SUNxI Kconfig symbols Signed-off-by: Arnd Bergmann <arnd@arndb.de> Conflicts: arch/arm/boot/dts/Makefile
This commit is contained in:
commit
cce9e45cfc
6 changed files with 241 additions and 5 deletions
Loading…
Add table
Add a link
Reference in a new issue