summaryrefslogtreecommitdiff
path: root/arch/arm/dts/rk3399-roc-pc.dts
diff options
context:
space:
mode:
authorJagan Teki <jagan@amarulasolutions.com>2020-04-28 15:30:17 +0530
committerKever Yang <kever.yang@rock-chips.com>2020-05-01 18:32:56 +0800
commit167efc2c7a46fdac69be545ae5dbfb66edb4fd01 (patch)
tree8e2c1c42247e144c8d29edb73777e4b169b695f8 /arch/arm/dts/rk3399-roc-pc.dts
parent96993d7c358e9d87871a3c92fb3af081b2e3ff48 (diff)
arm64: dts: rk3399: Sync v5.7-rc1 from Linux
Sync rk3399 dts(i) files from v5.7-rc1 linux-next. Reason: To get updated PCIe nodes and properties on respective dts(i) files. Summary: - sync won't include new board dts(i) - sync will add required files used on respective dts(i) - rk3399-puma-u-boot.dtsi spiflash label changed to norflash - move puma.dtsi bios_enable into rk3399-puma-u-boot.dtsi - move legacy max-frequency of sdhci into rk3399-u-boot.dtsi - update cross-ec-[keyboard|sbs].dtsi path as per U-Boot - keep roc-rk3399-pc dc_12v changes to -u-boot.dtsi Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Diffstat (limited to 'arch/arm/dts/rk3399-roc-pc.dts')
-rw-r--r--arch/arm/dts/rk3399-roc-pc.dts3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/dts/rk3399-roc-pc.dts b/arch/arm/dts/rk3399-roc-pc.dts
index 6a909e4eef..cd41954253 100644
--- a/arch/arm/dts/rk3399-roc-pc.dts
+++ b/arch/arm/dts/rk3399-roc-pc.dts
@@ -8,6 +8,5 @@
/ {
model = "Firefly ROC-RK3399-PC Board";
- compatible = "libretech,roc-rk3399-pc", "firefly,roc-rk3399-pc",
- "rockchip,rk3399";
+ compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
};