| Message ID | 20210727012319.1024276-1-art@khadas.com |
|---|---|
| State | Accepted, archived |
| Commit | e10481be1e7bc835aa8a3bd01037216ad7797140 |
| Delegated to: | Neil Armstrong |
| Headers | show |
| Series | ARM: dts: meson: Use devicetree for SMBIOS settings for Khadas VIM boards | expand |
On 27/07/2021 03:23, Artem Lapkin wrote: > Khadas vim series: Use devicetree for SMBIOS settings > Add settings and enable the default sysinfo driver so that these can come > from the device tree. > > Reviewed-by: Neil Armstrong <narmstrong@baylibre.com> > Signed-off-by: Artem Lapkin <art@khadas.com> > --- > .../meson-g12b-a311d-khadas-vim3-u-boot.dtsi | 23 +++++++++++++++++++ > .../meson-gxl-s905x-khadas-vim-u-boot.dtsi | 23 +++++++++++++++++++ > .../arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi | 21 +++++++++++++++++ > .../dts/meson-sm1-khadas-vim3l-u-boot.dtsi | 23 +++++++++++++++++++ > 4 files changed, 90 insertions(+) > > diff --git a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi > index 489efa15..fcd6f053 100644 > --- a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi > +++ b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi > @@ -6,3 +6,26 @@ > > #include "meson-g12-common-u-boot.dtsi" > #include "meson-khadas-vim3-u-boot.dtsi" > + > +/ { > + smbios { > + compatible = "u-boot,sysinfo-smbios"; > + > + smbios { > + system { > + manufacturer = "khadas"; > + product = "VIM3"; > + }; > + > + baseboard { > + manufacturer = "khadas"; > + product = "VIM3"; > + }; > + > + chassis { > + manufacturer = "khadas"; > + product = "VIM3"; > + }; > + }; > + }; > +}; > diff --git a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi > index 39270ea7..20e36d1b 100644 > --- a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi > +++ b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi > @@ -5,3 +5,26 @@ > */ > > #include "meson-gxl-u-boot.dtsi" > + > +/ { > + smbios { > + compatible = "u-boot,sysinfo-smbios"; > + > + smbios { > + system { > + manufacturer = "khadas"; > + product = "VIM"; > + }; > + > + baseboard { > + manufacturer = "khadas"; > + product = "VIM"; > + }; > + > + chassis { > + manufacturer = "khadas"; > + product = "VIM"; > + }; > + }; > + }; > +}; > diff --git a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi > index c1763336..41480c9a 100644 > --- a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi > +++ b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi > @@ -10,6 +10,27 @@ > aliases { > spi0 = &spifc; > }; > + > + smbios { > + compatible = "u-boot,sysinfo-smbios"; > + > + smbios { > + system { > + manufacturer = "khadas"; > + product = "VIM2"; > + }; > + > + baseboard { > + manufacturer = "khadas"; > + product = "VIM2"; > + }; > + > + chassis { > + manufacturer = "khadas"; > + product = "VIM2"; > + }; > + }; > + }; > }; > > &sd_emmc_c { > diff --git a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi > index a591c0c9..06b81f23 100644 > --- a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi > +++ b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi > @@ -6,3 +6,26 @@ > > #include "meson-sm1-u-boot.dtsi" > #include "meson-khadas-vim3-u-boot.dtsi" > + > +/ { > + smbios { > + compatible = "u-boot,sysinfo-smbios"; > + > + smbios { > + system { > + manufacturer = "khadas"; > + product = "VIM3L"; > + }; > + > + baseboard { > + manufacturer = "khadas"; > + product = "VIM3L"; > + }; > + > + chassis { > + manufacturer = "khadas"; > + product = "VIM3L"; > + }; > + }; > + }; > +}; > Applied to u-boot-amlogic, Thanks, Neil
diff --git a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi index 489efa15..fcd6f053 100644 --- a/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi +++ b/arch/arm/dts/meson-g12b-a311d-khadas-vim3-u-boot.dtsi @@ -6,3 +6,26 @@ #include "meson-g12-common-u-boot.dtsi" #include "meson-khadas-vim3-u-boot.dtsi" + +/ { + smbios { + compatible = "u-boot,sysinfo-smbios"; + + smbios { + system { + manufacturer = "khadas"; + product = "VIM3"; + }; + + baseboard { + manufacturer = "khadas"; + product = "VIM3"; + }; + + chassis { + manufacturer = "khadas"; + product = "VIM3"; + }; + }; + }; +}; diff --git a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi index 39270ea7..20e36d1b 100644 --- a/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi +++ b/arch/arm/dts/meson-gxl-s905x-khadas-vim-u-boot.dtsi @@ -5,3 +5,26 @@ */ #include "meson-gxl-u-boot.dtsi" + +/ { + smbios { + compatible = "u-boot,sysinfo-smbios"; + + smbios { + system { + manufacturer = "khadas"; + product = "VIM"; + }; + + baseboard { + manufacturer = "khadas"; + product = "VIM"; + }; + + chassis { + manufacturer = "khadas"; + product = "VIM"; + }; + }; + }; +}; diff --git a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi index c1763336..41480c9a 100644 --- a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi +++ b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi @@ -10,6 +10,27 @@ aliases { spi0 = &spifc; }; + + smbios { + compatible = "u-boot,sysinfo-smbios"; + + smbios { + system { + manufacturer = "khadas"; + product = "VIM2"; + }; + + baseboard { + manufacturer = "khadas"; + product = "VIM2"; + }; + + chassis { + manufacturer = "khadas"; + product = "VIM2"; + }; + }; + }; }; &sd_emmc_c { diff --git a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi index a591c0c9..06b81f23 100644 --- a/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi +++ b/arch/arm/dts/meson-sm1-khadas-vim3l-u-boot.dtsi @@ -6,3 +6,26 @@ #include "meson-sm1-u-boot.dtsi" #include "meson-khadas-vim3-u-boot.dtsi" + +/ { + smbios { + compatible = "u-boot,sysinfo-smbios"; + + smbios { + system { + manufacturer = "khadas"; + product = "VIM3L"; + }; + + baseboard { + manufacturer = "khadas"; + product = "VIM3L"; + }; + + chassis { + manufacturer = "khadas"; + product = "VIM3L"; + }; + }; + }; +};