diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 22:29:28 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 22:29:28 +0300 |
| commit | 74386da41d49bad0efc00ff41960067747098bff (patch) | |
| tree | 747cd03e205534ab4d00b83e5723746c9996b958 /arch/arm/boot/dts/Makefile | |
| parent | 69c8e667ff1a5702d7908db430ac091bd14a1cdb (diff) | |
| parent | 2367cee5fda1e9ebc605b13175492b31030acd9d (diff) | |
| download | linux-74386da41d49bad0efc00ff41960067747098bff.tar.xz | |
Merge tag 'sunxi-dt-for-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
Allwinner DT changes for 4.5
Allwinner device-tree related patches for the 4.5 merge window.
* Support for the H3
* Addition of the RSB to the relevant devices (sun8i, sun9i)
* Addition of the Video Engine clocks for the older SoCs (sun4i, sun7i)
* Addition of the DRAM gates for the older SoCs (sun4i, sun7i)
* Addition of the audio codec to a bunch of boards
* New board: ICNova SWAC
* tag 'sunxi-dt-for-4.5' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (40 commits)
ARM: dts: sun7i: Olimex A20-SOM-EVB: Enable mmc3 (baseboard SD socket)
ARM: dts: sun7i: Olimex A20-SOM-EVB: Add LRADC keys
ARM: dts: sun9i: cubieboard4: Enable Reduced Serial Bus controller
ARM: dts: sun9i: cubieboard4: Enable consumer IR receiver
ARM: dts: sun9i: cubieboard4: Enable LEDs
ARM: dts: sun7i: Add VE (Video Engine) module clock node
ARM: dts: sun4i: Add VE (Video Engine) module clock node
ARM: dts: sun8i: Add Orange Pi Plus support
ARM: dts: sunxi: Add Allwinner H3 DTSI
ARM: dts: sun7i: Add DRAM gates
ARM: dts: sun4i: Add DRAM gates
ARM: dts: sun9i: Add NMI controller device node
ARM: dts: sun9i: optimus: Enable Reduced Serial Bus controller
ARM: dts: sun9i: Add Reduced Serial Bus controller device node to A80 dtsi
ARM: dts: sun9i: optimus: Enable consumer IR receiver
ARM: dts: sun9i: Add consumer IR receiver device node and pinmux settings
ARM: dts: sun9i: optimus: Enable LED3
ARM: dts: sun9i: Add A80 R_PIO pin controller device node
ARM: dts: sun9i: Add TODO comments for the main and low power clocks
ARM: dts: sun9i: Add A80 PRCM clocks and reset control 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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 840dec17a708..be599a30fedf 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -651,6 +651,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-cubietruck.dtb \ sun7i-a20-hummingbird.dtb \ sun7i-a20-i12-tvbox.dtb \ + sun7i-a20-icnova-swac.dtb \ sun7i-a20-m3.dtb \ sun7i-a20-mk808c.dtb \ sun7i-a20-olimex-som-evb.dtb \ @@ -673,7 +674,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-a33-ga10h-v1.1.dtb \ sun8i-a33-ippo-q8h-v1.2.dtb \ sun8i-a33-q8-tablet.dtb \ - sun8i-a33-sinlinx-sina33.dtb + sun8i-a33-sinlinx-sina33.dtb \ + sun8i-h3-orangepi-plus.dtb dtb-$(CONFIG_MACH_SUN9I) += \ sun9i-a80-optimus.dtb \ sun9i-a80-cubieboard4.dtb |