diff options
| author | Olof Johansson <olof@lixom.net> | 2018-01-04 23:17:16 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-01-04 23:17:16 -0800 |
| commit | 5333aeb10132549c5893ce5822652ae2f3770d26 (patch) | |
| tree | e271ce39cf56e28923c0a096f3e509901731e402 /arch/arm/boot/dts/Makefile | |
| parent | 0e9288e003f496132cb7147ae006da69aa04d123 (diff) | |
| parent | 2ce3dc66d75fc204cc42bc4ee9c6f612ef4a8949 (diff) | |
Merge tag 'sunxi-dt-for-4.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/dt
Allwinner DT changes for 4.16
A random assortment of improvements.
GPIO device nodes are added for the AXP813/AXP818 PMICs, meaning we can
finally use the GPIO pins on the PMICs. The LDOs on the GPIO pins can
also be properly muxed and guarded.
EMAC Ethernet support is enabled for more H3 boards, and also for the
A83T, following the return of the bindings in 4.15, after a last minute
revert in 4.13. This will make the H3/A83T boards much more useful in
headless applications.
Two new boards are introduced. The Orange Pi R1 is a small board with
two Ethernet interfaces (one EMAC-based and one USB-based) and a WiFi
chip. This board is fully supported, with the exception of TV-out on
the expansion header, which will not be enabled by default. The WiFi
chip (RTL8189FTV) requires an out-of-tree driver. The Libre Computer
Board ALL-H3-CC H3 version is a newcomer to the Allwinner SBC space,
which was mostly represented by a bunch of fruit-Pis. It is mostly
supported, with the exception of HDMI and camera sensor interface,
which have not been implemented yet.
Two minor patches enable the audio codec on the A13 Olinuxino, and
HDMI output on the pcDuino3 Nano.
* tag 'sunxi-dt-for-4.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: dts: sun8i: h3: nanopi-m1-plus: fix missing ethernet 0 in aliases
ARM: dts: sun8i: h3: Enable dwmac-sun8i on the Nanopi M1
ARM: dts: sun7i: Enable HDMI on pcDuino3 Nano
ARM: dts: sun8i: a83t: Add I2C device nodes and pinmux settings
ARM: dts: sun8i: a83t: Add I2S controller device nodes
ARM: dts: sun8i-h3: Remove allwinner,leds-active-low for non internal PHY
ARM: dts: sun8i: a83t: Enable Ethernet on two boards
ARM: dts: sun8i: a83t: add dwmac-sun8i device node
ARM: dts: sun8i: h3: enable USB OTG for NanoPi Neo board
ARM: dts: sun8i: h3: Add dts file for Libre Computer Board ALL-H3-CC H3 ver.
ARM: dtsi: axp81x: set pinmux for GPIO0/1 when used as LDOs
ARM: dtsi: axp81x: add GPIO DT node
ARM: dts: sun8i: add support for Orange Pi R1
ARM: dts: sunxi: Add codec for A13 Olinuxino
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a5d8dcc4b2b6..5da0108883ab 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -951,9 +951,11 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-a83t-bananapi-m3.dtb \ sun8i-a83t-cubietruck-plus.dtb \ sun8i-a83t-tbs-a711.dtb \ + sun8i-h2-plus-orangepi-r1.dtb \ sun8i-h2-plus-orangepi-zero.dtb \ sun8i-h3-bananapi-m2-plus.dtb \ sun8i-h3-beelink-x2.dtb \ + sun8i-h3-libretech-all-h3-cc.dtb \ sun8i-h3-nanopi-m1.dtb \ sun8i-h3-nanopi-m1-plus.dtb \ sun8i-h3-nanopi-neo.dtb \ |