diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-21 23:36:06 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-21 23:36:06 +0200 |
| commit | a59a591104ce12547dbf88987dfacfeb8c8d0315 (patch) | |
| tree | 57791965091f2ac2494cbc413565e41bd3f25377 /arch/arm/boot/dts/Makefile | |
| parent | Merge tag 'renesas-dt3-for-v3.16' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | ARM: sunxi: dt: declare the r_pio pin controller for A31 SoC (diff) | |
| download | linux-a59a591104ce12547dbf88987dfacfeb8c8d0315.tar.xz linux-a59a591104ce12547dbf88987dfacfeb8c8d0315.zip | |
Merge tag 'sunxi-dt-for-3.16' of https://github.com/mripard/linux into next/dt
Merge "Allwinner DT additions for 3.16" from Maxime Ripard:
- Introduction of the MMC controlers
- New board: A10s R7, Mele M9, APP4-EVB1
- Enabled the PMU on the Cortex A7-based SoCs
* tag 'sunxi-dt-for-3.16' of https://github.com/mripard/linux: (38 commits)
ARM: sunxi: dt: declare the r_pio pin controller for A31 SoC
ARM: sunxi: dt: add PRCM clk and reset controller subdevices
ARM: sunxi: dt: add APP4-EVB1 board support
ARM: sun6i: dt: Add support for the USB controllers
ARM: sun6i: Add the USB clocks to the DTSI
ARM: dts: sun5i: Add new A10s r7 hdmi tv dongle board
ARM: dts: sun7i: Add reg_vcc3v3 to sun7i board mmc nodes
ARM: dts: sun6i: Add reg_vcc3v3 to sun6i board mmc nodes
ARM: dts: sun5i: Add reg_vcc3v3 to sun5i board mmc nodes
ARM: dts: sun4i: Add reg_vcc3v3 to sun4i board mmc nodes
ARM: dts: sunxi: Add reg_vcc3v3 supply to sunxi-common-regulators.dtsi
ARM: dts: sun7i: Add basic support for the Cubietruck WiFi module
ARM: dts: sun7i: Enable mmc controller on various A20 boards
ARM: dts: sun7i: Add pin-muxing info for the mmc controllers
ARM: dts: sun7i: Add mmc controller nodes
ARM: dts: sun6i: Add new sun6i-a31-m9 dts file for Mele M9
ARM: dts: sun6i: Add mmc controller nodes
ARM: dts: sun6i: Add mmc clocks
ARM: dts: sun5i: Enable mmc controller on various A10s and A13 boards
ARM: dts: sun5i: Add mmc controller nodes
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 70767ae84683..05fc44bd71c2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -343,9 +343,12 @@ dtb-$(CONFIG_ARCH_SUNXI) += \ sun4i-a10-olinuxino-lime.dtb \ sun4i-a10-pcduino.dtb \ sun5i-a10s-olinuxino-micro.dtb \ + sun5i-a10s-r7-tv-dongle.dtb \ sun5i-a13-olinuxino.dtb \ sun5i-a13-olinuxino-micro.dtb \ + sun6i-a31-app4-evb1.dtb \ sun6i-a31-colombus.dtb \ + sun6i-a31-m9.dtb \ sun7i-a20-cubieboard2.dtb \ sun7i-a20-cubietruck.dtb \ sun7i-a20-olinuxino-micro.dtb |