Merge branch 'CR_9827_dts_6.1_hal.feng' into 'vf2-6.1.y-devel'

CR_9827_dts_6.1_hal.feng See merge request sbc/linux!201
starfive-tech · Mar 22, 2024 · 54b0973 · 54b0973
2 parents b58fedd + 1cc2b6a
commit 54b0973
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git 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/...dts/starfive/jh7110-visionfive-v2-A10.dts → ...five/jh7110-starfive-visionfive-2-A10.dts b/...dts/starfive/jh7110-visionfive-v2-A10.dts → ...five/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/...dts/starfive/jh7110-visionfive-v2-A11.dts → ...five/jh7110-starfive-visionfive-2-A11.dts b/...dts/starfive/jh7110-visionfive-v2-A11.dts → ...five/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/...s/starfive/jh7110-visionfive-v2-ac108.dts → ...ve/jh7110-starfive-visionfive-2-ac108.dts b/...s/starfive/jh7110-visionfive-v2-ac108.dts → ...ve/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/...dts/starfive/jh7110-visionfive-v2-tdm.dts → ...five/jh7110-starfive-visionfive-2-tdm.dts b/...dts/starfive/jh7110-visionfive-v2-tdm.dts → ...five/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/...oot/dts/starfive/jh7110-visionfive-v2.dts → ...ve/jh7110-starfive-visionfive-2-v1.3b.dts b/...oot/dts/starfive/jh7110-visionfive-v2.dts → ...ve/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/.../starfive/jh7110-visionfive-v2-wm8960.dts → ...e/jh7110-starfive-visionfive-2-wm8960.dts b/.../starfive/jh7110-visionfive-v2-wm8960.dts → ...e/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/...ot/dts/starfive/jh7110-visionfive-v2.dtsi → ...tarfive/jh7110-starfive-visionfive-2.dtsi b/...ot/dts/starfive/jh7110-visionfive-v2.dtsi → ...tarfive/jh7110-starfive-visionfive-2.dtsi