| Message ID | 1583135051-95529-1-git-send-email-christianshewitt@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 57b57ebc3f338a7c5cfc41d6577ff72aa3677e38 |
| Headers | show |
| Series | arm64: dts: meson-g12b: fix N2/VIM3 audio card model names | expand |
Christian Hewitt <christianshewitt@gmail.com> writes: > This is largely cosmetic, but Odroid N2 and Khadas VIM3 are G12B devices so > correct the card model names to reflect this. > > Fixes: aa7d5873bf6e ("arm64: dts: meson-g12b-odroid-n2: add sound card") > Fixes: c6d29c66e582 ("arm64: dts: meson-g12b-khadas-vim3: add initial device-tree") nit: no blank lines between Fixes tags and others (cf > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> Queued for v5.7, Thanks for the cleanup, Kevin
Hello: This patch was applied to khilman/linux-amlogic.git (refs/heads/for-next). On Mon, 2 Mar 2020 11:44:11 +0400 you wrote: > This is largely cosmetic, but Odroid N2 and Khadas VIM3 are G12B devices so > correct the card model names to reflect this. > > Fixes: aa7d5873bf6e ("arm64: dts: meson-g12b-odroid-n2: add sound card") > Fixes: c6d29c66e582 ("arm64: dts: meson-g12b-khadas-vim3: add initial device-tree") > > Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> > > [...] Here is a summary with links: - arm64: dts: meson-g12b: fix N2/VIM3 audio card model names https://git.kernel.org/khilman/linux-amlogic/c/57b57ebc3f338a7c5cfc41d6577ff72aa3677e38 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..b1fab57 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi @@ -48,7 +48,7 @@ sound { compatible = "amlogic,axg-sound-card"; - model = "G12A-KHADAS-VIM3"; + model = "G12B-KHADAS-VIM3"; audio-aux-devs = <&tdmout_b>; audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", "TDMOUT_B IN 1", "FRDDR_B OUT 1", diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts index 0e54c1d..8830d38 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts @@ -208,7 +208,7 @@ sound { compatible = "amlogic,axg-sound-card"; - model = "G12A-ODROIDN2"; + model = "G12B-ODROID-N2"; audio-aux-devs = <&tdmout_b>; audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", "TDMOUT_B IN 1", "FRDDR_B OUT 1",
This is largely cosmetic, but Odroid N2 and Khadas VIM3 are G12B devices so correct the card model names to reflect this. Fixes: aa7d5873bf6e ("arm64: dts: meson-g12b-odroid-n2: add sound card") Fixes: c6d29c66e582 ("arm64: dts: meson-g12b-khadas-vim3: add initial device-tree") 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-g12b-odroid-n2.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)