]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: cs35l41: Fix GPIO2 configuration
authorDavid Rhodes <drhodes@opensource.cirrus.com>
Thu, 3 Mar 2022 17:30:40 +0000 (17:30 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Apr 2022 12:05:53 +0000 (14:05 +0200)
[ Upstream commit 03a7895ee701e873c88c06bdb830ff40adb2be73 ]

Fix GPIO2 polarity and direction configuration

Fixes: fe1024d50477b ("ASoC: cs35l41: Combine adjacent register writes")
Signed-off-by: David Rhodes <drhodes@opensource.cirrus.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220303173059.269657-2-tanureal@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/cs35l41.c

index 9c4d481f7614c6a61edb065cfd45b7603afc9c0f..3188a8ba35079859a1443edd0538cf4b0c13a86a 100644 (file)
@@ -1071,8 +1071,8 @@ static int cs35l41_irq_gpio_config(struct cs35l41_private *cs35l41)
 
        regmap_update_bits(cs35l41->regmap, CS35L41_GPIO2_CTRL1,
                           CS35L41_GPIO_POL_MASK | CS35L41_GPIO_DIR_MASK,
-                          irq_gpio_cfg1->irq_pol_inv << CS35L41_GPIO_POL_SHIFT |
-                          !irq_gpio_cfg1->irq_out_en << CS35L41_GPIO_DIR_SHIFT);
+                          irq_gpio_cfg2->irq_pol_inv << CS35L41_GPIO_POL_SHIFT |
+                          !irq_gpio_cfg2->irq_out_en << CS35L41_GPIO_DIR_SHIFT);
 
        regmap_update_bits(cs35l41->regmap, CS35L41_GPIO_PAD_CONTROL,
                           CS35L41_GPIO1_CTRL_MASK | CS35L41_GPIO2_CTRL_MASK,