diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2024-03-22 15:33:32 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2024-03-22 15:33:32 +0300 |
| commit | 54b09736222dcc3368f151a0a9f27992d680be95 (patch) | |
| tree | 486b19e9ee95a424f9901c014475991a643195d1 | |
| parent | b58fedd891e01755cf961d54b4684e4db81f7f47 (diff) | |
| parent | 1cc2b6ad05806464b30405eab71a9eaf15d9eb08 (diff) | |
| download | linux-JH7110_VisionFive2_6.1.y_devel.tar.xz | |
Merge branch 'CR_9827_dts_6.1_hal.feng' into 'vf2-6.1.y-devel'JH7110_VF2_6.1_v5.12.0JH7110_VisionFive2_6.1.y_devel
CR_9827_dts_6.1_hal.feng
See merge request sbc/linux!201
| -rw-r--r-- | arch/riscv/boot/dts/starfive/Makefile | 12 | ||||
| -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 |