• Sam McNally's avatar
    ASoC: Intel: sof_rt5682: Ignore the speaker amp when there isn't one. · d4b74e21
    Sam McNally authored
    Some members of the Google_Hatch family include a rt5682 jack codec, but
    no speaker amplifier. This uses the same driver (sof_rt5682) as a
    combination of rt5682 jack codec and max98357a speaker amplifier. Within
    the sof_rt5682 driver, these cases are not currently distinguishable,
    relying on a DMI quirk to decide the configuration. This causes an
    incorrect configuration when only the rt5682 is present on a
    Google_Hatch device.
    
    For CML, the jack codec is used as the primary key when matching,
    with a possible speaker amplifier described in quirk_data. The two cases
    of interest are the second and third 10EC5682 entries in
    snd_soc_acpi_intel_cml_machines[]. The second entry matches the
    combination of rt5682 and max98357a, resulting in the quirk_data field
    in the snd_soc_acpi_mach being non-null, pointing at
    max98357a_spk_codecs, the snd_soc_acpi_codecs for the matched speaker
    amplifier. The third entry matches just the rt5682, resulting in a null
    quirk_data.
    
    The sof_rt5682 driver's DMI data matching identifies that a speaker
    amplifier is present for all Google_Hatch family devices. Detect cases
    where there is no speaker amplifier by checking for a null quirk_data in
    the snd_soc_acpi_mach and remove the speaker amplifier bit in that case.
    Signed-off-by: default avatarSam McNally <sammc@chromium.org>
    Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20200103124921.v3.1.Ib87c4a7fbb3fc818ea12198e291b87dc2d5bc8c2@changeidSigned-off-by: default avatarMark Brown <broonie@kernel.org>
    d4b74e21
sof_rt5682.c 19.4 KB