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.
Signed-off-by: Artem Lapkin <[email protected]>
---
.../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
index f2c098143..06de0b1ce 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
@@ -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 {
--
2.25.1
Hi,
On 12/08/2021 07:10, Artem Lapkin wrote:
> 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.
>
> Signed-off-by: Artem Lapkin <[email protected]>
> ---
> .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 13 -------------
> 1 file changed, 13 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
> index f2c098143..06de0b1ce 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
> @@ -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 {
>
Jerome could you quickly review this ?
Thanks,
Neil
On Thu 02 Sep 2021 at 15:31, Neil Armstrong <[email protected]> wrote:
> Hi,
>
> On 12/08/2021 07:10, Artem Lapkin wrote:
>> 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.
>>
>> Signed-off-by: Artem Lapkin <[email protected]>
>> ---
>> .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 13 -------------
>> 1 file changed, 13 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
>> index f2c098143..06de0b1ce 100644
>> --- a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
>> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
>> @@ -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 {
>>
>
> 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 :/
>
> Thanks,
> Neil
> 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;)
> However the model name here is
> a) probably too long
yes i think need to be like other model = "KHADAS-VIM3L";
On Mon, Sep 6, 2021 at 5:24 PM Jerome Brunet <[email protected]> wrote:
>
>
> On Thu 02 Sep 2021 at 15:31, Neil Armstrong <[email protected]> wrote:
>
> > Hi,
> >
> > On 12/08/2021 07:10, Artem Lapkin wrote:
> >> 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.
> >>
> >> Signed-off-by: Artem Lapkin <[email protected]>
> >> ---
> >> .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 13 -------------
> >> 1 file changed, 13 deletions(-)
> >>
> >> diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
> >> index f2c098143..06de0b1ce 100644
> >> --- a/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
> >> +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
> >> @@ -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 {
> >>
> >
> > 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 :/
>
> >
> > Thanks,
> > Neil
>