pinctrl: mvebu: Fix dove_audio1_ctrl_set function

When setting audio1 pinmux the bits in the corresponding registers
are not cleared. This fix first clears all bits and then sets the
required bits according to the selected function.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c
index 34693f60d39c5d9c365b0722fb48c3e482f68d86..40c9c3eecd94560e4cc816dc1d1a2461d36616ef 100644 (file)
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -234,6 +234,14 @@ static int dove_audio1_ctrl_set(struct mvebu_mpp_ctrl *ctrl,
        unsigned long gmpp = readl(DOVE_MPP_GENERAL_VIRT_BASE);
        unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2);
 
+       /*
+        * clear all audio1 related bits before configure
+        */
+       gcfg2 &= ~DOVE_TWSI_OPTION3_GPIO;
+       gmpp &= ~DOVE_AU1_SPDIFO_GPIO_EN;
+       sspc1 &= ~DOVE_SSP_ON_AU1;
+       mpp4 &= ~DOVE_AU1_GPIO_SEL;
+
        if (config & BIT(0))
                gcfg2 |= DOVE_TWSI_OPTION3_GPIO;
        if (config & BIT(1))