diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 18:13:49 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 18:13:49 +0200 |
| commit | cd7555aeae372c6faf09cbbc1dfbdd0c91fe76f7 (patch) | |
| tree | 056b4241a176eb7fd6c6c61bc4f89d2f3ffbc4ab /arch/arm/boot/dts/Makefile | |
| parent | 45c636b46e25981e22a4ab3cbf53ac80fbbc5b08 (diff) | |
| parent | d07fe967189ff7c32f5a78b4f28c2ccbab850091 (diff) | |
| download | blackbird-op-linux-cd7555aeae372c6faf09cbbc1dfbdd0c91fe76f7.tar.gz blackbird-op-linux-cd7555aeae372c6faf09cbbc1dfbdd0c91fe76f7.zip | |
Merge tag 'sunxi-dt-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
Pull "Allwinner DT Additions for 3.18" from Maxime Ripard:
Mostly:
- A23 bringup ongoing
- New boards: HSG H702, Merrii A20 Hummingbird
- sun(4|5|7)i DMA support
- DT relicensing to a dual GPL/X11 license
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'sunxi-dt-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (30 commits)
ARM: dts: sun8i: Add DMA controller node
ARM: dts: sun5i: Add DT for HSG H702 tablet board
ARM: dts: sunxi: Add fixed 5V regulator
ARM: sun8i: Relicense the A23 DTSI under GPLv2/X11
ARM: sun7i: Relicense the A20 DTSI under GPLv2/X11
ARM: sun6i: Relicense the A31 DTSI under GPLv2/X11
ARM: sun7i: Add support for Olimex A20-OLinuXino-LIME
ARM: dts: sun7i: Add Merrii A20 Hummingbird board
ARM: dts: sun7i: Add uart3/4/5, i2c3 and spi2 pinmux
ARM: dt: sunxi: Remove i2c controller clock-frequency that matches default
ARM: dts: sun8i: Enable i2c controllers on ippo-q8h-v5
ARM: dts: sun8i: Add i2c controller nodes
ARM: dts: sun8i: Add pin-muxing info for the i2c controllers
ARM: dts: sun8i: Enable mmc controller on ippo-q8h-v5
ARM: dts: sun8i: Add mmc controller nodes
ARM: dts: sun8i: Add pin-muxing info for the mmc controllers
ARM: dts: sun8i: Add mmc clocks to the dtsi
ARM: dts: sun8i: ippo-q8h: Add pinctrl properties for R_UART
ARM: dts: sun8i: Add pin muxing option for R_UART
ARM: dts: sun8i: Add pinmux set for uart0
...
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 9706262020f1..a13ea1cced60 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -420,6 +420,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \ dtb-$(CONFIG_MACH_SUN5I) += \ sun5i-a10s-olinuxino-micro.dtb \ sun5i-a10s-r7-tv-dongle.dtb \ + sun5i-a13-hsg-h702.dtb \ sun5i-a13-olinuxino.dtb \ sun5i-a13-olinuxino-micro.dtb dtb-$(CONFIG_MACH_SUN6I) += \ @@ -430,7 +431,9 @@ dtb-$(CONFIG_MACH_SUN6I) += \ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-cubieboard2.dtb \ sun7i-a20-cubietruck.dtb \ + sun7i-a20-hummingbird.dtb \ sun7i-a20-i12-tvbox.dtb \ + sun7i-a20-olinuxino-lime.dtb \ sun7i-a20-olinuxino-micro.dtb \ sun7i-a20-pcduino3.dtb dtb-$(CONFIG_MACH_SUN8I) += \ |
