diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-28 08:14:40 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-28 08:14:40 +0400 |
| commit | c90d19be2716aa677d2941828d802f4cfbecab80 (patch) | |
| tree | c6f36a34c6549a61d223e8a258a781a3bcc93e49 /arch/arm/boot/dts/Makefile | |
| parent | 1e819b3ed3faa81f7996b8fb5690ab35b4a0fa2e (diff) | |
| parent | 01ed6632a554dfdf4a9fc3c593ce4ff7255ed161 (diff) | |
| download | linux-c90d19be2716aa677d2941828d802f4cfbecab80.tar.xz | |
Merge tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux into next/dt
From Maxime Ripard:
Allwinner sunXi SoCs device tree changes for 3.13
This DT series sees the introduction of the cubietruck DT, plus the addition of
the i2c controller for the A20 based boards, and of the Security ID found in
all the Allwinner SoCs but the A31.
* tag 'sunxi-dt-for-3.13' of https://github.com/mripard/linux:
ARM: sunxi: dts: Add support for the cubieboard3, the CubieTruck
ARM: sun7i: olinuxino-micro: Enable the I2C controllers
ARM: sun7i: cubieboard2: Enable the I2C controllers
ARM: sun7i: Add the pin muxing options for the I2C controllers
ARM: sun7i: Enable the I2C controllers
ARM: sunxi: dt: Add sunxi-sid to dts for sun4i, sun5i and sun7i
Signed-off-by: Olof Johansson <olof@lixom.net>
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 8265f98b4c55..d4dff18e332c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -251,6 +251,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ sun5i-a13-olinuxino.dtb \ sun6i-a31-colombus.dtb \ sun7i-a20-cubieboard2.dtb \ + sun7i-a20-cubietruck.dtb \ sun7i-a20-olinuxino-micro.dtb dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra20-iris-512.dtb \ |