From: Arnd Bergmann Date: Mon, 18 Feb 2019 10:18:58 +0000 (+0100) Subject: Merge tag 'v5.1-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.1-rc1~157^2~11 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e88dc153eed290e786ae89386a82d3065a04e210;p=linux-block.git Merge tag 'v5.1-rockchip-dts64-2' of git://git./linux/kernel/git/mmind/linux-rockchip into arm/dt rockpro64 regulator improvements, rock960 improvements (tsadc, wifi, hdmi audio), nanopi4 bluetooth support and rk3328-roc-cc gmac improvement. * tag 'v5.1-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: Enable tsadc device on rock960 arm64: dts: rockchip: Add on-board WiFi/BT support for Rock960 boards arm64: dts: rockchip: fix rk3328-roc-cc gmac2io stability issues arm64: dts: rockchip: rockpro64 dts add usb regulator arm64: dts: rockchip: rockpro64 dts remove unused lcd-reset pinmux arm64: dts: rockchip: rockpro64 dts make regulator more readable arm64: dts: rockchip: Add nanopi4 bluetooth arm64: dts: rockchip: enable mali power supply on rk3399-rockpro64 arm64: dts: rockchip: Enable HDMI audio devices on rk3399-rock960 Signed-off-by: Arnd Bergmann --- e88dc153eed290e786ae89386a82d3065a04e210