| Message ID | 20240110201757.983435-1-aurelien@aurel32.net |
|---|---|
| State | Accepted |
| Commit | 465e7e6d506a419ab12ed0817d8f083d43584602 |
| Delegated to: | Andes |
| Headers | show |
| Series | board: starfive: handle compatible property in dynamic DT configuration | expand |
Gentle ping. Note that the maintainer address bounces, I am not sure it is still valid. Thanks On 2024-01-10 21:17, Aurelien Jarno wrote: > The difference between the StarFive VisionFive 2 1.2A and 1.3B boards is > handled dynamically by looking at the PCB version in the EEPROM in order > to have a single u-boot version for both versions of the board. While > the "model" property is correctly handled, the "compatible" one is > always the the one of version 1.3b. > > This patch add support for dynamically configuring that property. > > Fixes: 9b7060bd15e7 ("riscv: dts: jh7110: Combine the board device tree files of 1.2A and 1.3B") > > Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> > --- > board/starfive/visionfive2/spl.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c > index 336f0cdfc9..911add429d 100644 > --- a/board/starfive/visionfive2/spl.c > +++ b/board/starfive/visionfive2/spl.c > @@ -61,11 +61,13 @@ static const struct starfive_vf2_pro starfive_verb[] = { > > void spl_fdt_fixup_version_a(void *fdt) > { > + static const char compat[] = "starfive,visionfive-2-v1.2a\0starfive,jh7110"; > u32 phandle; > u8 i; > int offset; > int ret; > > + fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat)); > fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", > "StarFive VisionFive 2 v1.2A"); > > @@ -106,11 +108,13 @@ void spl_fdt_fixup_version_a(void *fdt) > > void spl_fdt_fixup_version_b(void *fdt) > { > + static const char compat[] = "starfive,visionfive-2-v1.3b\0starfive,jh7110"; > u32 phandle; > u8 i; > int offset; > int ret; > > + fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat)); > fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", > "StarFive VisionFive 2 v1.3B"); > > -- > 2.42.0 > >
On Wed, Jan 10, 2024 at 09:17:44PM +0100, Aurelien Jarno wrote: > The difference between the StarFive VisionFive 2 1.2A and 1.3B boards is > handled dynamically by looking at the PCB version in the EEPROM in order > to have a single u-boot version for both versions of the board. While > the "model" property is correctly handled, the "compatible" one is > always the the one of version 1.3b. > > This patch add support for dynamically configuring that property. > > Fixes: 9b7060bd15e7 ("riscv: dts: jh7110: Combine the board device tree files of 1.2A and 1.3B") > > Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> > --- > board/starfive/visionfive2/spl.c | 4 ++++ > 1 file changed, 4 insertions(+) Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
diff --git a/board/starfive/visionfive2/spl.c b/board/starfive/visionfive2/spl.c index 336f0cdfc9..911add429d 100644 --- a/board/starfive/visionfive2/spl.c +++ b/board/starfive/visionfive2/spl.c @@ -61,11 +61,13 @@ static const struct starfive_vf2_pro starfive_verb[] = { void spl_fdt_fixup_version_a(void *fdt) { + static const char compat[] = "starfive,visionfive-2-v1.2a\0starfive,jh7110"; u32 phandle; u8 i; int offset; int ret; + fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat)); fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", "StarFive VisionFive 2 v1.2A"); @@ -106,11 +108,13 @@ void spl_fdt_fixup_version_a(void *fdt) void spl_fdt_fixup_version_b(void *fdt) { + static const char compat[] = "starfive,visionfive-2-v1.3b\0starfive,jh7110"; u32 phandle; u8 i; int offset; int ret; + fdt_setprop(fdt, fdt_path_offset(fdt, "/"), "compatible", compat, sizeof(compat)); fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", "StarFive VisionFive 2 v1.3B");
The difference between the StarFive VisionFive 2 1.2A and 1.3B boards is handled dynamically by looking at the PCB version in the EEPROM in order to have a single u-boot version for both versions of the board. While the "model" property is correctly handled, the "compatible" one is always the the one of version 1.3b. This patch add support for dynamically configuring that property. Fixes: 9b7060bd15e7 ("riscv: dts: jh7110: Combine the board device tree files of 1.2A and 1.3B") Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> --- board/starfive/visionfive2/spl.c | 4 ++++ 1 file changed, 4 insertions(+)