Skip to contentSkip to conversation

arm64: dts: meson: sm1-khadas-vim3l use one sound node configuration with VIM3

PATCH In review Artem Lapkin 3 participants 4 messages Aug 12, 2021 – Sep 6, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: dts: meson: sm1-khadas-vim3l use one sound node configuration with VIM3

Khadas VIM3L board sound configuration same as Khadas VIM3, its already defined in meson-khadas-vim3.dtsi and no need overwrite it with different card names and routing configurations.

---
 .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts     | 13 -------------
 1 file changed, 13 deletions(-)
arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts +0 -13
index f2c098143..06de0b1ce 100644
@@ -32,19 +32,6 @@ vddcpu: regulator-vddcpu {
 		regulator-boot-on;
 		regulator-always-on;
 	};
-
-	sound {
-		model = "G12B-KHADAS-VIM3L";
-		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",
-				"TDMIN_A IN 0", "TDM_A Capture",
-				"TDMIN_A IN 13", "TDM_A Loopback",
-				"TODDR_A IN 0", "TDMIN_A OUT",
-				"TODDR_B IN 0", "TDMIN_A OUT",
-				"TODDR_C IN 0", "TDMIN_A OUT";
-	};
 };
 
 &cpu0 {
Signature · 1 line
2.25.1
#1 lore raw

Hi,

Quoted 24 lines · Artem Lapkin

Khadas VIM3L board sound configuration same as Khadas VIM3, its already defined in meson-khadas-vim3.dtsi and no need overwrite it with different card names and routing configurations.

---
 .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts     | 13 -------------
 1 file changed, 13 deletions(-)
arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts +0 -6
index f2c098143..06de0b1ce 100644
@@ -32,19 +32,6 @@ vddcpu: regulator-vddcpu {
 		regulator-boot-on;
 		regulator-always-on;
 	};
-
-	sound {
-		model = "G12B-KHADAS-VIM3L";
-		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",

arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts vddcpu: regulator-vddcpu { · line 37

Quoted 10 lines
arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts +0 -7
-				"TDM_A Playback", "TDMOUT_A OUT",
-				"TDMIN_A IN 0", "TDM_A Capture",
-				"TDMIN_A IN 13", "TDM_A Loopback",
-				"TODDR_A IN 0", "TDMIN_A OUT",
-				"TODDR_B IN 0", "TDMIN_A OUT",
-				"TODDR_C IN 0", "TDMIN_A OUT";
-	};
 };
 
 &cpu0 {

Jerome could you quickly review this ?

Thanks,
Neil

reviewer
#2 lore raw
Quoted 35 lines · Neil Armstrong

Hi,

Quoted 32 lines · Artem Lapkin

Khadas VIM3L board sound configuration same as Khadas VIM3, its already defined in meson-khadas-vim3.dtsi and no need overwrite it with different card names and routing configurations.

---
 .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts     | 13 -------------
 1 file changed, 13 deletions(-)
arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts +0 -13
index f2c098143..06de0b1ce 100644
@@ -32,19 +32,6 @@ vddcpu: regulator-vddcpu {
 		regulator-boot-on;
 		regulator-always-on;
 	};
-
-	sound {
-		model = "G12B-KHADAS-VIM3L";
-		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",
-				"TDMIN_A IN 0", "TDM_A Capture",
-				"TDMIN_A IN 13", "TDM_A Loopback",
-				"TODDR_A IN 0", "TDMIN_A OUT",
-				"TODDR_B IN 0", "TDMIN_A OUT",
-				"TODDR_C IN 0", "TDMIN_A OUT";
-	};
 };
 
Quoted 4 lines

arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts vddcpu: regulator-vddcpu { · line 37

Quoted 2 lines
arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts +0 -0
 &cpu0 {

Jerome could you quickly review this ?

Removing that is wrong.
Take a look at the Loopback sink - it is different between the sm1 based vim3 and the g12b one ... this is simply because the audio block is different on these SoCs

So audio-routing property can't go way, Because of that, the cards are slightly different and should have different model.

However the model name here is
a) probably too long
b) misleading :/

Quoted 3 lines

Thanks,
Neil

author
#3 lore raw
Quoted 1 line

Take a look at the Loopback sink - it is different between the sm1 based

vim3 and the g12b one ... this is simply because the audio block is different on these SoCs

Maybe you are right ! i will test it soon too

Another question is: loopback necessary ? same as 3 alsa sub devices ? mixer configuration is already not easy for understanding;)

Quoted 2 lines

However the model name here is
a) probably too long

yes i think need to be like other model = "KHADAS-VIM3L";

Quoted 60 lines · Jerome Brunet
Quoted 35 lines · Neil Armstrong

Hi,

Quoted 32 lines · Artem Lapkin

Khadas VIM3L board sound configuration same as Khadas VIM3, its already defined in meson-khadas-vim3.dtsi and no need overwrite it with different card names and routing configurations.

---
 .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts     | 13 -------------
 1 file changed, 13 deletions(-)
arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts +0 -13
index f2c098143..06de0b1ce 100644
@@ -32,19 +32,6 @@ vddcpu: regulator-vddcpu {
             regulator-boot-on;
             regulator-always-on;
     };
-
-    sound {
-            model = "G12B-KHADAS-VIM3L";
-            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",
-                            "TDMIN_A IN 0", "TDM_A Capture",
-                            "TDMIN_A IN 13", "TDM_A Loopback",
-                            "TODDR_A IN 0", "TDMIN_A OUT",
-                            "TODDR_B IN 0", "TDMIN_A OUT",
-                            "TODDR_C IN 0", "TDMIN_A OUT";
-    };
 };
 
Quoted 4 lines

arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts vddcpu: regulator-vddcpu { · line 37

Quoted 2 lines
arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts +0 -0
 &cpu0 {

Jerome could you quickly review this ?

Removing that is wrong.
Take a look at the Loopback sink - it is different between the sm1 based vim3 and the g12b one ... this is simply because the audio block is different on these SoCs

So audio-routing property can't go way, Because of that, the cards are slightly different and should have different model.

However the model name here is
a) probably too long
b) misleading :/

Quoted 3 lines

Thanks,
Neil