Commit 4d1816cd authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

pinctrl: sh-pfc: Move PIN_NONE to shared header file 



Several drivers have identical definitions for PIN_NONE.
Provide a definition with a SH_PFC_ prefix for general use in sh_pfc.h,
and convert all drivers over to use it.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent f1074e72

drivers/pinctrl/sh-pfc/pfc-r8a7778.c

+37 −39
Original line number Diff line number Diff line
@@ -2921,8 +2921,6 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { 
	{ },

};



#define PIN_NONE	U16_MAX



static const struct pinmux_bias_reg pinmux_bias_regs[] = {

	{ PINMUX_BIAS_REG("PUPR0", 0x100, "N/A", 0) {

		[ 0] = RCAR_GP_PIN(0,  6),	/* A0 */
@@ -2969,28 +2967,28 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
		[ 7] = RCAR_GP_PIN(1, 10),	/* DACK0	*/

		[ 8] = RCAR_GP_PIN(1, 12),	/* IRQ0		*/

		[ 9] = RCAR_GP_PIN(1, 13),	/* IRQ1		*/

		[10] = PIN_NONE,

		[11] = PIN_NONE,

		[12] = PIN_NONE,

		[13] = PIN_NONE,

		[14] = PIN_NONE,

		[15] = PIN_NONE,

		[16] = PIN_NONE,

		[17] = PIN_NONE,

		[18] = PIN_NONE,

		[19] = PIN_NONE,

		[20] = PIN_NONE,

		[21] = PIN_NONE,

		[22] = PIN_NONE,

		[23] = PIN_NONE,

		[24] = PIN_NONE,

		[25] = PIN_NONE,

		[26] = PIN_NONE,

		[27] = PIN_NONE,

		[28] = PIN_NONE,

		[29] = PIN_NONE,

		[30] = PIN_NONE,

		[31] = PIN_NONE,

		[10] = SH_PFC_PIN_NONE,

		[11] = SH_PFC_PIN_NONE,

		[12] = SH_PFC_PIN_NONE,

		[13] = SH_PFC_PIN_NONE,

		[14] = SH_PFC_PIN_NONE,

		[15] = SH_PFC_PIN_NONE,

		[16] = SH_PFC_PIN_NONE,

		[17] = SH_PFC_PIN_NONE,

		[18] = SH_PFC_PIN_NONE,

		[19] = SH_PFC_PIN_NONE,

		[20] = SH_PFC_PIN_NONE,

		[21] = SH_PFC_PIN_NONE,

		[22] = SH_PFC_PIN_NONE,

		[23] = SH_PFC_PIN_NONE,

		[24] = SH_PFC_PIN_NONE,

		[25] = SH_PFC_PIN_NONE,

		[26] = SH_PFC_PIN_NONE,

		[27] = SH_PFC_PIN_NONE,

		[28] = SH_PFC_PIN_NONE,

		[29] = SH_PFC_PIN_NONE,

		[30] = SH_PFC_PIN_NONE,

		[31] = SH_PFC_PIN_NONE,

	} },

	{ PINMUX_BIAS_REG("PUPR2", 0x108, "N/A", 0) {

		[ 0] = RCAR_GP_PIN(1, 22),	/* DU0_DR0	*/
@@ -3112,21 +3110,21 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
		[14] = RCAR_GP_PIN(4, 20),	/* ETH_MAGIC	*/

		[15] = RCAR_GP_PIN(4, 25),	/* AVS1		*/

		[16] = RCAR_GP_PIN(4, 26),	/* AVS2		*/

		[17] = PIN_NONE,

		[18] = PIN_NONE,

		[19] = PIN_NONE,

		[20] = PIN_NONE,

		[21] = PIN_NONE,

		[22] = PIN_NONE,

		[23] = PIN_NONE,

		[24] = PIN_NONE,

		[25] = PIN_NONE,

		[26] = PIN_NONE,

		[27] = PIN_NONE,

		[28] = PIN_NONE,

		[29] = PIN_NONE,

		[30] = PIN_NONE,

		[31] = PIN_NONE,

		[17] = SH_PFC_PIN_NONE,

		[18] = SH_PFC_PIN_NONE,

		[19] = SH_PFC_PIN_NONE,

		[20] = SH_PFC_PIN_NONE,

		[21] = SH_PFC_PIN_NONE,

		[22] = SH_PFC_PIN_NONE,

		[23] = SH_PFC_PIN_NONE,

		[24] = SH_PFC_PIN_NONE,

		[25] = SH_PFC_PIN_NONE,

		[26] = SH_PFC_PIN_NONE,

		[27] = SH_PFC_PIN_NONE,

		[28] = SH_PFC_PIN_NONE,

		[29] = SH_PFC_PIN_NONE,

		[30] = SH_PFC_PIN_NONE,

		[31] = SH_PFC_PIN_NONE,

	} },

	{ /* sentinel */ },

};

drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c

+26 −27
Original line number Diff line number Diff line
@@ -1451,7 +1451,6 @@ static const u16 pinmux_data[] = { 
#define ROW_GROUP_A(r) ('Z' - 'A' + 1 + (r))

#define PIN_NUMBER(r, c) (((r) - 'A') * 39 + (c) + 300)

#define PIN_A_NUMBER(r, c) PIN_NUMBER(ROW_GROUP_A(r), c)

#define PIN_NONE U16_MAX



static const struct sh_pfc_pin pinmux_pins[] = {

	PINMUX_GPIO_GP_ALL(),
@@ -5656,7 +5655,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
		[ 5] = PIN_A_NUMBER('T', 27),	/* TCK */

		[ 6] = PIN_A_NUMBER('R', 30),	/* TMS */

		[ 7] = PIN_A_NUMBER('R', 29),	/* TDI */

		[ 8] = PIN_NONE,

		[ 8] = SH_PFC_PIN_NONE,

		[ 9] = PIN_A_NUMBER('T', 30),	/* ASEBRK */

		[10] = RCAR_GP_PIN(3,  0),	/* SD0_CLK */

		[11] = RCAR_GP_PIN(3,  1),	/* SD0_CMD */
@@ -5757,31 +5756,31 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
		[ 4] = RCAR_GP_PIN(6, 29),	/* USB30_OVC */

		[ 5] = RCAR_GP_PIN(6, 30),	/* USB31_PWEN */

		[ 6] = RCAR_GP_PIN(6, 31),	/* USB31_OVC */

		[ 7] = PIN_NONE,

		[ 8] = PIN_NONE,

		[ 9] = PIN_NONE,

		[10] = PIN_NONE,

		[11] = PIN_NONE,

		[12] = PIN_NONE,

		[13] = PIN_NONE,

		[14] = PIN_NONE,

		[15] = PIN_NONE,

		[16] = PIN_NONE,

		[17] = PIN_NONE,

		[18] = PIN_NONE,

		[19] = PIN_NONE,

		[20] = PIN_NONE,

		[21] = PIN_NONE,

		[22] = PIN_NONE,

		[23] = PIN_NONE,

		[24] = PIN_NONE,

		[25] = PIN_NONE,

		[26] = PIN_NONE,

		[27] = PIN_NONE,

		[28] = PIN_NONE,

		[29] = PIN_NONE,

		[30] = PIN_NONE,

		[31] = PIN_NONE,

		[ 7] = SH_PFC_PIN_NONE,

		[ 8] = SH_PFC_PIN_NONE,

		[ 9] = SH_PFC_PIN_NONE,

		[10] = SH_PFC_PIN_NONE,

		[11] = SH_PFC_PIN_NONE,

		[12] = SH_PFC_PIN_NONE,

		[13] = SH_PFC_PIN_NONE,

		[14] = SH_PFC_PIN_NONE,

		[15] = SH_PFC_PIN_NONE,

		[16] = SH_PFC_PIN_NONE,

		[17] = SH_PFC_PIN_NONE,

		[18] = SH_PFC_PIN_NONE,

		[19] = SH_PFC_PIN_NONE,

		[20] = SH_PFC_PIN_NONE,

		[21] = SH_PFC_PIN_NONE,

		[22] = SH_PFC_PIN_NONE,

		[23] = SH_PFC_PIN_NONE,

		[24] = SH_PFC_PIN_NONE,

		[25] = SH_PFC_PIN_NONE,

		[26] = SH_PFC_PIN_NONE,

		[27] = SH_PFC_PIN_NONE,

		[28] = SH_PFC_PIN_NONE,

		[29] = SH_PFC_PIN_NONE,

		[30] = SH_PFC_PIN_NONE,

		[31] = SH_PFC_PIN_NONE,

	} },

	{ /* sentinel */ },

};

drivers/pinctrl/sh-pfc/pfc-r8a7795.c

+26 −27
Original line number Diff line number Diff line
@@ -1512,7 +1512,6 @@ static const u16 pinmux_data[] = { 
#define ROW_GROUP_A(r) ('Z' - 'A' + 1 + (r))

#define PIN_NUMBER(r, c) (((r) - 'A') * 39 + (c) + 300)

#define PIN_A_NUMBER(r, c) PIN_NUMBER(ROW_GROUP_A(r), c)

#define PIN_NONE U16_MAX



static const struct sh_pfc_pin pinmux_pins[] = {

	PINMUX_GPIO_GP_ALL(),
@@ -6006,7 +6005,7 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
		[ 5] = PIN_A_NUMBER('T', 27),	/* TCK */

		[ 6] = PIN_A_NUMBER('R', 30),	/* TMS */

		[ 7] = PIN_A_NUMBER('R', 29),	/* TDI */

		[ 8] = PIN_NONE,

		[ 8] = SH_PFC_PIN_NONE,

		[ 9] = PIN_A_NUMBER('T', 30),	/* ASEBRK */

		[10] = RCAR_GP_PIN(3,  0),	/* SD0_CLK */

		[11] = RCAR_GP_PIN(3,  1),	/* SD0_CMD */
@@ -6107,31 +6106,31 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
		[ 4] = RCAR_GP_PIN(6, 29),	/* USB30_OVC */

		[ 5] = RCAR_GP_PIN(6, 30),	/* USB2_CH3_PWEN */

		[ 6] = RCAR_GP_PIN(6, 31),	/* USB2_CH3_OVC */

		[ 7] = PIN_NONE,

		[ 8] = PIN_NONE,

		[ 9] = PIN_NONE,

		[10] = PIN_NONE,

		[11] = PIN_NONE,

		[12] = PIN_NONE,

		[13] = PIN_NONE,

		[14] = PIN_NONE,

		[15] = PIN_NONE,

		[16] = PIN_NONE,

		[17] = PIN_NONE,

		[18] = PIN_NONE,

		[19] = PIN_NONE,

		[20] = PIN_NONE,

		[21] = PIN_NONE,

		[22] = PIN_NONE,

		[23] = PIN_NONE,

		[24] = PIN_NONE,

		[25] = PIN_NONE,

		[26] = PIN_NONE,

		[27] = PIN_NONE,

		[28] = PIN_NONE,

		[29] = PIN_NONE,

		[30] = PIN_NONE,

		[31] = PIN_NONE,

		[ 7] = SH_PFC_PIN_NONE,

		[ 8] = SH_PFC_PIN_NONE,

		[ 9] = SH_PFC_PIN_NONE,

		[10] = SH_PFC_PIN_NONE,

		[11] = SH_PFC_PIN_NONE,

		[12] = SH_PFC_PIN_NONE,

		[13] = SH_PFC_PIN_NONE,

		[14] = SH_PFC_PIN_NONE,

		[15] = SH_PFC_PIN_NONE,

		[16] = SH_PFC_PIN_NONE,

		[17] = SH_PFC_PIN_NONE,

		[18] = SH_PFC_PIN_NONE,

		[19] = SH_PFC_PIN_NONE,

		[20] = SH_PFC_PIN_NONE,

		[21] = SH_PFC_PIN_NONE,

		[22] = SH_PFC_PIN_NONE,

		[23] = SH_PFC_PIN_NONE,

		[24] = SH_PFC_PIN_NONE,

		[25] = SH_PFC_PIN_NONE,

		[26] = SH_PFC_PIN_NONE,

		[27] = SH_PFC_PIN_NONE,

		[28] = SH_PFC_PIN_NONE,

		[29] = SH_PFC_PIN_NONE,

		[30] = SH_PFC_PIN_NONE,

		[31] = SH_PFC_PIN_NONE,

	} },

	{ /* sentinel */ },

};

drivers/pinctrl/sh-pfc/pfc-r8a7796.c

+27 −28
Original line number Diff line number Diff line
@@ -1516,7 +1516,6 @@ static const u16 pinmux_data[] = { 
#define ROW_GROUP_A(r) ('Z' - 'A' + 1 + (r))

#define PIN_NUMBER(r, c) (((r) - 'A') * 39 + (c) + 300)

#define PIN_A_NUMBER(r, c) PIN_NUMBER(ROW_GROUP_A(r), c)

#define PIN_NONE U16_MAX



static const struct sh_pfc_pin pinmux_pins[] = {

	PINMUX_GPIO_GP_ALL(),
@@ -5965,14 +5964,14 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
	} },

	{ PINMUX_BIAS_REG("PUEN3", 0xe606040c, "PUD3", 0xe606044c) {

		[ 0] = PIN_A_NUMBER('R', 8),	/* DU_DOTCLKIN2 */

		[ 1] = PIN_NONE,

		[ 1] = SH_PFC_PIN_NONE,

		[ 2] = PIN_A_NUMBER('D', 38),	/* FSCLKST */

		[ 3] = PIN_A_NUMBER('D', 39),	/* EXTALR*/

		[ 4] = PIN_A_NUMBER('R', 26),	/* TRST# */

		[ 5] = PIN_A_NUMBER('T', 27),	/* TCK */

		[ 6] = PIN_A_NUMBER('R', 30),	/* TMS */

		[ 7] = PIN_A_NUMBER('R', 29),	/* TDI */

		[ 8] = PIN_NONE,

		[ 8] = SH_PFC_PIN_NONE,

		[ 9] = PIN_A_NUMBER('T', 30),	/* ASEBRK */

		[10] = RCAR_GP_PIN(3,  0),	/* SD0_CLK */

		[11] = RCAR_GP_PIN(3,  1),	/* SD0_CMD */
@@ -6073,31 +6072,31 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
		[ 4] = RCAR_GP_PIN(6, 29),	/* USB30_OVC */

		[ 5] = RCAR_GP_PIN(6, 30),	/* GP6_30 */

		[ 6] = RCAR_GP_PIN(6, 31),	/* GP6_31 */

		[ 7] = PIN_NONE,

		[ 8] = PIN_NONE,

		[ 9] = PIN_NONE,

		[10] = PIN_NONE,

		[11] = PIN_NONE,

		[12] = PIN_NONE,

		[13] = PIN_NONE,

		[14] = PIN_NONE,

		[15] = PIN_NONE,

		[16] = PIN_NONE,

		[17] = PIN_NONE,

		[18] = PIN_NONE,

		[19] = PIN_NONE,

		[20] = PIN_NONE,

		[21] = PIN_NONE,

		[22] = PIN_NONE,

		[23] = PIN_NONE,

		[24] = PIN_NONE,

		[25] = PIN_NONE,

		[26] = PIN_NONE,

		[27] = PIN_NONE,

		[28] = PIN_NONE,

		[29] = PIN_NONE,

		[30] = PIN_NONE,

		[31] = PIN_NONE,

		[ 7] = SH_PFC_PIN_NONE,

		[ 8] = SH_PFC_PIN_NONE,

		[ 9] = SH_PFC_PIN_NONE,

		[10] = SH_PFC_PIN_NONE,

		[11] = SH_PFC_PIN_NONE,

		[12] = SH_PFC_PIN_NONE,

		[13] = SH_PFC_PIN_NONE,

		[14] = SH_PFC_PIN_NONE,

		[15] = SH_PFC_PIN_NONE,

		[16] = SH_PFC_PIN_NONE,

		[17] = SH_PFC_PIN_NONE,

		[18] = SH_PFC_PIN_NONE,

		[19] = SH_PFC_PIN_NONE,

		[20] = SH_PFC_PIN_NONE,

		[21] = SH_PFC_PIN_NONE,

		[22] = SH_PFC_PIN_NONE,

		[23] = SH_PFC_PIN_NONE,

		[24] = SH_PFC_PIN_NONE,

		[25] = SH_PFC_PIN_NONE,

		[26] = SH_PFC_PIN_NONE,

		[27] = SH_PFC_PIN_NONE,

		[28] = SH_PFC_PIN_NONE,

		[29] = SH_PFC_PIN_NONE,

		[30] = SH_PFC_PIN_NONE,

		[31] = SH_PFC_PIN_NONE,

	} },

	{ /* sentinel */ },

};

drivers/pinctrl/sh-pfc/pfc-r8a77965.c

+27 −28
Original line number Diff line number Diff line
@@ -1521,7 +1521,6 @@ static const u16 pinmux_data[] = { 
#define ROW_GROUP_A(r) ('Z' - 'A' + 1 + (r))

#define PIN_NUMBER(r, c) (((r) - 'A') * 39 + (c) + 300)

#define PIN_A_NUMBER(r, c) PIN_NUMBER(ROW_GROUP_A(r), c)

#define PIN_NONE U16_MAX



static const struct sh_pfc_pin pinmux_pins[] = {

	PINMUX_GPIO_GP_ALL(),
@@ -6205,14 +6204,14 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
	} },

	{ PINMUX_BIAS_REG("PUEN3", 0xe606040c, "PUD3", 0xe606044c) {

		[ 0] = PIN_A_NUMBER('R', 8),	/* DU_DOTCLKIN3 */

		[ 1] = PIN_NONE,

		[ 1] = SH_PFC_PIN_NONE,

		[ 2] = PIN_A_NUMBER('D', 38),	/* FSCLKST */

		[ 3] = PIN_A_NUMBER('D', 39),	/* EXTALR*/

		[ 4] = PIN_A_NUMBER('R', 26),	/* TRST# */

		[ 5] = PIN_A_NUMBER('T', 27),	/* TCK */

		[ 6] = PIN_A_NUMBER('R', 30),	/* TMS */

		[ 7] = PIN_A_NUMBER('R', 29),	/* TDI */

		[ 8] = PIN_NONE,

		[ 8] = SH_PFC_PIN_NONE,

		[ 9] = PIN_A_NUMBER('T', 30),	/* ASEBRK */

		[10] = RCAR_GP_PIN(3,  0),	/* SD0_CLK */

		[11] = RCAR_GP_PIN(3,  1),	/* SD0_CMD */
@@ -6313,31 +6312,31 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = { 
		[ 4] = RCAR_GP_PIN(6, 29),	/* USB30_OVC */

		[ 5] = RCAR_GP_PIN(6, 30),	/* GP6_30 */

		[ 6] = RCAR_GP_PIN(6, 31),	/* GP6_31 */

		[ 7] = PIN_NONE,

		[ 8] = PIN_NONE,

		[ 9] = PIN_NONE,

		[10] = PIN_NONE,

		[11] = PIN_NONE,

		[12] = PIN_NONE,

		[13] = PIN_NONE,

		[14] = PIN_NONE,

		[15] = PIN_NONE,

		[16] = PIN_NONE,

		[17] = PIN_NONE,

		[18] = PIN_NONE,

		[19] = PIN_NONE,

		[20] = PIN_NONE,

		[21] = PIN_NONE,

		[22] = PIN_NONE,

		[23] = PIN_NONE,

		[24] = PIN_NONE,

		[25] = PIN_NONE,

		[26] = PIN_NONE,

		[27] = PIN_NONE,

		[28] = PIN_NONE,

		[29] = PIN_NONE,

		[30] = PIN_NONE,

		[31] = PIN_NONE,

		[ 7] = SH_PFC_PIN_NONE,

		[ 8] = SH_PFC_PIN_NONE,

		[ 9] = SH_PFC_PIN_NONE,

		[10] = SH_PFC_PIN_NONE,

		[11] = SH_PFC_PIN_NONE,

		[12] = SH_PFC_PIN_NONE,

		[13] = SH_PFC_PIN_NONE,

		[14] = SH_PFC_PIN_NONE,

		[15] = SH_PFC_PIN_NONE,

		[16] = SH_PFC_PIN_NONE,

		[17] = SH_PFC_PIN_NONE,

		[18] = SH_PFC_PIN_NONE,

		[19] = SH_PFC_PIN_NONE,

		[20] = SH_PFC_PIN_NONE,

		[21] = SH_PFC_PIN_NONE,

		[22] = SH_PFC_PIN_NONE,

		[23] = SH_PFC_PIN_NONE,

		[24] = SH_PFC_PIN_NONE,

		[25] = SH_PFC_PIN_NONE,

		[26] = SH_PFC_PIN_NONE,

		[27] = SH_PFC_PIN_NONE,

		[28] = SH_PFC_PIN_NONE,

		[29] = SH_PFC_PIN_NONE,

		[30] = SH_PFC_PIN_NONE,

		[31] = SH_PFC_PIN_NONE,

	} },

	{ /* sentinel */ },

};