Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63ace077 authored by Axel Lin's avatar Axel Lin Committed by Jason Cooper
Browse files

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: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 78f9f3b1

drivers/pinctrl/mvebu/pinctrl-dove.c

+8 −0
Original line number Diff line number Diff line
@@ -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))