From: Arnd Bergmann Date: Thu, 20 Jun 2013 13:23:41 +0000 (+0200) Subject: Merge tag 'sunxi-dt-for-3.11-2' of git://github.com/mripard/linux into next/dt X-Git-Tag: pm+acpi-3.11-rc1-more~53^2~8 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc61cd9ecb918f593972962b97cf6079ab9d1daf;p=uclinux-h8%2Flinux.git Merge tag 'sunxi-dt-for-3.11-2' of git://github.com/mripard/linux into next/dt From Maxime Ripard: Allwinner SoCs DT additions for 3.11, part 2 Mostly adds support for the i2c controllers and the Allwinner A10S SoC. * tag 'sunxi-dt-for-3.11-2' of git://github.com/mripard/linux: ARM: sunxi: Add Olimex A10s-Olinuxino-micro device tree ARM: sunxi: dt: Add Allwinner A10s DTSI ARM: sun4i: cubieboard: Enable the i2c controllers ARM: sun5i: olinuxino: Enable the i2c controllers ARM: sun5i: dt: Add i2c muxing options ARM: sun4i: dt: Add i2c muxing options ARM: sunxi: dt: Add i2c controller nodes to the DTSI Signed-off-by: Arnd Bergmann --- dc61cd9ecb918f593972962b97cf6079ab9d1daf diff --cc arch/arm/boot/dts/Makefile index a778bc013ce8,9d6e5a4e8a1c..242a4937fe6f --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -191,10 -177,9 +191,11 @@@ dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300- spear320-evb.dtb \ spear320-hmi.dtb dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb -dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \ +dtb-$(CONFIG_ARCH_SUNXI) += \ + sun4i-a10-cubieboard.dtb \ + sun4i-a10-mini-xplus.dtb \ sun4i-a10-hackberry.dtb \ + sun5i-a10s-olinuxino-micro.dtb \ sun5i-a13-olinuxino.dtb dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra20-iris-512.dtb \