Commit c22df08c authored by Jean-Nicolas Graux's avatar Jean-Nicolas Graux Committed by Linus Walleij
Browse files

pinctrl/nomadik: support other alternate-C functions 



Upgrade nomadik pinctrl driver to enable selection of other
alternate-C[1-4] functions on some specific ux500 SoC pins.
Handling of those functions is done thanks to PRCM GPIOCR
registers. This was previously managed in PRCMU driver and
it was not really convenient. Idea is to provide a common
way to control all alternate functions.

Note that this improvement does not support the old-fashioned way
used to control nomadik pins, namely the "nmk_config_pin()" function
and its derivatives.

Signed-off-by: default avatarJean-Nicolas Graux <jean-nicolas.graux@stericsson.com>
Reviewed-by: default avatarPhilippe Langlais <philippe.langlais@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 547b1e81

arch/arm/plat-nomadik/include/plat/gpio-nomadik.h

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,12 @@ 
#define NMK_GPIO_ALT_B	2

#define NMK_GPIO_ALT_C	(NMK_GPIO_ALT_A | NMK_GPIO_ALT_B)



#define NMK_GPIO_ALT_CX_SHIFT 2

#define NMK_GPIO_ALT_C1	((1<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)

#define NMK_GPIO_ALT_C2	((2<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)

#define NMK_GPIO_ALT_C3	((3<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)

#define NMK_GPIO_ALT_C4	((4<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)



/* Pull up/down values */

enum nmk_gpio_pull {

	NMK_GPIO_PULL_NONE,

arch/arm/plat-nomadik/include/plat/pincfg.h

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
 *	bit 19..20 - SLPM direction

 *	bit 21..22 - SLPM Value (if output)

 *	bit 23..25 - PDIS value (if input)

 *	bit	26 - Gpio mode

 *	bit	27 - Sleep mode

 *

 * to facilitate the definition, the following macros are provided

 *

drivers/pinctrl/pinctrl-nomadik-db8500.c

+285 −4
Original line number Diff line number Diff line
@@ -725,10 +725,10 @@ static const struct nmk_pingroup nmk_db8500_groups[] = { 
	DB8500_PIN_GROUP(spi0_c_1, NMK_GPIO_ALT_C),

	DB8500_PIN_GROUP(usbsim_c_2, NMK_GPIO_ALT_C),

	DB8500_PIN_GROUP(i2c3_c_2, NMK_GPIO_ALT_C),

	/* Other alt C1 column, these are still configured as alt C */

	DB8500_PIN_GROUP(kp_oc1_1, NMK_GPIO_ALT_C),

	DB8500_PIN_GROUP(spi2_oc1_1, NMK_GPIO_ALT_C),

	DB8500_PIN_GROUP(spi2_oc1_2, NMK_GPIO_ALT_C),

	/* Other alt C1 column */

	DB8500_PIN_GROUP(kp_oc1_1, NMK_GPIO_ALT_C1),

	DB8500_PIN_GROUP(spi2_oc1_1, NMK_GPIO_ALT_C1),

	DB8500_PIN_GROUP(spi2_oc1_2, NMK_GPIO_ALT_C1),

};



/* We use this macro to define the groups applicable to a function */
@@ -860,6 +860,284 @@ static const struct nmk_function nmk_db8500_functions[] = { 
	FUNCTION(spi2),

};



static const struct prcm_gpiocr_altcx_pin_desc db8500_altcx_pins[] = {

	PRCM_GPIOCR_ALTCX(23,	true, PRCM_IDX_GPIOCR1, 9,	/* STMAPE_CLK_a */

				true, PRCM_IDX_GPIOCR1, 7,	/* SBAG_CLK_a */

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(24,	true, PRCM_IDX_GPIOCR1, 9,	/* STMAPE or U2_RXD ??? */

				true, PRCM_IDX_GPIOCR1, 7,	/* SBAG_VAL_a */

				true, PRCM_IDX_GPIOCR1, 10,	/* STM_MOD_CMD0 */

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(25,	true, PRCM_IDX_GPIOCR1, 9,	/* STMAPE_DAT_a[0] */

				true, PRCM_IDX_GPIOCR1, 7,	/* SBAG_D_a[0] */

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(26,	true, PRCM_IDX_GPIOCR1, 9,	/* STMAPE_DAT_a[1] */

				true, PRCM_IDX_GPIOCR1, 7,	/* SBAG_D_a[1] */

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(27,	true, PRCM_IDX_GPIOCR1, 9,	/* STMAPE_DAT_a[2] */

				true, PRCM_IDX_GPIOCR1, 7,	/* SBAG_D_a[2] */

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(28,	true, PRCM_IDX_GPIOCR1, 9,	/* STMAPE_DAT_a[3] */

				true, PRCM_IDX_GPIOCR1, 7,	/* SBAG_D_a[3] */

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(29,	false, 0, 0,

				false, 0, 0,

				true, PRCM_IDX_GPIOCR1, 10,	/* STM_MOD_CMD0 */

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(30,	false, 0, 0,

				false, 0, 0,

				true, PRCM_IDX_GPIOCR1, 10,	/* STM_MOD_CMD0 */

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(31,	false, 0, 0,

				false, 0, 0,

				true, PRCM_IDX_GPIOCR1, 10,	/* STM_MOD_CMD0 */

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(32,	false, 0, 0,

				false, 0, 0,

				true, PRCM_IDX_GPIOCR1, 10,	/* STM_MOD_CMD0 */

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(68,	true, PRCM_IDX_GPIOCR1, 18,	/* REMAP_SELECT_ON */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(69,	true, PRCM_IDX_GPIOCR1, 18,	/* REMAP_SELECT_ON */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(70,	true, PRCM_IDX_GPIOCR1, 5,	/* PTM_A9_D23 */

				true, PRCM_IDX_GPIOCR2, 2,	/* DBG_ETM_R4_CMD0 */

				true, PRCM_IDX_GPIOCR1, 11,	/* STM_MOD_CMD1 */

				true, PRCM_IDX_GPIOCR1, 8	/* SBAG_CLK */

	),

	PRCM_GPIOCR_ALTCX(71,	true, PRCM_IDX_GPIOCR1, 5,	/* PTM_A9_D22 */

				true, PRCM_IDX_GPIOCR2, 2,	/* DBG_ETM_R4_CMD0 */

				true, PRCM_IDX_GPIOCR1, 11,	/* STM_MOD_CMD1 */

				true, PRCM_IDX_GPIOCR1, 8	/* SBAG_D3 */

	),

	PRCM_GPIOCR_ALTCX(72,	true, PRCM_IDX_GPIOCR1, 5,	/* PTM_A9_D21 */

				true, PRCM_IDX_GPIOCR2, 2,	/* DBG_ETM_R4_CMD0 */

				true, PRCM_IDX_GPIOCR1, 11,	/* STM_MOD_CMD1 */

				true, PRCM_IDX_GPIOCR1, 8	/* SBAG_D2 */

	),

	PRCM_GPIOCR_ALTCX(73,	true, PRCM_IDX_GPIOCR1, 5,	/* PTM_A9_D20 */

				true, PRCM_IDX_GPIOCR2, 2,	/* DBG_ETM_R4_CMD0 */

				true, PRCM_IDX_GPIOCR1, 11,	/* STM_MOD_CMD1 */

				true, PRCM_IDX_GPIOCR1, 8	/* SBAG_D1 */

	),

	PRCM_GPIOCR_ALTCX(74,	true, PRCM_IDX_GPIOCR1, 5,	/* PTM_A9_D19 */

				true, PRCM_IDX_GPIOCR2, 2,	/* DBG_ETM_R4_CMD0 */

				true, PRCM_IDX_GPIOCR1, 11,	/* STM_MOD_CMD1 */

				true, PRCM_IDX_GPIOCR1, 8	/* SBAG_D0 */

	),

	PRCM_GPIOCR_ALTCX(75,	true, PRCM_IDX_GPIOCR1, 5,	/* PTM_A9_D18 */

				true, PRCM_IDX_GPIOCR2, 2,	/* DBG_ETM_R4_CMD0 */

				true, PRCM_IDX_GPIOCR1, 0,	/* DBG_UARTMOD_CMD0 */

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(76,	true, PRCM_IDX_GPIOCR1, 5,	/* PTM_A9_D17 */

				true, PRCM_IDX_GPIOCR2, 2,	/* DBG_ETM_R4_CMD0 */

				true, PRCM_IDX_GPIOCR1, 0,	/* DBG_UARTMOD_CMD0 */

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(77,	true, PRCM_IDX_GPIOCR1, 5,	/* PTM_A9_D16 */

				true, PRCM_IDX_GPIOCR2, 2,	/* DBG_ETM_R4_CMD0 */

				false, 0, 0,

				true, PRCM_IDX_GPIOCR1, 8	/* SBAG_VAL */

	),

	PRCM_GPIOCR_ALTCX(86,	true, PRCM_IDX_GPIOCR1, 12,	/* KP_O3 */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(87,	true, PRCM_IDX_GPIOCR1, 12,	/* KP_O2 */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(88,	true, PRCM_IDX_GPIOCR1, 12,	/* KP_I3 */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(89,	true, PRCM_IDX_GPIOCR1, 12,	/* KP_I2 */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(90,	true, PRCM_IDX_GPIOCR1, 12,	/* KP_O1 */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(91,	true, PRCM_IDX_GPIOCR1, 12,	/* KP_O0 */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(92,	true, PRCM_IDX_GPIOCR1, 12,	/* KP_I1 */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(93,	true, PRCM_IDX_GPIOCR1, 12,	/* KP_I0 */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(96,	true, PRCM_IDX_GPIOCR2, 3,	/* RF_INT */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(97,	true, PRCM_IDX_GPIOCR2, 1,	/* RF_CTRL */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(151,	false, 0, 0,

				true, PRCM_IDX_GPIOCR1, 6,	/* PTM_A9_CTL */

				true, PRCM_IDX_GPIOCR1, 15,	/* DBG_ETM_R4_CMD1*/

				true, PRCM_IDX_GPIOCR1, 25	/* HW_OBS17 */

	),

	PRCM_GPIOCR_ALTCX(152,	true, PRCM_IDX_GPIOCR1, 4,	/* Hx_CLK */

				true, PRCM_IDX_GPIOCR1, 6,	/* PTM_A9_CLK */

				true, PRCM_IDX_GPIOCR1, 15,	/* DBG_ETM_R4_CMD1*/

				true, PRCM_IDX_GPIOCR1, 25	/* HW_OBS16 */

	),

	PRCM_GPIOCR_ALTCX(153,	true, PRCM_IDX_GPIOCR1, 1,	/* UARTMOD_CMD1 */

				true, PRCM_IDX_GPIOCR1, 14,	/* PTM_A9_D15 */

				true, PRCM_IDX_GPIOCR1, 19,	/* DBG_ETM_R4_CMD2 */

				true, PRCM_IDX_GPIOCR1, 25	/* HW_OBS15 */

	),

	PRCM_GPIOCR_ALTCX(154,	true, PRCM_IDX_GPIOCR1, 1,	/* UARTMOD_CMD1 */

				true, PRCM_IDX_GPIOCR1, 14,	/* PTM_A9_D14 */

				true, PRCM_IDX_GPIOCR1, 19,	/* DBG_ETM_R4_CMD2 */

				true, PRCM_IDX_GPIOCR1, 25	/* HW_OBS14 */

	),

	PRCM_GPIOCR_ALTCX(155,	true, PRCM_IDX_GPIOCR1, 13,	/* STM_MOD_CMD2 */

				true, PRCM_IDX_GPIOCR1, 14,	/* PTM_A9_D13 */

				true, PRCM_IDX_GPIOCR1, 19,	/* DBG_ETM_R4_CMD2 */

				true, PRCM_IDX_GPIOCR1, 25	/* HW_OBS13 */

	),

	PRCM_GPIOCR_ALTCX(156,	true, PRCM_IDX_GPIOCR1, 13,	/* STM_MOD_CMD2 */

				true, PRCM_IDX_GPIOCR1, 14,	/* PTM_A9_D12 */

				true, PRCM_IDX_GPIOCR1, 19,	/* DBG_ETM_R4_CMD2 */

				true, PRCM_IDX_GPIOCR1, 25	/* HW_OBS12 */

	),

	PRCM_GPIOCR_ALTCX(157,	true, PRCM_IDX_GPIOCR1, 13,	/* STM_MOD_CMD2 */

				true, PRCM_IDX_GPIOCR1, 14,	/* PTM_A9_D11 */

				true, PRCM_IDX_GPIOCR1, 19,	/* DBG_ETM_R4_CMD2 */

				true, PRCM_IDX_GPIOCR1, 25	/* HW_OBS11 */

	),

	PRCM_GPIOCR_ALTCX(158,	true, PRCM_IDX_GPIOCR1, 13,	/* STM_MOD_CMD2 */

				true, PRCM_IDX_GPIOCR1, 14,	/* PTM_A9_D10 */

				true, PRCM_IDX_GPIOCR1, 19,	/* DBG_ETM_R4_CMD2 */

				true, PRCM_IDX_GPIOCR1, 25	/* HW_OBS10 */

	),

	PRCM_GPIOCR_ALTCX(159,	true, PRCM_IDX_GPIOCR1, 13,	/* STM_MOD_CMD2 */

				true, PRCM_IDX_GPIOCR1, 14,	/* PTM_A9_D9 */

				true, PRCM_IDX_GPIOCR1, 19,	/* DBG_ETM_R4_CMD2 */

				true, PRCM_IDX_GPIOCR1, 25	/* HW_OBS9 */

	),

	PRCM_GPIOCR_ALTCX(160,	false, 0, 0,

				true, PRCM_IDX_GPIOCR1, 14,	/* PTM_A9_D8 */

				true, PRCM_IDX_GPIOCR1, 19,	/* DBG_ETM_R4_CMD2 */

				true, PRCM_IDX_GPIOCR1, 25	/* HW_OBS8 */

	),

	PRCM_GPIOCR_ALTCX(161,	true, PRCM_IDX_GPIOCR1, 4,	/* Hx_GPIO7 */

				true, PRCM_IDX_GPIOCR1, 6,	/* PTM_A9_D7 */

				true, PRCM_IDX_GPIOCR1, 15,	/* DBG_ETM_R4_CMD1*/

				true, PRCM_IDX_GPIOCR1, 24	/* HW_OBS7 */

	),

	PRCM_GPIOCR_ALTCX(162,	true, PRCM_IDX_GPIOCR1, 4,	/* Hx_GPIO6 */

				true, PRCM_IDX_GPIOCR1, 6,	/* PTM_A9_D6 */

				true, PRCM_IDX_GPIOCR1, 15,	/* DBG_ETM_R4_CMD1*/

				true, PRCM_IDX_GPIOCR1, 24	/* HW_OBS6 */

	),

	PRCM_GPIOCR_ALTCX(163,	true, PRCM_IDX_GPIOCR1, 4,	/* Hx_GPIO5 */

				true, PRCM_IDX_GPIOCR1, 6,	/* PTM_A9_D5 */

				true, PRCM_IDX_GPIOCR1, 15,	/* DBG_ETM_R4_CMD1*/

				true, PRCM_IDX_GPIOCR1, 24	/* HW_OBS5 */

	),

	PRCM_GPIOCR_ALTCX(164,	true, PRCM_IDX_GPIOCR1, 4,	/* Hx_GPIO4 */

				true, PRCM_IDX_GPIOCR1, 6,	/* PTM_A9_D4 */

				true, PRCM_IDX_GPIOCR1, 15,	/* DBG_ETM_R4_CMD1*/

				true, PRCM_IDX_GPIOCR1, 24	/* HW_OBS4 */

	),

	PRCM_GPIOCR_ALTCX(165,	true, PRCM_IDX_GPIOCR1, 4,	/* Hx_GPIO3 */

				true, PRCM_IDX_GPIOCR1, 6,	/* PTM_A9_D3 */

				true, PRCM_IDX_GPIOCR1, 15,	/* DBG_ETM_R4_CMD1*/

				true, PRCM_IDX_GPIOCR1, 24	/* HW_OBS3 */

	),

	PRCM_GPIOCR_ALTCX(166,	true, PRCM_IDX_GPIOCR1, 4,	/* Hx_GPIO2 */

				true, PRCM_IDX_GPIOCR1, 6,	/* PTM_A9_D2 */

				true, PRCM_IDX_GPIOCR1, 15,	/* DBG_ETM_R4_CMD1*/

				true, PRCM_IDX_GPIOCR1, 24	/* HW_OBS2 */

	),

	PRCM_GPIOCR_ALTCX(167,	true, PRCM_IDX_GPIOCR1, 4,	/* Hx_GPIO1 */

				true, PRCM_IDX_GPIOCR1, 6,	/* PTM_A9_D1 */

				true, PRCM_IDX_GPIOCR1, 15,	/* DBG_ETM_R4_CMD1*/

				true, PRCM_IDX_GPIOCR1, 24	/* HW_OBS1 */

	),

	PRCM_GPIOCR_ALTCX(168,	true, PRCM_IDX_GPIOCR1, 4,	/* Hx_GPIO0 */

				true, PRCM_IDX_GPIOCR1, 6,	/* PTM_A9_D0 */

				true, PRCM_IDX_GPIOCR1, 15,	/* DBG_ETM_R4_CMD1*/

				true, PRCM_IDX_GPIOCR1, 24	/* HW_OBS0 */

	),

	PRCM_GPIOCR_ALTCX(170,	true, PRCM_IDX_GPIOCR2, 2,	/* RF_INT */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(171,	true, PRCM_IDX_GPIOCR2, 0,	/* RF_CTRL */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(215,	true, PRCM_IDX_GPIOCR1, 23,	/* SPI2_TXD */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(216,	true, PRCM_IDX_GPIOCR1, 23,	/* SPI2_FRM */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(217,	true, PRCM_IDX_GPIOCR1, 23,	/* SPI2_CLK */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

	PRCM_GPIOCR_ALTCX(218,	true, PRCM_IDX_GPIOCR1, 23,	/* SPI2_RXD */

				false, 0, 0,

				false, 0, 0,

				false, 0, 0

	),

};



static const u16 db8500_prcm_gpiocr_regs[] = {

	[PRCM_IDX_GPIOCR1] = 0x138,

	[PRCM_IDX_GPIOCR2] = 0x574,

};



static const struct nmk_pinctrl_soc_data nmk_db8500_soc = {

	.gpio_ranges = nmk_db8500_ranges,

	.gpio_num_ranges = ARRAY_SIZE(nmk_db8500_ranges),
@@ -869,6 +1147,9 @@ static const struct nmk_pinctrl_soc_data nmk_db8500_soc = { 
	.nfunctions = ARRAY_SIZE(nmk_db8500_functions),

	.groups = nmk_db8500_groups,

	.ngroups = ARRAY_SIZE(nmk_db8500_groups),

	.altcx_pins = db8500_altcx_pins,

	.npins_altcx = ARRAY_SIZE(db8500_altcx_pins),

	.prcm_gpiocr_registers = db8500_prcm_gpiocr_regs,

};



void __devinit

drivers/pinctrl/pinctrl-nomadik-db8540.c

+303 −41

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pinctrl/pinctrl-nomadik.c

+99 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/pinctrl/pinconf.h>

/* Since we request GPIOs from ourself */

#include <linux/pinctrl/consumer.h>

#include <linux/mfd/dbx500-prcmu.h>



#include <asm/mach/irq.h>
@@ -237,6 +238,89 @@ nmk_gpio_disable_lazy_irq(struct nmk_gpio_chip *nmk_chip, unsigned offset) 
	dev_dbg(nmk_chip->chip.dev, "%d: clearing interrupt mask\n", gpio);

}



static void nmk_prcm_altcx_set_mode(struct nmk_pinctrl *npct,

	unsigned offset, unsigned alt_num)

{

	int i;

	u16 reg;

	u8 bit;

	u8 alt_index;

	const struct prcm_gpiocr_altcx_pin_desc *pin_desc;

	const u16 *gpiocr_regs;



	if (alt_num > PRCM_IDX_GPIOCR_ALTC_MAX) {

		dev_err(npct->dev, "PRCM GPIOCR: alternate-C%i is invalid\n",

			alt_num);

		return;

	}



	for (i = 0 ; i < npct->soc->npins_altcx ; i++) {

		if (npct->soc->altcx_pins[i].pin == offset)

			break;

	}

	if (i == npct->soc->npins_altcx) {

		dev_dbg(npct->dev, "PRCM GPIOCR: pin %i is not found\n",

			offset);

		return;

	}



	pin_desc = npct->soc->altcx_pins + i;

	gpiocr_regs = npct->soc->prcm_gpiocr_registers;



	/*

	 * If alt_num is NULL, just clear current ALTCx selection

	 * to make sure we come back to a pure ALTC selection

	 */

	if (!alt_num) {

		for (i = 0 ; i < PRCM_IDX_GPIOCR_ALTC_MAX ; i++) {

			if (pin_desc->altcx[i].used == true) {

				reg = gpiocr_regs[pin_desc->altcx[i].reg_index];

				bit = pin_desc->altcx[i].control_bit;

				if (prcmu_read(reg) & BIT(bit)) {

					prcmu_write_masked(reg, BIT(bit), 0);

					dev_dbg(npct->dev,

						"PRCM GPIOCR: pin %i: alternate-C%i has been disabled\n",

						offset, i+1);

				}

			}

		}

		return;

	}



	alt_index = alt_num - 1;

	if (pin_desc->altcx[alt_index].used == false) {

		dev_warn(npct->dev,

			"PRCM GPIOCR: pin %i: alternate-C%i does not exist\n",

			offset, alt_num);

		return;

	}



	/*

	 * Check if any other ALTCx functions are activated on this pin

	 * and disable it first.

	 */

	for (i = 0 ; i < PRCM_IDX_GPIOCR_ALTC_MAX ; i++) {

		if (i == alt_index)

			continue;

		if (pin_desc->altcx[i].used == true) {

			reg = gpiocr_regs[pin_desc->altcx[i].reg_index];

			bit = pin_desc->altcx[i].control_bit;

			if (prcmu_read(reg) & BIT(bit)) {

				prcmu_write_masked(reg, BIT(bit), 0);

				dev_dbg(npct->dev,

					"PRCM GPIOCR: pin %i: alternate-C%i has been disabled\n",

					offset, i+1);

			}

		}

	}



	reg = gpiocr_regs[pin_desc->altcx[alt_index].reg_index];

	bit = pin_desc->altcx[alt_index].control_bit;

	dev_dbg(npct->dev, "PRCM GPIOCR: pin %i: alternate-C%i has been selected\n",

		offset, alt_index+1);

	prcmu_write_masked(reg, BIT(bit), BIT(bit));

}



static void __nmk_config_pin(struct nmk_gpio_chip *nmk_chip, unsigned offset,

			     pin_cfg_t cfg, bool sleep, unsigned int *slpmregs)

{
@@ -1441,7 +1525,7 @@ static int nmk_pmx_enable(struct pinctrl_dev *pctldev, unsigned function, 
	 * IOFORCE will switch *all* ports to their sleepmode setting to as

	 * to avoid glitches. (Not just one port!)

	 */

	glitch = (g->altsetting == NMK_GPIO_ALT_C);

	glitch = ((g->altsetting & NMK_GPIO_ALT_C) == NMK_GPIO_ALT_C);



	if (glitch) {

		spin_lock_irqsave(&nmk_gpio_slpm_lock, flags);
@@ -1491,8 +1575,21 @@ static int nmk_pmx_enable(struct pinctrl_dev *pctldev, unsigned function, 
		 */

		nmk_gpio_disable_lazy_irq(nmk_chip, bit);



		__nmk_gpio_set_mode_safe(nmk_chip, bit, g->altsetting, glitch);

		__nmk_gpio_set_mode_safe(nmk_chip, bit,

			(g->altsetting & NMK_GPIO_ALT_C), glitch);

		clk_disable(nmk_chip->clk);



		/*

		 * Call PRCM GPIOCR config function in case ALTC

		 * has been selected:

		 * - If selection is a ALTCx, some bits in PRCM GPIOCR registers

		 *   must be set.

		 * - If selection is pure ALTC and previous selection was ALTCx,

		 *   then some bits in PRCM GPIOCR registers must be cleared.

		 */

		if ((g->altsetting & NMK_GPIO_ALT_C) == NMK_GPIO_ALT_C)

			nmk_prcm_altcx_set_mode(npct, g->pins[i],

				g->altsetting >> NMK_GPIO_ALT_CX_SHIFT);

	}



	/* When all pins are successfully reconfigured we get here */

CRA Git | Maintained and supported by SUSTech CRA and CCSE