diff mbox

[v2,03/11] ARM: tegra: Set the sound card model that alsaucm expects

Message ID 1421338359-27467-4-git-send-email-tomeu.vizoso@collabora.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tomeu Vizoso Jan. 15, 2015, 4:12 p.m. UTC
Patches are on its way to add a config file to alsaucm for the Nyan
boards. Use the same card ID that alsaucm will expect.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
---
 arch/arm/boot/dts/tegra124-nyan-big.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Stephen Warren Jan. 15, 2015, 5:22 p.m. UTC | #1
On 01/15/2015 09:12 AM, Tomeu Vizoso wrote:
> Patches are on its way to add a config file to alsaucm for the Nyan
> boards. Use the same card ID that alsaucm will expect.
>
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> ---
>   arch/arm/boot/dts/tegra124-nyan-big.dts | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts b/arch/arm/boot/dts/tegra124-nyan-big.dts
> index 43e58a4..9a9cffe 100644
> --- a/arch/arm/boot/dts/tegra124-nyan-big.dts
> +++ b/arch/arm/boot/dts/tegra124-nyan-big.dts
> @@ -1976,9 +1976,9 @@
>   	};
>
>   	sound {
> -		compatible = "nvidia,tegra-audio-max98090-nyan-big",
> +		compatible = "nvidia,tegra-audio-max98090-nyan",
>   			     "nvidia,tegra-audio-max98090";

If all the boards that are derived from Nyan truly have identical audio 
HW (or at least any differences can be described by this binding), then 
it seems fine to add "nvidia,tegra-audio-max98090-nyan" to the 
compatible value.

However, I don't see a reason to remove the board-specific compatible 
value "nvidia,tegra-audio-max98090-nyan-big"; we should always include 
all the values that are relevant.

> -		nvidia,model = "Acer Chromebook 13";
> +		nvidia,model = "GoogleNyan";

Why not just name the UCM config file after the ASoC card name that's 
already in use? Perhaps it's not likely to be unique enough though:-(
Tomeu Vizoso Jan. 16, 2015, 8:50 a.m. UTC | #2
On 15 January 2015 at 18:22, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 01/15/2015 09:12 AM, Tomeu Vizoso wrote:
>>
>> Patches are on its way to add a config file to alsaucm for the Nyan
>> boards. Use the same card ID that alsaucm will expect.
>>
>> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
>> ---
>>   arch/arm/boot/dts/tegra124-nyan-big.dts | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts
>> b/arch/arm/boot/dts/tegra124-nyan-big.dts
>> index 43e58a4..9a9cffe 100644
>> --- a/arch/arm/boot/dts/tegra124-nyan-big.dts
>> +++ b/arch/arm/boot/dts/tegra124-nyan-big.dts
>> @@ -1976,9 +1976,9 @@
>>         };
>>
>>         sound {
>> -               compatible = "nvidia,tegra-audio-max98090-nyan-big",
>> +               compatible = "nvidia,tegra-audio-max98090-nyan",
>>                              "nvidia,tegra-audio-max98090";
>
>
> If all the boards that are derived from Nyan truly have identical audio HW
> (or at least any differences can be described by this binding), then it
> seems fine to add "nvidia,tegra-audio-max98090-nyan" to the compatible
> value.



> However, I don't see a reason to remove the board-specific compatible value
> "nvidia,tegra-audio-max98090-nyan-big"; we should always include all the
> values that are relevant.

Ok.

>> -               nvidia,model = "Acer Chromebook 13";
>> +               nvidia,model = "GoogleNyan";
>
>
> Why not just name the UCM config file after the ASoC card name that's
> already in use? Perhaps it's not likely to be unique enough though:-(

Yeah, that would be A13, which isn't terribly useful.

Regards,

Tomeu

> --
> To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tomeu Vizoso Jan. 16, 2015, 9:01 a.m. UTC | #3
On 16 January 2015 at 09:50, Tomeu Vizoso <tomeu.vizoso@collabora.com> wrote:
> On 15 January 2015 at 18:22, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> On 01/15/2015 09:12 AM, Tomeu Vizoso wrote:
>>>
>>> Patches are on its way to add a config file to alsaucm for the Nyan
>>> boards. Use the same card ID that alsaucm will expect.
>>>
>>> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
>>> ---
>>>   arch/arm/boot/dts/tegra124-nyan-big.dts | 4 ++--
>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts
>>> b/arch/arm/boot/dts/tegra124-nyan-big.dts
>>> index 43e58a4..9a9cffe 100644
>>> --- a/arch/arm/boot/dts/tegra124-nyan-big.dts
>>> +++ b/arch/arm/boot/dts/tegra124-nyan-big.dts
>>> @@ -1976,9 +1976,9 @@
>>>         };
>>>
>>>         sound {
>>> -               compatible = "nvidia,tegra-audio-max98090-nyan-big",
>>> +               compatible = "nvidia,tegra-audio-max98090-nyan",
>>>                              "nvidia,tegra-audio-max98090";
>>
>>
>> If all the boards that are derived from Nyan truly have identical audio HW
>> (or at least any differences can be described by this binding), then it
>> seems fine to add "nvidia,tegra-audio-max98090-nyan" to the compatible
>> value.
>
>
>
>> However, I don't see a reason to remove the board-specific compatible value
>> "nvidia,tegra-audio-max98090-nyan-big"; we should always include all the
>> values that are relevant.
>
> Ok.

Oh, actually, my intention was to move the whole sound node to the
nyan dtsi, as there isn't anything specific to the blaze regarding
sound.

Regards,

Tomeu

>>> -               nvidia,model = "Acer Chromebook 13";
>>> +               nvidia,model = "GoogleNyan";
>>
>>
>> Why not just name the UCM config file after the ASoC card name that's
>> already in use? Perhaps it's not likely to be unique enough though:-(
>
> Yeah, that would be A13, which isn't terribly useful.
>
> Regards,
>
> Tomeu
>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Stephen Warren Jan. 19, 2015, 5:10 p.m. UTC | #4
On 01/16/2015 02:01 AM, Tomeu Vizoso wrote:
> On 16 January 2015 at 09:50, Tomeu Vizoso <tomeu.vizoso@collabora.com> wrote:
>> On 15 January 2015 at 18:22, Stephen Warren <swarren@wwwdotorg.org> wrote:
>>> On 01/15/2015 09:12 AM, Tomeu Vizoso wrote:
>>>>
>>>> Patches are on its way to add a config file to alsaucm for the Nyan
>>>> boards. Use the same card ID that alsaucm will expect.
>>>>
>>>> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
>>>> ---
>>>>    arch/arm/boot/dts/tegra124-nyan-big.dts | 4 ++--
>>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>> b/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>> index 43e58a4..9a9cffe 100644
>>>> --- a/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>> +++ b/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>> @@ -1976,9 +1976,9 @@
>>>>          };
>>>>
>>>>          sound {
>>>> -               compatible = "nvidia,tegra-audio-max98090-nyan-big",
>>>> +               compatible = "nvidia,tegra-audio-max98090-nyan",
>>>>                               "nvidia,tegra-audio-max98090";
>>>
>>>
>>> If all the boards that are derived from Nyan truly have identical audio HW
>>> (or at least any differences can be described by this binding), then it
>>> seems fine to add "nvidia,tegra-audio-max98090-nyan" to the compatible
>>> value.
>>
>>
>>
>>> However, I don't see a reason to remove the board-specific compatible value
>>> "nvidia,tegra-audio-max98090-nyan-big"; we should always include all the
>>> values that are relevant.
>>
>> Ok.
>
> Oh, actually, my intention was to move the whole sound node to the
> nyan dtsi, as there isn't anything specific to the blaze regarding
> sound.

There are zero differences between the sound circuits of the boards? If 
so, that sounds fine. I suppose if we do need to apply a quirk to one 
board but not the other, we can always fall back on the top-level 
compatible value if we absolutely have to.
Tomeu Vizoso Jan. 19, 2015, 5:11 p.m. UTC | #5
On 19 January 2015 at 18:10, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 01/16/2015 02:01 AM, Tomeu Vizoso wrote:
>>
>> On 16 January 2015 at 09:50, Tomeu Vizoso <tomeu.vizoso@collabora.com>
>> wrote:
>>>
>>> On 15 January 2015 at 18:22, Stephen Warren <swarren@wwwdotorg.org>
>>> wrote:
>>>>
>>>> On 01/15/2015 09:12 AM, Tomeu Vizoso wrote:
>>>>>
>>>>>
>>>>> Patches are on its way to add a config file to alsaucm for the Nyan
>>>>> boards. Use the same card ID that alsaucm will expect.
>>>>>
>>>>> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
>>>>> ---
>>>>>    arch/arm/boot/dts/tegra124-nyan-big.dts | 4 ++--
>>>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>>> b/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>>> index 43e58a4..9a9cffe 100644
>>>>> --- a/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>>> +++ b/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>>> @@ -1976,9 +1976,9 @@
>>>>>          };
>>>>>
>>>>>          sound {
>>>>> -               compatible = "nvidia,tegra-audio-max98090-nyan-big",
>>>>> +               compatible = "nvidia,tegra-audio-max98090-nyan",
>>>>>                               "nvidia,tegra-audio-max98090";
>>>>
>>>>
>>>>
>>>> If all the boards that are derived from Nyan truly have identical audio
>>>> HW
>>>> (or at least any differences can be described by this binding), then it
>>>> seems fine to add "nvidia,tegra-audio-max98090-nyan" to the compatible
>>>> value.
>>>
>>>
>>>
>>>
>>>> However, I don't see a reason to remove the board-specific compatible
>>>> value
>>>> "nvidia,tegra-audio-max98090-nyan-big"; we should always include all the
>>>> values that are relevant.
>>>
>>>
>>> Ok.
>>
>>
>> Oh, actually, my intention was to move the whole sound node to the
>> nyan dtsi, as there isn't anything specific to the blaze regarding
>> sound.
>
>
> There are zero differences between the sound circuits of the boards? If so,
> that sounds fine. I suppose if we do need to apply a quirk to one board but
> not the other, we can always fall back on the top-level compatible value if
> we absolutely have to.

Yeah, this is what Dylan said in other thread:

"ChromeOS uses one config for both.  The only audio difference between
these two boards is the speakers, that isn't represented in UCM, so
one config file is fine."

Regards,

Tomeu

> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
Dylan Reid Jan. 20, 2015, 5:01 p.m. UTC | #6
On Mon, Jan 19, 2015 at 9:11 AM, Tomeu Vizoso
<tomeu.vizoso@collabora.com> wrote:
> On 19 January 2015 at 18:10, Stephen Warren <swarren@wwwdotorg.org> wrote:
>> On 01/16/2015 02:01 AM, Tomeu Vizoso wrote:
>>>
>>> On 16 January 2015 at 09:50, Tomeu Vizoso <tomeu.vizoso@collabora.com>
>>> wrote:
>>>>
>>>> On 15 January 2015 at 18:22, Stephen Warren <swarren@wwwdotorg.org>
>>>> wrote:
>>>>>
>>>>> On 01/15/2015 09:12 AM, Tomeu Vizoso wrote:
>>>>>>
>>>>>>
>>>>>> Patches are on its way to add a config file to alsaucm for the Nyan
>>>>>> boards. Use the same card ID that alsaucm will expect.
>>>>>>
>>>>>> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
>>>>>> ---
>>>>>>    arch/arm/boot/dts/tegra124-nyan-big.dts | 4 ++--
>>>>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>>>>
>>>>>> diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>>>> b/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>>>> index 43e58a4..9a9cffe 100644
>>>>>> --- a/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>>>> +++ b/arch/arm/boot/dts/tegra124-nyan-big.dts
>>>>>> @@ -1976,9 +1976,9 @@
>>>>>>          };
>>>>>>
>>>>>>          sound {
>>>>>> -               compatible = "nvidia,tegra-audio-max98090-nyan-big",
>>>>>> +               compatible = "nvidia,tegra-audio-max98090-nyan",
>>>>>>                               "nvidia,tegra-audio-max98090";
>>>>>
>>>>>
>>>>>
>>>>> If all the boards that are derived from Nyan truly have identical audio
>>>>> HW
>>>>> (or at least any differences can be described by this binding), then it
>>>>> seems fine to add "nvidia,tegra-audio-max98090-nyan" to the compatible
>>>>> value.
>>>>
>>>>
>>>>
>>>>
>>>>> However, I don't see a reason to remove the board-specific compatible
>>>>> value
>>>>> "nvidia,tegra-audio-max98090-nyan-big"; we should always include all the
>>>>> values that are relevant.
>>>>
>>>>
>>>> Ok.
>>>
>>>
>>> Oh, actually, my intention was to move the whole sound node to the
>>> nyan dtsi, as there isn't anything specific to the blaze regarding
>>> sound.
>>
>>
>> There are zero differences between the sound circuits of the boards? If so,
>> that sounds fine. I suppose if we do need to apply a quirk to one board but
>> not the other, we can always fall back on the top-level compatible value if
>> we absolutely have to.
>
> Yeah, this is what Dylan said in other thread:
>
> "ChromeOS uses one config for both.  The only audio difference between
> these two boards is the speakers, that isn't represented in UCM, so
> one config file is fine."

Correct, they share the same headset chip and codec, they are both
wired up the same.

>
> Regards,
>
> Tomeu
>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/
diff mbox

Patch

diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts b/arch/arm/boot/dts/tegra124-nyan-big.dts
index 43e58a4..9a9cffe 100644
--- a/arch/arm/boot/dts/tegra124-nyan-big.dts
+++ b/arch/arm/boot/dts/tegra124-nyan-big.dts
@@ -1976,9 +1976,9 @@ 
 	};
 
 	sound {
-		compatible = "nvidia,tegra-audio-max98090-nyan-big",
+		compatible = "nvidia,tegra-audio-max98090-nyan",
 			     "nvidia,tegra-audio-max98090";
-		nvidia,model = "Acer Chromebook 13";
+		nvidia,model = "GoogleNyan";
 
 		nvidia,audio-routing =
 			"Headphones", "HPR",