Hans de Goede [Wed, 29 Sep 2021 09:11:44 +0000 (11:11 +0200)]
bytcr-rt5640: Add support for a second headset input
Some devices (HP Elitepad 1000 G2) have a second headphones output
(1 on the dock, 2nd on the tablet itself) the headset mic input of
this second headset is connected to IN1, add support for this.
Hans de Goede [Wed, 29 Sep 2021 09:11:43 +0000 (11:11 +0200)]
bytcr-rt5640: Add support for a second headphones output
Some devices (HP Elitepad 1000 G2) have a second headphones output
(1 on the dock, 2nd on the tablet itself) which is implemented through
the line-out output of the codec combined with an external hp-amp.
The kernel has recently gotten support for this setup and will
advertise this to userspace by adding cfg-hp2:lineout to the
components string, add support for this.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Wed, 29 Sep 2021 09:11:41 +0000 (11:11 +0200)]
codecs/rt5640: Rename DAPM PIN switches to avoid having 2 Speaker and Headphones switches
Now that we rename the mutes from their weird 'Channel Switch' postfix
to the standard 'Playback Switch' postfix we end up having 2 Switches
for the 'Speaker' resp. 'Headphones' volume controls, with 1 of the two
getting ignored by the alsa-lib mixer code because it is duplicate.
This is caused by the bytcr-rt5640 machine driver adding DAPM PIN
Switches which are named 'Headphone Switch' resp. 'Speaker Switch',
rename these to 'Headphone Output Switch' / 'Speaker Output Switch'
so that they get seen as separate controls by the alsa-lib mixer code.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Wed, 29 Sep 2021 09:11:40 +0000 (11:11 +0200)]
bytcr-rt5640: Fix 'Headphone Switch' / 'Headset Mic Switch' no longer getting set
Commit 446d0a71b47f ("codecs/rt5640: Move out BayTrail-specific pin switches")
moved the setting of the 'Headphone Switch' / 'Headset Mic Switch' into
"If.hp" resp "If.hsmic" blocks. But instead of making them part of the
True {} block inside that If, the statements where added add the top-level
of the If {} block where they are no-ops.
Move them to inside the True blocks so that these Switches again get
properly turned on/off. This fixes the Headphones and Headset-mic no longer
working on bytcr-rt5640 devices.
Cc: Dmitry Osipenko <digetx@gmail.com> Fixes: 446d0a71b47f ("codecs/rt5640: Move out BayTrail-specific pin switches") Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hui Wang [Fri, 23 Jul 2021 03:13:02 +0000 (11:13 +0800)]
sof-soundwire: rt1316 - DAC L and R is replaced by DAC
In the latest codec driver rt1316-sdw.c, the DAC L and DAC R are
replaced by DAC, so we change the ucm to add the condition checking,
if 'DAC L' exists, will set those mixers in the old way, otherwise,
set the mixers with new name.
The codec rt1316 is used on a Dell TGL soundwire audio machine.
Signed-off-by: Hui Wang <hui.wang@canonical.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hui Wang [Fri, 23 Jul 2021 03:20:50 +0000 (11:20 +0800)]
sof-hda-dsp: Set Capture Switch on in the BootSequence
We found an issue that the PA source of Mic2/Headset and Mic2 is
muted by default after newly install an OS, the root cause is the
'Capture Switch' is set to off in the kernel.
Without ucm, the /usr/share/alsa/init/default will set the 'Capture
Switch' to on, similarly we set it to on in the BootSequence of ucm.
Signed-off-by: Hui Wang <hui.wang@canonical.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hui Wang [Thu, 17 Jun 2021 03:50:53 +0000 (11:50 +0800)]
HDA-Intel: add Boost volume control for Headset Mic
Ubuntu Linux users complain even they set the input volume to maximum,
they still can't record sound with a pretty satisfied volume, they
need to run commandline commands to adjust "Mic Boost/Headset Mic
Boost/Headphone Mic boost" value to increase the input volume.
That is because the current ucm only defines "Capture Volume" to
control the input volume. Here we add Boost control, then users could
adjust both "Capture Volume" and "Boost Volume" through Pulseaudio and
Gnome.
Dmitry Osipenko [Thu, 20 May 2021 05:32:29 +0000 (08:32 +0300)]
tegra: Add UCM for ASUS Google Nexus 7 (2012)
ASUS Google Nexus 7 tablet device is powered by NVIDIA Tegra30 SoC, it
has Realtek ALC5642 audio CODEC, which is compatible with the RT5640 CODEC.
Nexus 7 has a 2-channel built-in speaker, built-in 2-channel microphone,
a 3-pin 3.5mm jack for headphones, and a custom external audio output for
docking-station. The docking-station configuration isn't supported because
it's unsupported by the upstream Linux kernel yet.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Dmitry Osipenko [Thu, 20 May 2021 05:30:47 +0000 (08:30 +0300)]
tegra: Add UCM for Acer Iconia Tab A500
Acer Iconia Tab A500 is a tablet device which is powered by NVIDIA Tegra20
SoC, it has WM8903 audio CODEC. The device has built-in 2-channel speaker,
built-in mono microphone and 4-pin 3.5mm jack for headphones and headset.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Dmitry Osipenko [Thu, 20 May 2021 05:11:29 +0000 (08:11 +0300)]
tegra: Add symlinks to conf.d/tegra
The old UCM names were matched only by the name of the kernel driver module.
This means that built-in kernel drivers never matched.
Tegra ASoC machine kernel drivers never specified the card's driver_name
and long_name properly, which is required in order to have a proper
'ucm2/conf.d/tegra/' path being used for the matching of UCMs. This will
be fixed in the kernel ASAP, the change will be backported to stable kernels.
This patch adds symlinks for the PAZ00 netbook and NyanBig Chromebook
to the new 'ucm2/conf.d/tegra/' directory that will match devices properly
in conjunction with the updated Linux kernel regardless of whether sound
driver is a loadable module or built-in.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Dmitry Osipenko [Thu, 20 May 2021 16:20:57 +0000 (19:20 +0300)]
codecs/rt5640: Make headset optional
Nexus 7 has a 3-pin 3.5mm headphones jack, it doesn't support headset
microphone, and thus, it doesn't have headset microphone jack. Make
headset device optional.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Dmitry Osipenko [Thu, 20 May 2021 14:14:57 +0000 (17:14 +0300)]
codecs/rt5640: Fix restoring of playback volumes
The playback volumes shall be initialized only during of the first
enable sequence, not during the initialization of speaker/headphones
devices. This fixes sound level restoring by pulseaudio when headphones
are inserted/ejected. Previously sound level was always reset to the
default level on insert/ejection, which is the incorrect behaviour.
The correct behaviour is to restore volume the previous level, i.e.
if sound level was 3% before headphones were ejected, then level should
be restored to 3% when headphones are inserted back.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Dmitry Osipenko [Thu, 20 May 2021 13:53:51 +0000 (16:53 +0300)]
codecs/rt5640: Turn off playback switches by default
Previously RT5640 was turning off switches that are specific to the Intel
BayTrail SoC. In a case of other SoCs we need to turn off the codec switches.
This fixes audio playing from both speaker and headphones simultaneously on
Nexus 7, until headphones are re-inserted.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Dmitry Osipenko [Thu, 20 May 2021 13:49:22 +0000 (16:49 +0300)]
codecs/rt5640: Move out BayTrail-specific pin switches
The UCM of RT5640 codec toggles switches that exists only in a case of
the Intel BayTrail ASoC machine driver, RT5640 codec driver doesn't have
them. Move these switches to the BayTrail UCM in order to make generic UCM
rules reusable by other SoCs.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Fri, 7 May 2021 13:11:39 +0000 (15:11 +0200)]
bytcr-rt5640: Add support for controlling a speaker-mute LED
Add support for controlling a speaker-mute LED using the new snd_ctl_led
kernel module for generic mute LED control.
Tested on a HP Pavilion X2 10-n000nd and a HP Pavilion X2 10-p002nd both of
which have a detachable USB keyboard with a speaker mute LED embedded in
the audio-mute button.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Fri, 7 May 2021 13:11:38 +0000 (15:11 +0200)]
cht-bsw-rt5672: Add support for controlling speaker- and mic-mute LEDs
Add support for controlling speaker- and mic-mute LEDs using the new
snd_ctl_led kernel module for generic mute LED control.
Tested on a Thinkpad 10 tablet which has a detachable USB keyboard with
a speaker mute LED embedded in the volume-mute button and a mic mute
LED embedded in the mic-mute button.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Fri, 7 May 2021 13:11:37 +0000 (15:11 +0200)]
cht-bsw-rt5672: Add support for the components string
Upcoming kernel versions will report which speaker and dmic config is used
by the device in a components strings so that we don't need to duplicate
the DMI quirks in both the kernel and the UCM profile.
Add support for getting the speaker and dmic config from the components string.
Note the old DMI matching is kept for support of older kernels, this means
that on devices where the old DMI matching was used things like:
Define.MonoSpeaker ""
Will now be done twice, this is harmless as long as the kernel and UCM profile
DMI quirks are in sync, which they are.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
ucm2: soundwire: use cfg-amp instead of cfg-spk component string
For now we don't have a specific handing of the number of speakers, we
should be handling the number of amplifiers instead. The number of
speakers was added in machine drivers as a placeholder, if and when we
you it it would be in addition to the number of amplifiers, not as a
substitute.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Libin Yang <libin.yang@intel.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
David Ward [Sat, 27 Feb 2021 14:45:39 +0000 (09:45 -0500)]
broadwell-rt286, bdw-rt5677: Fix inconsistency in card detection
This file is only read when the driver name is 'SOF'. Other entries
in this file do not check if a card name contains the 'sof-' prefix.
Adjust these new entries for Broadwell cards so they are consistent.
This conveniently provides a workaround for a bug in kernel 5.10+:
https://bugzilla.kernel.org/show_bug.cgi?id=211985
It happens to let the catpt driver work in kernels where this bug is
present for Broadwell cards. This is possible because the SOF driver
and catpt driver share the same use case configuration for the card.
Signed-off-by: David Ward <david.ward@gatech.edu> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Mon, 8 Mar 2021 22:05:54 +0000 (23:05 +0100)]
codecs/rt5640: Specify Playback/CaptureMasterElem for HW volume-control
Newer kernels add "aif:1" or "aif:2" to the components string to let
us know which AIF is being used.
Use this to specify the correct Playback/CaptureMasterElem for HW
volume-control, based on which AIF is being used.
On older kernels, where there is no "aif:%d" string in the components
string, no Playback/CaptureMasterElem is specified.
In DigitalMics.conf the master mixer is used as regular CaptureMixerElem
instead of as CaptureMasterElem since the DMICs don't have any analog
volume control.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Wed, 17 Feb 2021 14:34:36 +0000 (15:34 +0100)]
codecs/rt5672: Add hardware volume-control support
For the speaker and DMICs configs this uses "DAC1 Playback Volume"
resp. "ADC Capture Volume" as main mixer elements, since there are
no other volume-controls in their paths.
For the (analog) headset-mic and headphones this used the analog
"IN1 Boost" resp. "HP Playback Volume" controls as main mixer elements
while using the "ADC Capture Volume" resp. "DAC1 Playback Volume"
(which have the mute switches) as master mixer elements.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Wed, 17 Feb 2021 14:34:35 +0000 (15:34 +0100)]
codecs/rt5672: Move +12dB input boost from 'STO1 ADC Boost Gain' to 'ADC Capture Volume'
Both the 'STO1 ADC Boost Gain' and the 'ADC Capture Volume' controls are
digital and the 'ADC Capture Volume' control goes up to +30dB.
When adding hw-volume-control support adding the +12dB boost gain on to of
the max +30dB of 'ADC Capture Volume' is a bit too much.
So move the +12dB from the 'STO1 ADC Boost Gain' control to the
'ADC Capture Volume' control.
This way we keep the same setting for userspace which does not support
hw-volume-control, while getting a better range when we start using
'ADC Capture Volume' as hw-volume-control.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Mon, 8 Mar 2021 22:05:53 +0000 (23:05 +0100)]
codecs/rt5640: Add hardware volume-control support
Add hardware volume-control support for the rt5640 codec.
Note this commit does not add support for the (digital) master
ADC/DAC Volume / Mute controls. There are 2 of each, and which
one should be used depends on which AIF is being used.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Mon, 8 Mar 2021 22:05:52 +0000 (23:05 +0100)]
codecs/rt5640: Unify capture volume for AIF1 and AIF2 recording paths
The rt5640 codec is sometimes used with AIF1 connected to the
SoC and sometimes with AIF2 connected to the SoC.
The rt5640 UCM configuration deals with this by accepting input from
and sending output to both AIFs, relying on the kernels DAPM framework to
disable parts of the graph which are connected to the unconnected AIF.
Before this commit codecs/rt5640/EnableSeq.conf was adding a +9dB
(digital) boost to recording going through the 'ADC' path to AIF1,
while not touching the 'Mono ADC' path to AIF2.
This was causing recordings on devices using AIF2 to be somewhat soft.
This commit unifies the record volume control settings for both paths by
only using the '[Mono ]ADC Capture Volume' control, which is present
in both paths and setting it to +9dB on both paths.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Mon, 8 Mar 2021 22:05:50 +0000 (23:05 +0100)]
codecs/rt5640: Cleanup: Move 'SPK MIX' setup to main EnableSequene
Cleanup: no functional changes intended.
Do the 'SPK MIXL' / 'SPK MIXR' setup only once from the main
EnableSequene, like we do for the 'OUT MIXL' / 'OUT MIXR' setup
used by the headphones already.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Mon, 8 Mar 2021 22:05:49 +0000 (23:05 +0100)]
codecs/rt5640: Cleanup: Initially disable all inputs and outputs
Cleanup: no functional changes intended.
Disable all inputs and outputs from the main EnableSequence.
This allows removing some weirdness from the individual input/output
EnableSequences where they were turning controls for other inputs/outputs
then themselves off.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
The rt5640 codec is sometimes used with AIF1 connected to the SoC
and sometimes with AIF2 connected to the SoC.
The rt5640 UCM configuration deals with this by accepting input from
and sending output to both AIFs, relying on the kernels DAPM framework to
disable parts of the graph which are connected to the unconnected AIF.
On the output side we solve this by enabling both the IF1_DAC and
IF2_DAC data inputs to the digital 'Stereo DAC MIX' mixer.
On the input side handling this is somewhat more complicated, the
"Digital Mixer Path" leading to the IF1_ADC and IF2_ADC outputs
are entirely separate paths. To solve this we enable the active
input (DMIC or ADC) in both the Stereo ADC (connected to IF1_ADC)
and the Mono ADC (IF2_ADC) paths.
So far we've not been entirely consistent in our handling of
the Stereo ADC vs Mono ADC paths, this commit cleans this up:
1. Set the 'Mono ADC Capture Switch' to on once from EnableSeq.conf,
like we do for the 'ADC Capture Switch' instead of toggling it on/off
from the individual input Enable/Disable sequences.
2. Group all the 'Mono ADC ...' mixer cset calls together with their
stereo ADC counterparts.
3. Explicitly select DMIC L/R 1 for the Mono ADC L/R 2 Mux input, instead
of relying on this being the default.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Sun, 7 Mar 2021 20:03:07 +0000 (21:03 +0100)]
codecs/es8316: Fix 'HP Mixer Volume' setting
The 'HP Mixer Volume' control is interesting in that it has a hole
in its range which should not be used (described in the tlv table),
valid values are 0-4 and 8-11
I assume that the "Set HP mixer vol to -6 dB (4/7) louder does not work"
comment which this patch changes comes from attempts to use values in
that hole in the range (also notice the wrong max value in the comment).
Setting the HP mixer to -6 dB causes the sound to be significantly
softer then under Windows. This commit fixes this by initializing the
HP mixer control to 11 / 0 dB.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Sun, 7 Mar 2021 20:03:06 +0000 (21:03 +0100)]
codecs/es8316: Fix capture settings
Fix the following issues with the capture settings:
1. Disable ALC / Auto Level Control, it tries to always get an
input signal even when the user is not talking into the mic
leading to it cranking up the volume till there is noise at
the same level as the user talking.
2. The 'ADC PGA Gain Volume' volume control is not the main
'ADC vol' control, it is the mic amplifier control and
setting it to 10 sets it to 24dB not 0dB.
Adjust the comment and set it to 7 which is 16dB which
gives a good microphone signal strength without introducing
too much noise (with 'ADC Capture Volume' set to 0dB).
3. There actually is a main 'ADC vol' control which goes from -96 to 0dB
which is simply called the 'ADC Capture Volume' and when disabling ALC
it defaults to -96 dB. Add a line setting it to 0dB.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Jaroslav Kysela [Wed, 3 Feb 2021 16:13:01 +0000 (17:13 +0100)]
ucm2: Separate the configuration lookups (hw based) from the configuration tree
Introduce ucm2/conf.d/ tree with symlinks to the real hardware configurations.
In this way, we do not rely to create the configuration paths based on
simple driver / device identification, but we can store the configurations
more logically to make the maintenance (code reuse, multiple changes)
more easy.
This commit keeps the older lookup paths active, but they will be
turned off in the next release.
Hans de Goede [Tue, 9 Feb 2021 21:01:01 +0000 (22:01 +0100)]
codecs/rt5672: Remove Intel SST specific HeadsetMic workaround
There used to be an issue with the HeadsetMic on BYT devices with
a rt5672 codec only being recorded on the left channel, while the
right channel recorded silence.
The ucm2/codecs/rt5672/HeadsetMic.conf contains a workaround for
this which changes the SST record-stream demuxer settings to
use "slot 0" for both the left and right channels when recording
from the HeadsetMic.
There are 2 problems with this workaround:
1. It uses SST specific mixer settings causing things to break
when using the SOF driver.
2. Files under uc2m/codecs should be architecture agnostic and should
not depend on platform dependent mixer settings such as the SST driver
mixer settings.
The problem which the workaround used to work around has since been
fixed in the kernel by switching the wire format from TDM/DSP A to I2S:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0ceb8a36d023d4bb4ffca3474a452fb1dfaa0ef2
This fix has landed in 5.8 and has been backported to all recent
stable kernel releases.
Since this is fixed in the kernel now, we can drop the workaround,
fixing the 2 problems mentioned above.
This was tested on a ThinkPad 8 tablet, which is the same device as
where the HeadsetMic problem was originally noticed.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Existing platforms can have 1,2,3 or 4 microphones. The SOF firmware
will generate 2 or 4 channels. Since by default CaptureChannels is 2,
we need to add the case for cfg-dmics = 3.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Wed, 16 Dec 2020 15:38:38 +0000 (16:38 +0100)]
chtnau8824: Add support for using the SOF driver
The old (and currently the default) SST driver uses TDM 4 slots 24 bit
as wire format to the codec. Where as the new SOF driver uses standard
I2S 2 channel 24 bit.
Normally this should not impact the UCM settings, but on the NAU8824
the "DAC Right Channel Source" mixer setting must be set to 1 when
using TDM 4 slots and to 0 when using I2S 2 channel mode.
Getting this wrong (in either case) results in the right channel not
outputting any sound.
This commit introduces a RightOutputChannel variable which gets
set to 0/1 depending on the driver and then uses that for the
"DAC Right Channel Source" mixer setting so that we do the right
thing depending on the driver.
This has been tested on the following devices:
Medion E2215T: Stereo speakers, analog mic
Medion E2228T: Stereo speakers, stereo digital mics
Cube iWork 8 Air: Mono speaker, analog mic
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Marijn Suijten [Thu, 14 Jan 2021 13:11:50 +0000 (14:11 +0100)]
USB-Audio/ALC1220: Bump analog Speaker priority over S/PDIF
The `S/PDIF` port does not have any jack sensing, and with a priority
higher than the `Speakers` it will always be selected by default instead
of the `Speakers` even if unplugged.
Swapping the priorities around allows analog `Speakers` to be selected
first, _if_ they are plugged in. Otherwise `S/PDIF` is used.
Signed-off-by: Marijn Suijten <marijns95@gmail.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Sat, 9 Jan 2021 21:02:52 +0000 (22:02 +0100)]
rt5640: Move standard DAC setup to EnableSeq.conf
No matter which output is used, we always need to setup the standard
DAC config. Move this to the shared EnableSeq.conf to avoid having
to duplicate it in various places.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Sat, 9 Jan 2021 21:02:51 +0000 (22:02 +0100)]
bytcr-rt5640: Add support for devices without speakers and/or an internal mic
There are kernel patches pending upstream for the bytcr-rt5640 machine-driver
to support devices without speakers and/or an internal mic.
Since the UCM profile already conditionally loads the speaker and
internal-mic codec include files, these will simply get skipped in this
case, so this almost works with the current UCM profile without changes.
The only troublesome part is the ConflictingDevice sections in the codec
HeadPhones.conf and HeadsetMic.conf files, which refer to resp. a "Speaker"
and a "Mic" device. Without any of the speaker or mic codec conf files
being included there will not by any "Speaker" / "Mic" devices leading
to an error while parsing the HeadPhones.conf / HeadsetMic.conf files.
This commit makes the ConflictingDevice section conditional, fixing this.
Cc: Rasmus Porsager <rasmus@beat.dk> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hui Wang [Thu, 29 Oct 2020 05:34:02 +0000 (13:34 +0800)]
sof-hda-dsp: Set Master Playback Switch on in the BootSequence
Otherwise, the audio output will be muted by default if there is no
/var/lib/alsa/asound.state. I have experienced this issue When newly
install an OS.
Signed-off-by: Hui Wang <hui.wang@canonical.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Hans de Goede [Sun, 6 Dec 2020 12:47:16 +0000 (13:47 +0100)]
chtnau8824: Fix mono speaker config not working
Fix the Speaker define / var being changed from "Speaker" to "MonoSpeaker"
not having any effect because the variable gets expanded before the if
making the change is interpreted.
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This solution does not work. The mute state is shared between
the HDA and AMD ACP in PA, so it may cause the security issue, if
the users do not set the mute manually.
git://git.alsa-project.org / alsa-ucm-conf.git / log