diff options
| author | Axel Lin | 2012-11-19 10:39:54 +0100 |
|---|---|---|
| committer | Jason Cooper | 2012-11-24 03:57:19 +0100 |
| commit | 63ace077b427a86464da34855d35addfa308e807 (patch) | |
| tree | e34171da6dd1e1a973de7438de6cbe9683bdd90f /drivers/pinctrl | |
| parent | pinctrl: mvebu: fix iomem pointer for dove pinctrl (diff) | |
| download | kernel-qcow2-linux-63ace077b427a86464da34855d35addfa308e807.tar.gz kernel-qcow2-linux-63ace077b427a86464da34855d35addfa308e807.tar.xz kernel-qcow2-linux-63ace077b427a86464da34855d35addfa308e807.zip | |
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>
Diffstat (limited to 'drivers/pinctrl')
| -rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-dove.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c index 34693f60d39c..40c9c3eecd94 100644 --- 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)) |