Message ID | 1583378508-14312-1-git-send-email-christianshewitt@gmail.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | 1f6857502902e4f582eed96dd0cc8a26e077a8de |
Headers | show |
Series | [v2] arm64: dts: meson: khadas-vim3: move model to g12b-khadas-vim3 dtsi | expand |
Hello: This patch was applied to khilman/linux-amlogic.git (refs/heads/for-next). On Thu, 5 Mar 2020 07:21:48 +0400 you wrote: > The common meson-khadas-vim3.dtsi is now shared with VIM3L so move the > VIM3 model name to meson-g12b-khadas-vim3.dtsi. > > meson-sm1-khadas-vim3l.dts contains the VIM3L model name. > > changes in v2 > - fix typo in commit message > > [...] Here is a summary with links: - [v2] arm64: dts: meson: khadas-vim3: move model to g12b-khadas-vim3 dtsi https://git.kernel.org/khilman/linux-amlogic/c/1f6857502902e4f582eed96dd0cc8a26e077a8de You are awesome, thank you!
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;