diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2016-07-07 14:46:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 14:46:48 +0200 |
| commit | 349f9d5239c3dae3b984679fc9ee00b8deec542b (patch) | |
| tree | 6ce43a989c567e1f040abd9d590d81a826d68a78 /arch/arm/boot/dts/Makefile | |
| parent | ARM: dts: Ux500: fix up TVK sensor data (diff) | |
| parent | ARM: dts: sun5i: Enable otg on the auxtex t004 (diff) | |
| download | linux-dev-349f9d5239c3dae3b984679fc9ee00b8deec542b.tar.xz linux-dev-349f9d5239c3dae3b984679fc9ee00b8deec542b.zip | |
Merge tag 'sunxi-dt-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
Merge "Allwinner DT changes for 4.8" from Maxime Ripard:
The usual amount of DT patches, among which:
- I2S support
- Support for the AXP809 in the relevant boards (A80 based)
- New boards: Banapi M1+, Banapi M2+, Allwinner Parrot (R16 EVB),
- The other patches to enable various controllers on our boards, most
notably USB OTG
* tag 'sunxi-dt-for-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (54 commits)
ARM: dts: sun5i: Enable otg on the auxtex t004
ARM: sun5i: Allow PLL3 2x fixed factor clock to change PLL3 rate
ARM: sun7i: Add DAI nodes
ARM: sun7i: Add mod1 clock nodes
ARM: dts: sun5i: Add mmc1 / sdio-wifi node to mk802
ARM: dts: sun5i: Add axp152 pmic node to mk802
ARM: dts: sun5i: Enable otg on the mk802
ARM: dts: sun7i: Add BCM53125 switch nodes to the lamobo-r1 board
ARM: sun8i: Add Parrot Board DTS
ARM: dts: sun5i: q8-common: Enable USB-based WiFi
ARM: dts: sun7i: Add dts file for Bananapi M1 Plus board
ARM: dts: sun8i-q8-common: Add support for USB wifi controllers
ARM: dts: sun9i: a80-optimus: Order nodes by alphabetical order
ARM: dts: sun9i: cubieboard4: Order nodes by alphabetical order
ARM: dts: sun7i: Add NFC node to Allwinner A20 SoC
ARM: dts: sun4i: Add NFC node to Allwinner A10 SoC
ARM: dts: sun6i: Add pmic / regulator nodes to Mele M9 dts
ARM: dts: sun6i: Add pmic / regulator nodes to Mele A1000G quad dts
ARM: dts: sun6i: The blue led on the Mele M9 is a power led
ARM: dts: sun6i: The blue led on the Mele A1000G quad is a power led
...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 276d9f6452b3..4464f7fa71bd 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -745,6 +745,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ sun6i-a31s-yones-toptech-bs1078-v2.dtb dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-bananapi.dtb \ + sun7i-a20-bananapi-m1-plus.dtb \ sun7i-a20-bananapro.dtb \ sun7i-a20-cubieboard2.dtb \ sun7i-a20-cubietruck.dtb \ @@ -782,7 +783,9 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-h3-orangepi-2.dtb \ sun8i-h3-orangepi-one.dtb \ sun8i-h3-orangepi-pc.dtb \ - sun8i-h3-orangepi-plus.dtb + sun8i-h3-orangepi-plus.dtb \ + sun8i-h3-sinovoip-bpi-m2-plus.dtb \ + sun8i-r16-parrot.dtb dtb-$(CONFIG_MACH_SUN9I) += \ sun9i-a80-optimus.dtb \ sun9i-a80-cubieboard4.dtb |