OSDN Git Service

Merge tag 'v4.20-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 4 Oct 2018 14:41:12 +0000 (16:41 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 4 Oct 2018 14:41:16 +0000 (16:41 +0200)
commit5140512d5be501e09171deef16e03087f57ef980
tree6e43e550c74b98af4b1b66b25d9545ad721d3089
parent22b9292141aa791d8182514da9ba780e7ea09528
parent186b45657b244ce865e01b65d73868a48252e1ff
Merge tag 'v4.20-rockchip-dts32-1' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt

Nodes for the newly support rk3188 display controller, a fix for a new
dtc warning, gpio setting for the sdmmc regulator on radxarock and a
new board the "S" variant of the rk3288-based Tinker board, that sports
an added emmc.

* tag 'v4.20-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add rk3288-based Tinker board S
  ARM: dts: rockchip: move shared tinker-board nodes to a common dtsi
  ARM: dts: rockchip: explicitly set vcc_sd0 pin to gpio on rk3188-radxarock
  ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036
  ARM: dts: rockchip: add rk3188 lcd controller nodes

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Documentation/devicetree/bindings/arm/rockchip.txt
arch/arm/boot/dts/Makefile