diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 13:23:41 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 13:23:41 (GMT) |
| commit | dc61cd9ecb918f593972962b97cf6079ab9d1daf (patch) | |
| tree | cbe1e1d7fc2e231da2db3969f7004d995514f8ea /arch/arm/boot/dts/Makefile | |
| parent | ed2ca6ee4bfd060c079fd05d0eb8862da02dd248 (diff) | |
| parent | d0f2677be5b49a1c1de59fe94faa96b7808be95f (diff) | |
| download | linux-fsl-qoriq-dc61cd9ecb918f593972962b97cf6079ab9d1daf.tar.xz | |
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 <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a778bc0..242a493 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -195,6 +195,7 @@ 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 \ |