Skip to contentSkip to conversation

arm64: dts: meson: vim3: make sound card common to all variants

PATCH Applied Jerome Brunet 3 participants 3 messages Aug 3, 2020 – Aug 10, 2020

Subsystems (2)
lore
Share & tools
lore

Jerome Brunet

author reviewer
#0 lore raw

PATCH 1/1 arm64: dts: meson: vim3: make sound card common to all variants

The vim3 sound card definition should be same all the vim3 variants Move the definition to the appropriate device tree file.

---
 .../dts/amlogic/meson-g12b-khadas-vim3.dtsi   | 88 ------------------
 .../boot/dts/amlogic/meson-khadas-vim3.dtsi   | 90 +++++++++++++++++++
 2 files changed, 90 insertions(+), 88 deletions(-)
arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi +0 -88
index 224c890d32d3..f42cf4b8af2d 100644
@@ -5,8 +5,6 @@
  * Copyright (c) 2019 Christian Hewitt <[email protected]>
  */
 
-#include <dt-bindings/sound/meson-g12a-tohdmitx.h>
-
 / {
 	model = "Khadas VIM3";
 
@@ -47,69 +45,6 @@ vddcpu_b: regulator-vddcpu-b {
 		regulator-boot-on;
 		regulator-always-on;
 	};
-
-	sound {
-		compatible = "amlogic,axg-sound-card";
-		model = "G12B-KHADAS-VIM3";
-		audio-aux-devs = <&tdmout_a>;
-		audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
-				"TDMOUT_A IN 1", "FRDDR_B OUT 0",
-				"TDMOUT_A IN 2", "FRDDR_C OUT 0",
-				"TDM_A Playback", "TDMOUT_A OUT";
-
-		assigned-clocks = <&clkc CLKID_MPLL2>,
-				  <&clkc CLKID_MPLL0>,
-				  <&clkc CLKID_MPLL1>;
-		assigned-clock-parents = <0>, <0>, <0>;
-		assigned-clock-rates = <294912000>,
-				       <270950400>,
-				       <393216000>;
-		status = "okay";
-
-		dai-link-0 {
-			sound-dai = <&frddr_a>;
-		};
-
-		dai-link-1 {
-			sound-dai = <&frddr_b>;
-		};
-
-		dai-link-2 {
-			sound-dai = <&frddr_c>;
-		};
-
-		/* 8ch hdmi interface */
-		dai-link-3 {
-			sound-dai = <&tdmif_a>;
-			dai-format = "i2s";
-			dai-tdm-slot-tx-mask-0 = <1 1>;
-			dai-tdm-slot-tx-mask-1 = <1 1>;
-			dai-tdm-slot-tx-mask-2 = <1 1>;
-			dai-tdm-slot-tx-mask-3 = <1 1>;
-			mclk-fs = <256>;
-
-			codec {
-				sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;
-			};
-		};
-
-		/* hdmi glue */
-		dai-link-4 {
-			sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
-
-			codec {
-				sound-dai = <&hdmi_tx>;
-			};
-		};
-	};
-};
-
-&arb {
-	status = "okay";
-};
-
-&clkc_audio {
-	status = "okay";
 };
 
 &cpu0 {
@@ -154,18 +89,6 @@ &cpu103 {
 	clock-latency = <50000>;
 };
 
-&frddr_a {
-	status = "okay";
-};
-
-&frddr_b {
-	status = "okay";
-};
-
-&frddr_c {
-	status = "okay";
-};
-
 &pwm_ab {
 	pinctrl-0 = <&pwm_a_e_pins>;
 	pinctrl-names = "default";
@@ -182,14 +105,3 @@ &pwm_AO_cd {
 	status = "okay";
 };
 
-&tdmif_a {
-	status = "okay";
-};
-
-&tdmout_a {
-	status = "okay";
-};
-
-&tohdmitx {
-	status = "okay";
-};
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +90 -0

120 lines not on this page · raw message

Signature · 1 line
2.25.4
#1 lore raw
This patch was applied to khilman/linux-amlogic.git (refs/heads/for-next).

Hello:

This patch was applied to khilman/linux-amlogic.git (refs/heads/for-next).

Quoted 8 lines · On Mon, 3 Aug 2020 16:21:58 +0200 you wrote:

The vim3 sound card definition should be same all the vim3 variants Move the definition to the appropriate device tree file.

---
 .../dts/amlogic/meson-g12b-khadas-vim3.dtsi   | 88 ------------------
 .../boot/dts/amlogic/meson-khadas-vim3.dtsi   | 90 +++++++++++++++++++
 2 files changed, 90 insertions(+), 88 deletions(-)

Here is a summary with links:
- arm64: dts: meson: vim3: make sound card common to all variants

    https://git.kernel.org/khilman/linux-amlogic/c/7c9c06246cea90f6b0cc4fcfe28505832362691c

You are awesome, thank you!

Signature · 7 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/pwbot

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
maintainer Applied
#2 lore raw
In reply to Jerome Brunet
Quoted 2 lines · Jerome Brunet

The vim3 sound card definition should be same all the vim3 variants Move the definition to the appropriate device tree file.

Applied, thanks!

[1/1] arm64: dts: meson: vim3: make sound card common to all variants
(no commit info)

Best regards,

Signature · 1 line
Kevin Hilman <[email protected]>