113 lines
6.9 KiB
Diff
113 lines
6.9 KiB
Diff
From 316b4c41ad3b18cdeb4708ac5ca2081ae2bb2c85 Mon Sep 17 00:00:00 2001
|
|
From: Stephen <stephen@vamrs.com>
|
|
Date: Thu, 30 May 2019 17:20:59 +0800
|
|
Subject: [PATCH 56/97] change the position of rockpi4 devicetree overlay files
|
|
|
|
Signed-off-by: Stephen <stephen@vamrs.com>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/Makefile | 4 ++--
|
|
.../boot/dts/rockchip/{overlays => overlays-rockpi4}/Makefile | 2 +-
|
|
.../boot/dts/rockchip/{overlays => overlays-rockpi4}/README | 0
|
|
.../{overlays => overlays-rockpi4}/at24c02-overlay.dts | 0
|
|
.../console-on-ttyS2-overlay.dts | 0
|
|
.../console-on-ttyS4-overlay.dts | 0
|
|
.../{overlays => overlays-rockpi4}/devspi1-overlay.dts | 0
|
|
.../{overlays => overlays-rockpi4}/devspi2-overlay.dts | 0
|
|
.../dts/rockchip/{overlays => overlays-rockpi4}/hw_intfc.conf | 0
|
|
.../{overlays => overlays-rockpi4}/pcie-gen2-overlay.dts | 0
|
|
.../spi1-waveshare35b-v2-overlay.dts | 0
|
|
.../spi1-waveshare35c-overlay.dts | 0
|
|
.../{overlays => overlays-rockpi4}/two-color-led-overlay.dts | 0
|
|
13 files changed, 3 insertions(+), 3 deletions(-)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/Makefile (89%)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/README (100%)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/at24c02-overlay.dts (100%)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/console-on-ttyS2-overlay.dts (100%)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/console-on-ttyS4-overlay.dts (100%)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/devspi1-overlay.dts (100%)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/devspi2-overlay.dts (100%)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/hw_intfc.conf (100%)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/pcie-gen2-overlay.dts (100%)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/spi1-waveshare35b-v2-overlay.dts (100%)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/spi1-waveshare35c-overlay.dts (100%)
|
|
rename arch/arm64/boot/dts/rockchip/{overlays => overlays-rockpi4}/two-color-led-overlay.dts (100%)
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
|
|
index 9aa944b743e2..8b6fa16faf51 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
|
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
|
@@ -90,11 +90,11 @@ dtstree := $(srctree)/$(src)
|
|
dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
|
|
|
|
always := $(dtb-y)
|
|
-subdir-y := $(dts-dirs) overlays
|
|
+subdir-y := $(dts-dirs) overlays-rockpi4
|
|
clean-files := *.dtb
|
|
|
|
# Enable fixups to support overlays on ROCK Pi platforms
|
|
ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
|
|
DTC_FLAGS ?= -@ -H epapr
|
|
- dts-dirs += overlays
|
|
+ dts-dirs += overlays-rockpi4
|
|
endif
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/Makefile b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/Makefile
|
|
similarity index 89%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/Makefile
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/Makefile
|
|
index d5d8f9daff46..fa22f1b499ef 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/overlays/Makefile
|
|
+++ b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/Makefile
|
|
@@ -1,4 +1,4 @@
|
|
-# Overlays for the ROCK Pi platform
|
|
+# Overlays for the ROCK Pi 4 platform
|
|
|
|
dtbo-$(CONFIG_ARCH_ROCKCHIP) += \
|
|
console-on-ttyS4.dtbo \
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/README b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/README
|
|
similarity index 100%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/README
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/README
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/at24c02-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/at24c02-overlay.dts
|
|
similarity index 100%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/at24c02-overlay.dts
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/at24c02-overlay.dts
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/console-on-ttyS2-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/console-on-ttyS2-overlay.dts
|
|
similarity index 100%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/console-on-ttyS2-overlay.dts
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/console-on-ttyS2-overlay.dts
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/console-on-ttyS4-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/console-on-ttyS4-overlay.dts
|
|
similarity index 100%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/console-on-ttyS4-overlay.dts
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/console-on-ttyS4-overlay.dts
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/devspi1-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/devspi1-overlay.dts
|
|
similarity index 100%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/devspi1-overlay.dts
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/devspi1-overlay.dts
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/devspi2-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/devspi2-overlay.dts
|
|
similarity index 100%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/devspi2-overlay.dts
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/devspi2-overlay.dts
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/hw_intfc.conf b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/hw_intfc.conf
|
|
similarity index 100%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/hw_intfc.conf
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/hw_intfc.conf
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/pcie-gen2-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/pcie-gen2-overlay.dts
|
|
similarity index 100%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/pcie-gen2-overlay.dts
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/pcie-gen2-overlay.dts
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/spi1-waveshare35b-v2-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/spi1-waveshare35b-v2-overlay.dts
|
|
similarity index 100%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/spi1-waveshare35b-v2-overlay.dts
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/spi1-waveshare35b-v2-overlay.dts
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/spi1-waveshare35c-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/spi1-waveshare35c-overlay.dts
|
|
similarity index 100%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/spi1-waveshare35c-overlay.dts
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/spi1-waveshare35c-overlay.dts
|
|
diff --git a/arch/arm64/boot/dts/rockchip/overlays/two-color-led-overlay.dts b/arch/arm64/boot/dts/rockchip/overlays-rockpi4/two-color-led-overlay.dts
|
|
similarity index 100%
|
|
rename from arch/arm64/boot/dts/rockchip/overlays/two-color-led-overlay.dts
|
|
rename to arch/arm64/boot/dts/rockchip/overlays-rockpi4/two-color-led-overlay.dts
|
|
--
|
|
2.25.1
|
|
|