diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2024-03-22 15:27:58 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2024-03-22 15:27:58 +0300 |
| commit | a61d1d826ca3060fd76ab31d37c691fc09b52fc0 (patch) | |
| tree | 1b515e814c0f256a1da6de829b97da93da9dfd42 | |
| parent | 03babe663372fa12ee6aab3f2e9ea856811dbfb8 (diff) | |
| parent | daba99e4fded182f1f235a124aec05478c5dfb3b (diff) | |
| download | linux-JH7110_VisionFive2_devel.tar.xz | |
Merge branch 'CR_9827_dts_hal.feng' into 'vf2-515-devel'JH7110_VF2_515_v5.12.0JH7110_VisionFive2_devel
CR_9827_dts_hal.feng
See merge request sbc/linux!200
| -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-sof-wm8960.dts (renamed from arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-sof-wm8960.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 9919dcdb9839..75b3d593c783 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-fpga.dtb \ jh7110-evb-can-pdm-pwmdac.dtb \ @@ -12,8 +12,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-sof-wm8960.dtb \ - jh7110-visionfive-v2-ac108.dtb + jh7110-starfive-visionfive-2-A10.dtb \ + jh7110-starfive-visionfive-2-A11.dtb \ + jh7110-starfive-visionfive-2-wm8960.dtb \ + jh7110-starfive-visionfive-2-sof-wm8960.dtb \ + jh7110-starfive-visionfive-2-ac108.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 db63f870ff28..6c4e1175f5c1 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 72fdf7fef26d..8805a6b32e75 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 0dbcf21f0cdd..caeb0e5fe4ad 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-sof-wm8960.dts b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-sof-wm8960.dts index 8be56ab74e3b..4f0cd506159f 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-sof-wm8960.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-sof-wm8960.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include "jh7110-visionfive-v2.dts" +#include "jh7110-starfive-visionfive-2-v1.3b.dts" #include "codecs/sof_wm8960.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 2cdf93d849d6..e0b5736c6312 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 7403e13413b0..99fa15d1ee47 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 32629bb82be0..32629bb82be0 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi |