| Message ID | 1582868824-73870-1-git-send-email-christianshewitt@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 1f6857502902e4f582eed96dd0cc8a26e077a8de |
| Headers | show |
| Series | arm64: dts: meson: khadas-vim3: move model to g12b-khadas-vim3 dtsi | expand |
On 28/02/2020 06:47, Christian Hewitt wrote: > The common meson-khadas-vim3.dtsi is now shared with VIM3L so move the > VIM3 model namne to meson-g12b-khadas-vim3.dtsi. ---------------/\ name > > meson-sm1-khadas-vim3l.dts contains the VIM3L model name. > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > --- > arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 2 ++ > arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 2 -- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi > index 5548634..2b2d72c 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi > @@ -8,6 +8,8 @@ > #include <dt-bindings/sound/meson-g12a-tohdmitx.h> > > / { > + model = "Khadas VIM3"; > + > vddcpu_a: regulator-vddcpu-a { > /* > * MP8756GD Regulator. > diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi > index 90815fa..0ef60c7 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi > @@ -9,8 +9,6 @@ > #include <dt-bindings/gpio/meson-g12a-gpio.h> > > / { > - model = "Khadas VIM3"; > - > aliases { > serial0 = &uart_AO; > ethernet0 = ðmac; > With typo fixes: Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi index 5548634..2b2d72c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi @@ -8,6 +8,8 @@ #include <dt-bindings/sound/meson-g12a-tohdmitx.h> / { + model = "Khadas VIM3"; + vddcpu_a: regulator-vddcpu-a { /* * MP8756GD Regulator. diff --git a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi index 90815fa..0ef60c7 100644 --- a/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi @@ -9,8 +9,6 @@ #include <dt-bindings/gpio/meson-g12a-gpio.h> / { - model = "Khadas VIM3"; - aliases { serial0 = &uart_AO; ethernet0 = ðmac;
The common meson-khadas-vim3.dtsi is now shared with VIM3L so move the VIM3 model namne to meson-g12b-khadas-vim3.dtsi. meson-sm1-khadas-vim3l.dts contains the VIM3L model name. Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> --- arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 2 ++ arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)