summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHal Feng <hal.feng@starfivetech.com>2024-03-14 09:07:09 +0300
committerHal Feng <hal.feng@starfivetech.com>2024-03-14 10:13:49 +0300
commit1cc2b6ad05806464b30405eab71a9eaf15d9eb08 (patch)
tree9b22d2fa990deedcd7dafae6c26f4c9c6be7d8b6
parent1be1d44b948cd3237326e1bfb64821f4425226b9 (diff)
downloadlinux-1cc2b6ad05806464b30405eab71a9eaf15d9eb08.tar.xz
riscv: dts: starfive: visionfive2: Rename jh7110-visionfive-v2-*.dts to jh7110-starfive-visionfive-2-*.dts
Rename the dts file, for sync with Linux mainline. Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
-rw-r--r--arch/riscv/boot/dts/starfive/Makefile12
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-A10.dts (renamed from arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-A10.dts)2
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-A11.dts (renamed from arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-A11.dts)2
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-ac108.dts (renamed from arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-ac108.dts)2
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-tdm.dts (renamed from arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-tdm.dts)2
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts (renamed from arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts)2
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dts (renamed from arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-wm8960.dts)2
-rw-r--r--arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi (renamed from arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi)0
8 files changed, 12 insertions, 12 deletions
diff --git a/arch/riscv/boot/dts/starfive/Makefile b/arch/riscv/boot/dts/starfive/Makefile
index e180439adab3..cadd70841932 100644
--- a/arch/riscv/boot/dts/starfive/Makefile
+++ b/arch/riscv/boot/dts/starfive/Makefile
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
subdir-y += evb-overlay vf2-overlay
-dtb-$(CONFIG_SOC_STARFIVE_JH7110) += jh7110-visionfive-v2.dtb \
+dtb-$(CONFIG_SOC_STARFIVE_JH7110) += jh7110-starfive-visionfive-2-v1.3b.dtb \
jh7110-evb.dtb \
jh7110-evb-can-pdm-pwmdac.dtb \
jh7110-evb-dvp-rgb2hdmi.dtb \
@@ -11,8 +11,8 @@ dtb-$(CONFIG_SOC_STARFIVE_JH7110) += jh7110-visionfive-v2.dtb \
jh7110-evb-uart4-emmc-spdif.dtb \
jh7110-evb-uart5-pwm-i2c-tdm.dtb \
jh7110-evb-usbdevice.dtb \
- jh7110-visionfive-v2-A10.dtb \
- jh7110-visionfive-v2-A11.dtb \
- jh7110-visionfive-v2-wm8960.dtb \
- jh7110-visionfive-v2-ac108.dtb \
- jh7110-visionfive-v2-tdm.dtb
+ jh7110-starfive-visionfive-2-A10.dtb \
+ jh7110-starfive-visionfive-2-A11.dtb \
+ jh7110-starfive-visionfive-2-wm8960.dtb \
+ jh7110-starfive-visionfive-2-ac108.dtb \
+ jh7110-starfive-visionfive-2-tdm.dtb
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-A10.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-A10.dts
index fc99123baa3c..61169c769de2 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-A10.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-A10.dts
@@ -6,7 +6,7 @@
*/
/dts-v1/;
-#include "jh7110-visionfive-v2.dtsi"
+#include "jh7110-starfive-visionfive-2.dtsi"
/ {
model = "StarFive VisionFive V2";
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-A11.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-A11.dts
index 228807aebe67..021cc31cd9b2 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-A11.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-A11.dts
@@ -6,7 +6,7 @@
*/
/dts-v1/;
-#include "jh7110-visionfive-v2.dtsi"
+#include "jh7110-starfive-visionfive-2.dtsi"
/ {
model = "StarFive VisionFive V2";
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-ac108.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-ac108.dts
index d590513531da..9189b7ab2fa4 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-ac108.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-ac108.dts
@@ -5,7 +5,7 @@
*/
/dts-v1/;
-#include "jh7110-visionfive-v2.dts"
+#include "jh7110-starfive-visionfive-2-v1.3b.dts"
#include "codecs/sf_ac108.dtsi"
&i2c0 {
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-tdm.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-tdm.dts
index 1d8543a23c0e..2ad90bc76c54 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-tdm.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-tdm.dts
@@ -5,7 +5,7 @@
*/
/dts-v1/;
-#include "jh7110-visionfive-v2.dts"
+#include "jh7110-starfive-visionfive-2-v1.3b.dts"
#include "codecs/sf_tdm.dtsi"
&i2c0 {
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts
index 3bab214ad73b..13d683ac84de 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dts
@@ -5,7 +5,7 @@
*/
/dts-v1/;
-#include "jh7110-visionfive-v2.dtsi"
+#include "jh7110-starfive-visionfive-2.dtsi"
#include "codecs/sf_hdmi.dtsi"
/ {
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-wm8960.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dts
index dd6abc5177eb..fd2b9d6dec60 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-wm8960.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-wm8960.dts
@@ -5,7 +5,7 @@
*/
/dts-v1/;
-#include "jh7110-visionfive-v2.dts"
+#include "jh7110-starfive-visionfive-2-v1.3b.dts"
#include "codecs/sf_wm8960.dtsi"
&i2c0 {
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi
index 1014f0aa72c0..1014f0aa72c0 100644
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi