OSDN Git Service

Merge tag 'v5.1-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Mon, 18 Feb 2019 10:18:58 +0000 (11:18 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 18 Feb 2019 10:20:31 +0000 (11:20 +0100)
commite88dc153eed290e786ae89386a82d3065a04e210
tree9aac787a3a081bb910bee4de3c35eafb0e80f881
parentc22ae32d94e7c2dab789a132bca5c21dce3c70fe
parent02260a619efe574d0f6c2a4420b8b76c6802294e
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 <arnd@arndb.de>