Add UCMs for Google Asus Nexus 7 and Acer Iconia A500

[digetx]

@perexg As was discussed previouly at https://www.spinics.net/lists/alsa-devel/msg126382.html I'm opening PR with the UCMs for Nexus 7 and A500. Both these devices are supported by the mainline Linux kernel.

You're right that Tegra ASoC driver doesn't set card's name properly. In particular I found that we need to set the card's driver_name to tegra, then UCM get a proper lookup path.

I rebased UCMs on top of the recent alsa-ucm-conf master and switched Nexus 7 UCM to use generic RT5640 UCM. Everything works great once the card name of the kernel driver is corrected. I'll send the kernel patches ASAP for review.

Nexus 7 alsa-info: https://alsa-project.org/db/?f=0a29f1dab39ec5b33e01215dee42dbfd1dbbf08e
A500 alsa-info: https://alsa-project.org/db/?f=bde4f7938a39b1d26904b414969fc811e726242f

The alsa-info is taken using the updated kernel ASoC driver.

[perexg]

At first of all, thank you for your work. It seems like a right track to make things more maintainable. The BayTrail (Intel) specific controls should be moved to the upper level configs. @plbossart , FYI,

Also, If blocks cannot be in the sequences. You can define [] arrays multiple times and the sequences will be added to the end of array. So this is fine:

EnableSequence [
   sequence3
]
If.x {
   True.EnableSequence [
      sequence1
   ]
}
If.y {
  False.EnableSequence [
     sequence2
  ]
}

Note that Include / If blocks are evaluated as first (see the sequence numbers). That's the reason why we have some dummy (empty) string If blocks in the configs.

[digetx]

I pushed the updated version that implements yours suggestion, it works using the latest alsa-lib master. Please take a look.

[digetx]

Do you also mean that it's also possible to move the device sequences to ucm2/bytcr-rt5640/HiFi.conf?

SectionDevice."Headset" {
	If.HeadsetControls {
		Condition {
			Type ControlExists
			Control "name='Headset Mic Switch'"
		}
		True {
			cset "name='Headset Mic Switch' off"
		}
	}

	EnableSequence [
		If.Controls {
			Condition {
				Type ControlExists
				Control "name='Headset Mic Switch'"
			}
			True {
				cset "name='Headset Mic Switch' on"
			}
		}
	]

	DisableSequence [
		If.Controls {
			Condition {
				Type ControlExists
				Control "name='Headset Mic Switch'"
			}
			True {
				cset "name='Headset Mic Switch' off"
			}
		}
	]
}

[perexg]

Do you also mean that it's also possible to move the device sequences to ucm2/bytcr-rt5640/HiFi.conf?

Yes, but the config should be like (ucm2/bytcr-rt5640/HiFi-Components.conf):

If.hsmic {
	Condition { Type String Empty "" }
	True {
		Include.hsmic.File "/codecs/rt5640/HeadsetMic.conf"
		If.switch {
			Condition {
				Type ControlExists
				Control "name='Headset Mic Switch'"
			}
			True {
				SectionDevice."Headset" {
					EnableSequence [
						cset "name='Headset Mic Switch' on"
					]
					DisableSequence [
						cset "name='Headset Mic Switch' off"
					]
				}
			}
		}
	}
}

In this case Include is evaluated at first, so the cset will be appended to the corresponding Enable/Disable sequences.

But in this case, we know that Headset Mic Switch exists for this platform (bytcr-rt5640), so you can remove the control If completely and keep only Enable/Disable sequences.

[digetx]

@perexg I'm getting I: [pulseaudio] (alsa-lib)main.c: error: failed to import hw:0 use case configuration -17 with:

If.spk {
	Condition {
		Type String
		Haystack "${CardComponents}"
		Needle "cfg-spk:2"
	}
	True {
		Include.spk.File "/codecs/rt5640/Speaker.conf"
		Define.HaveSpeaker "yes"

+		SectionDevice."Speaker" {
+			EnableSequence [
+				cset "name='Speaker Switch' on"
+			]
+
+			DisableSequence [
+				cset "name='Speaker Switch' off"
+			]
+		}
	}
}

alsa-lib doesn't like SectionDevice specified within conditions. What should we do about it?

[digetx]

Also, second SectionDevice definition overrides the previous definition, instead of appending it. I thought that this may work:

If.spk {
	Condition {
		Type String
		Haystack "${CardComponents}"
		Needle "cfg-spk:2"
	}
	True {
		Include.spk.File "/codecs/rt5640/Speaker.conf"
+		Include.spk.File "/bytcr-rt5640/Speaker.conf"
		Define.HaveSpeaker "yes"
	}
}
...

ucm2/bytcr-rt5640/Speaker.conf:
+SectionDevice."Speaker" {
+	EnableSequence [
+		cset "name='Speaker Switch' on"
+	]
+
+	DisableSequence [
+		cset "name='Speaker Switch' off"
+	]
+}

but it's not working as expected.

Apparently syntax upgrade is required here. We could temporally use the version that I proposed with the conditions within the codec and move them to /bytcr-rt5640 once syntax will allow to do that.

[perexg]

Oops, I fixed this in 6b728405697e38339773a6901ca8f557c89f0088 . The merging was previously handled in only one level, thus:

SectionDevice."Speaker" {
	Comment "Speakers"
	EnableSequence [
		shell "echo 1st"
	]
	Value {
		PlaybackChannels 2
		PlaybackPriority 200
		PlaybackPCM "hw:0"
	}
}

If.0 {
	# Does not work before alsa-lib's commit 6b728405697e38339773a6901ca8f557c89f0088
	Condition { Type String Empty "" }
	True {
		SectionDevice."Speaker" {
			EnableSequence [
				shell "echo 2nd"
			]
		}
	}
}

SectionDevice."Speaker" {
	EnableSequence [
		shell "echo 3rd"
	]
}

SectionDevice."Speaker" {
	If.1 {
		Condition { Type String Empty "" }
		True {
			EnableSequence [
				shell "echo 4rd"
			]
		}
	}
}

$ alsaucm -c test set _verb HiFi set _enadev Speaker
1st
3rd
2nd
4rd

Note the order.

If If.0 block is commented (or removed), it works with the previous master:

$ alsaucm -c test set _verb HiFi set _enadev Speaker
1st
3rd
4rd

[digetx]

@perexg Thank you very much, it works now using the latest alsa-lib master. Will you backport that change to a stable alsa-lib version or bump the syntax version?

[perexg]

I've merged your changes with the 4884ef8 fix / cleanups for bytcr-rt5640 . The internal variables (define) sections must be evaluated before the device includes. Thank you for your contribution.

[digetx]

@perexg Thank you, everything working great using the latest alsa-ucm-conf + alsa-lib master.