]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'sunxi-dt-for-3.16-2' of https://github.com/mripard/linux into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 21:46:50 +0000 (23:46 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 21:49:59 +0000 (23:49 +0200)
commit0a3a77faa8dfa031b43ca3ec29c263ea9e413f57
treebdc0b3029809586526d3ce83bffb37c65db7fe70
parent2f03026467cccc39e3f9685ac82abdcaf42d56d0
parent5476c4ce79b1700ef4725950a696677294b5dc4e
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
arch/arm/boot/dts/Makefile