]> git.itanic.dy.fi Git - linux-stable/commit
mfd: arizona-spi: Set pdata.hpdet_channel for ACPI enumerated devs
authorHans de Goede <hdegoede@redhat.com>
Sat, 14 Oct 2023 20:54:14 +0000 (22:54 +0200)
committerLee Jones <lee@kernel.org>
Wed, 1 Nov 2023 10:02:16 +0000 (10:02 +0000)
commit831d1af85133e1763d41e20414912d9a1058ea72
treefe50b5d48690491edb29626d903778c93b831f83
parent10450565b417d3520ef267a62cea07cd5590c982
mfd: arizona-spi: Set pdata.hpdet_channel for ACPI enumerated devs

Commit 9e86b2ad4c11 changed the channel used for HPDET detection
(headphones vs lineout detection) from being hardcoded to
ARIZONA_ACCDET_MODE_HPL (HP left channel) to it being configurable
through arizona_pdata.hpdet_channel the DT/OF parsing added for
filling arizona_pdata on devicetree platforms ensures that
arizona_pdata.hpdet_channel gets set to ARIZONA_ACCDET_MODE_HPL
when not specified in the devicetree-node.

But on ACPI platforms where arizona_pdata is filled by
arizona_spi_acpi_probe() arizona_pdata.hpdet_channel was not
getting set, causing it to default to 0 aka ARIZONA_ACCDET_MODE_MIC.

This causes headphones to get misdetected as line-out on some models.
Fix this by setting hpdet_channel = ARIZONA_ACCDET_MODE_HPL.

Fixes: e933836744a2 ("mfd: arizona: Add support for ACPI enumeration of WM5102 connected over SPI")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20231014205414.59415-1-hdegoede@redhat.com
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/mfd/arizona-spi.c