Skip to contentSkip to conversation

ALSA: hda/cirrus_scodec_test: Fix incorrect setup of gpiochip

PATCH In review Richard Fitzgerald 2 participants 2 messages Jan 13

Subsystems (2)
lore
Share & tools
lore

Richard Fitzgerald

author maintainer
#0 lore raw

PATCH 1/1 ALSA: hda/cirrus_scodec_test: Fix incorrect setup of gpiochip

Set gpiochip parent to the struct device of the dummy GPIO driver so that the software node will be associated with the GPIO chip.

The recent commit e5d527be7e698 ("gpio: swnode: don't use the swnode's name as the key for GPIO lookup") broke cirrus_scodec_test, because the software node no longer gets associated with the GPIO driver by name.

Instead, setting struct gpio_chip.parent to the owning struct device will find the node using a normal fwnode lookup.

Fixes 2144833e7b414 ("ALSA: hda: cirrus_scodec: Add KUnit test")
---
 sound/hda/codecs/side-codecs/cirrus_scodec_test.c | 1 +
 1 file changed, 1 insertion(+)
sound/hda/codecs/side-codecs/cirrus_scodec_test.c +1 -0
index 3cca750857b6..159ac80a9314 100644
@@ -103,6 +103,7 @@ static int cirrus_scodec_test_gpio_probe(struct platform_device *pdev)
 
 	/* GPIO core modifies our struct gpio_chip so use a copy */
 	gpio_priv->chip = cirrus_scodec_test_gpio_chip;
+	gpio_priv->chip.parent = &pdev->dev;
 	ret = devm_gpiochip_add_data(&pdev->dev, &gpio_priv->chip, gpio_priv);
 	if (ret)
 		return dev_err_probe(&pdev->dev, ret, "Failed to add gpiochip\n");
Signature · 1 line
2.47.3
#1 lore raw
Quoted 9 lines · Richard Fitzgerald

Set gpiochip parent to the struct device of the dummy GPIO driver so that the software node will be associated with the GPIO chip.

The recent commit e5d527be7e698 ("gpio: swnode: don't use the swnode's name as the key for GPIO lookup") broke cirrus_scodec_test, because the software node no longer gets associated with the GPIO driver by name.

Quoted 5 lines

Instead, setting struct gpio_chip.parent to the owning struct device will find the node using a normal fwnode lookup.

Fixes 2144833e7b414 ("ALSA: hda: cirrus_scodec: Add KUnit test")

Applied now. Thanks.

Takashi