]> git.dujemihanovic.xyz Git - u-boot.git/commit
arm: dts: sync the Rockhip 3399 SoCs from Linux
authorPeter Robinson <pbrobinson@gmail.com>
Thu, 22 Jul 2021 15:20:42 +0000 (16:20 +0100)
committerKever Yang <kever.yang@rock-chips.com>
Thu, 12 Aug 2021 01:33:13 +0000 (09:33 +0800)
commit822556a93459336c86da09238337b8a8ed217f50
tree998c50fc859ee0b8fe7e70c37912b3cc773c4b55
parent09cf0124675336007a41ed0c2c721f600cf76dc2
arm: dts: sync the Rockhip 3399 SoCs from Linux

Sync the rk3399 DTs and associated bits from 5.14-rc1.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
(Remove the conflict content for vmarc-som)
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
25 files changed:
arch/arm/dts/rk3399-evb.dts
arch/arm/dts/rk3399-ficus.dts
arch/arm/dts/rk3399-firefly.dts
arch/arm/dts/rk3399-gru.dtsi
arch/arm/dts/rk3399-khadas-edge.dtsi
arch/arm/dts/rk3399-leez-p710.dts
arch/arm/dts/rk3399-nanopc-t4.dts
arch/arm/dts/rk3399-nanopi-r4s.dts
arch/arm/dts/rk3399-nanopi4.dtsi
arch/arm/dts/rk3399-opp.dtsi
arch/arm/dts/rk3399-orangepi.dts
arch/arm/dts/rk3399-pinebook-pro.dts
arch/arm/dts/rk3399-puma-haikou.dts
arch/arm/dts/rk3399-puma.dtsi
arch/arm/dts/rk3399-roc-pc-mezzanine.dts
arch/arm/dts/rk3399-roc-pc.dtsi
arch/arm/dts/rk3399-rock-pi-4.dtsi
arch/arm/dts/rk3399-rock-pi-4a.dts
arch/arm/dts/rk3399-rock-pi-4b.dts
arch/arm/dts/rk3399-rock-pi-4c.dts
arch/arm/dts/rk3399-rock960.dts
arch/arm/dts/rk3399-rock960.dtsi
arch/arm/dts/rk3399-rockpro64.dtsi
arch/arm/dts/rk3399.dtsi
arch/arm/dts/rk3399pro-vmarc-som.dtsi