diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-08-22 03:05:07 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-22 03:05:07 +0400 |
| commit | 656d79cafc88137c87c0f6ac85080ce5dae2234b (patch) | |
| tree | da328b1c56bc4f3a5387ac4b364319b5f957713c /arch/arm/boot/dts/Makefile | |
| parent | 7a37ffa07bfb80d22c1e91705f39079b504056b4 (diff) | |
| parent | e476ac8b483de4ce1d8570509be343afc7cd3baf (diff) | |
| download | linux-656d79cafc88137c87c0f6ac85080ce5dae2234b.tar.xz | |
Merge tag 'sunxi-dt-for-3.12-2' of https://github.com/mripard/linux into next/dt
Allwinner sunXi DT additions for 3.12, take 2
These patches add basic support for:
- Allwinner A31 and A20 SoCs
- The Olimex A20-Olinuxino board
- The Olimex A10s-Olinuxino board
* tag 'sunxi-dt-for-3.12-2' of https://github.com/mripard/linux:
ARM: sun7i: Add Olimex A20-Olinuxino-Micro support
ARM: sun7i: Add Allwinner A20 DTSI
ARM: sun6i: Add WITS Colombus A31 evaluation kit support
ARM: sunxi: Add Allwinner A31 DTSI
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 198df7fb5db0..e6ca771b0e4c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -213,7 +213,9 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ sun4i-a10-mini-xplus.dtb \ sun4i-a10-hackberry.dtb \ sun5i-a10s-olinuxino-micro.dtb \ - sun5i-a13-olinuxino.dtb + sun5i-a13-olinuxino.dtb \ + sun6i-a31-colombus.dtb \ + sun7i-a20-olinuxino-micro.dtb dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra20-iris-512.dtb \ tegra20-medcom-wide.dtb \ |