Commit 6c98ac42 authored by Jonathan Neuschäfer's avatar Jonathan Neuschäfer Committed by Linus Walleij
Browse files

pinctrl: nuvoton: wpcm450: Fix handling of inverted MFSEL bits 



SCS3SEL and KBCCSEL use inverted logic: Whereas in other fields 0
selects the GPIO function and 1 selects the special function, in these
two fields, 0 selects the special function and 1 selects the GPIO
function.

Adjust the code to handle this quirk.

Signed-off-by: default avatarJonathan Neuschäfer <j.neuschaefer@gmx.net>
Link: https://lore.kernel.org/r/20221105185911.1547847-3-j.neuschaefer@gmx.net


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 4f1d423c

drivers/pinctrl/nuvoton/pinctrl-wpcm450.c

+11 −3
Original line number Diff line number Diff line
@@ -628,6 +628,9 @@ struct wpcm450_pincfg { 
	int fn1, reg1, bit1;

};



/* Add this value to bit0 or bit1 to indicate that the MFSEL bit is inverted */

#define INV	BIT(5)



static const struct wpcm450_pincfg pincfg[] = {

	/*		PIN	  FUNCTION 1		   FUNCTION 2 */

	WPCM450_PINCFG(0,	 none, NONE, 0,		  none, NONE, 0),
@@ -665,7 +668,7 @@ static const struct wpcm450_pincfg pincfg[] = { 


	WPCM450_PINCFG(32,	 scs1, MFSEL1, 3,	  none, NONE, 0),

	WPCM450_PINCFG(33,	 scs2, MFSEL1, 4,	  none, NONE, 0),

	WPCM450_PINCFG(34,	 scs3, MFSEL1, 5,	  none, NONE, 0),

	WPCM450_PINCFG(34,	 scs3, MFSEL1, 5 | INV,	  none, NONE, 0),

	WPCM450_PINCFG(35,	 xcs1, MFSEL1, 29,	  none, NONE, 0),

	WPCM450_PINCFG(36,	 xcs2, MFSEL1, 28,	  none, NONE, 0),

	WPCM450_PINCFG(37,	 none, NONE, 0,		  none, NONE, 0), /* DVO */
@@ -725,8 +728,8 @@ static const struct wpcm450_pincfg pincfg[] = { 
	WPCM450_PINCFG(90,	r2err, MFSEL1, 15,	  none, NONE, 0),

	WPCM450_PINCFG(91,	 r2md, MFSEL1, 16,	  none, NONE, 0),

	WPCM450_PINCFG(92,	 r2md, MFSEL1, 16,	  none, NONE, 0),

	WPCM450_PINCFG(93,	 kbcc, MFSEL1, 17,	  none, NONE, 0),

	WPCM450_PINCFG(94,	 kbcc, MFSEL1, 17,	  none, NONE, 0),

	WPCM450_PINCFG(93,	 kbcc, MFSEL1, 17 | INV,  none, NONE, 0),

	WPCM450_PINCFG(94,	 kbcc, MFSEL1, 17 | INV,  none, NONE, 0),

	WPCM450_PINCFG(95,	 none, NONE, 0,		  none, NONE, 0),



	WPCM450_PINCFG(96,	 none, NONE, 0,		  none, NONE, 0),
@@ -805,6 +808,11 @@ static void wpcm450_update_mfsel(struct regmap *gcr_regmap, int reg, int bit, in 
{

	bool value = (fn == fn_selected);



	if (bit & INV) {

		value = !value;

		bit &= ~INV;

	}



	regmap_update_bits(gcr_regmap, reg, BIT(bit), value ? BIT(bit) : 0);

}