summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-05-12 18:23:34 +0300
committerArnd Bergmann <arnd@arndb.de>2015-05-12 18:23:34 +0300
commit58d2bc7b29fe1fe1a50fd0d318d2be800331eaf2 (patch)
treeb5a9e97ed3c5ee0cb73e56cf444c53f254fc12a1 /arch/arm/boot/dts/Makefile
parent03d6d706a20b2b456a11cb898b62c45ec9310b32 (diff)
parentf3022c6ca06e0b8d8e77c94da1af5f41210e52ba (diff)
downloadlinux-58d2bc7b29fe1fe1a50fd0d318d2be800331eaf2.tar.xz
Merge tag 'sunxi-dt-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
Pull "Allwinner DT additions for 4.1, take 1" from Maxime Ripard: All the device tree related changes for the 4.1 merge window. It has a rather big diffstat, because of a lot of mechanical and harmless changes, as described below. There is mostly: - The end of the DT relicensing. All our DT should now be under the dual X11/GPL license. - Convertion of all the DT to a label based syntax, instead of duplicating the tree like was done before. - Rework of the A10s and A13 DTSI to share the common devices - A few drivers enablings: A80 USB, the A31 PMIC, A31 and A23 arch timers, etc - Fix the checkpatch warnings - A few new boards : cubieboard4, mele i7, utoo p66, auxtex t004, pcduino3 nano, gemei G9, mk808c, jesurun q5, orange pi, orange pi mini * tag 'sunxi-dt-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (84 commits) ARM: sunxi: dt: Split the SPI pinctrl groups ARM: sunxi: dt: Fix whitespace errors ARM: sunxi: DT: Fix lines over 80 characters ARM: sunxi: dt: Remove the FSF address ARM: sunxi: dts: split IR pins for A10 and A20 ARM: sun7i: dt: Add new MK808C device ARM: dts: sun6i: Set PLL6 as parent to AHB1 clock in AHB1 clock node ARM: dts: sunxi: Update ahb clocks for sun5i and sun7i ARM: dts: sun7i: Add dts file for the Jesurun Q5 top set box ARM: dts: sun5i: Enable touchscreen on Utoo P66 ARM: dts: sun7i: Add dts file for the Orangepi mini SBC ARM: dts: sun7i: Add dts file for the Orangepi SBC ARM: dts: sun7i: Add A20 SRAM and SRAM controller ARM: dts: sun5i: Add A13 and A10s SRAM and SRAM controller ARM: dts: sun4i: Add A10 SRAM and SRAM controller ARM: dts: sun5i: Add broken-hpi property for Utoo-P66 eMMC ARM: sun8i: dt: Enable A23 SMP support ARM: dts: sun6i: Add cpu thermal zones to dtsi ARM: dts: sun6i: Add cpu clock reference and operating points to dtsi ARM: sunxi: DT: Add stdout-path property ...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile23
1 files changed, 17 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index abcbbe9a323b..49b2bf7673e7 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -527,26 +527,31 @@ dtb-$(CONFIG_MACH_SUN4I) += \
sun4i-a10-ba10-tvbox.dtb \
sun4i-a10-chuwi-v7-cw0825.dtb \
sun4i-a10-cubieboard.dtb \
+ sun4i-a10-gemei-g9.dtb \
+ sun4i-a10-hackberry.dtb \
+ sun4i-a10-hyundai-a7hd.dtb \
+ sun4i-a10-inet97fv2.dtb \
+ sun4i-a10-jesurun-q5.dtb \
sun4i-a10-marsboard.dtb \
sun4i-a10-mini-xplus.dtb \
sun4i-a10-mk802.dtb \
sun4i-a10-mk802ii.dtb \
- sun4i-a10-hackberry.dtb \
- sun4i-a10-hyundai-a7hd.dtb \
- sun4i-a10-inet97fv2.dtb \
sun4i-a10-olinuxino-lime.dtb \
sun4i-a10-pcduino.dtb
dtb-$(CONFIG_MACH_SUN5I) += \
+ sun5i-a10s-auxtek-t004.dtb \
sun5i-a10s-mk802.dtb \
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
+ sun5i-a13-olinuxino-micro.dtb \
+ sun5i-a13-utoo-p66.dtb
dtb-$(CONFIG_MACH_SUN6I) += \
sun6i-a31-app4-evb1.dtb \
sun6i-a31-colombus.dtb \
sun6i-a31-hummingbird.dtb \
+ sun6i-a31-i7.dtb \
sun6i-a31-m9.dtb \
sun6i-a31s-cs908.dtb
dtb-$(CONFIG_MACH_SUN7I) += \
@@ -557,15 +562,21 @@ dtb-$(CONFIG_MACH_SUN7I) += \
sun7i-a20-hummingbird.dtb \
sun7i-a20-i12-tvbox.dtb \
sun7i-a20-m3.dtb \
+ sun7i-a20-mk808c.dtb \
sun7i-a20-olinuxino-lime.dtb \
sun7i-a20-olinuxino-lime2.dtb \
sun7i-a20-olinuxino-micro.dtb \
- sun7i-a20-pcduino3.dtb
+ sun7i-a20-orangepi.dtb \
+ sun7i-a20-orangepi-mini.dtb \
+ sun7i-a20-pcduino3.dtb \
+ sun7i-a20-pcduino3-nano.dtb \
+ sun7i-a20-wexler-tab7200.dtb
dtb-$(CONFIG_MACH_SUN8I) += \
sun8i-a23-ippo-q8h-v5.dtb \
sun8i-a23-ippo-q8h-v1.2.dtb
dtb-$(CONFIG_MACH_SUN9I) += \
- sun9i-a80-optimus.dtb
+ sun9i-a80-optimus.dtb \
+ sun9i-a80-cubieboard4.dtb
dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
tegra20-harmony.dtb \
tegra20-iris-512.dtb \