Commit 156f7217 authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Linus Walleij
Browse files

pinctrl: mediatek: common-v1: Commonize spec_ies_smt_set callback 



All of the MediaTek pinctrl drivers registering with pinctrl-mtk-common
that are offering a .spec_ies_smt_set() callback are declaring their
own function which is doing exactly the same on all drivers: calling
mtk_pconf_spec_set_ies_smt_range() with their struct and a simple check.

Commonize this callback by adding the ies and smt structure pointers
to struct mtk_pinctrl_devdata and changing the callback signature to
take it.

Removing the callback and checking for the existance of the spec_smt
and/or spec_ies data would allow us to staticize the function
mtk_pconf_spec_set_ies_smt_range(), but this solution was avoided as
to keep flexibility, as some SoCs may need to perform a very different
operation compared to what this commonized function is doing.

Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20220222111144.20796-6-angelogioacchino.delregno@collabora.com


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

drivers/pinctrl/mediatek/pinctrl-mt2701.c

+5 −13
Original line number Diff line number Diff line
@@ -429,18 +429,6 @@ static const struct mtk_pin_ies_smt_set mt2701_smt_set[] = { 
	MTK_PIN_IES_SMT_SPEC(278, 278, 0xb70, 13),

};



static int mt2701_ies_smt_set(struct regmap *regmap, unsigned int pin,

		unsigned char align, int value, enum pin_config_param arg)

{

	if (arg == PIN_CONFIG_INPUT_ENABLE)

		return mtk_pconf_spec_set_ies_smt_range(regmap, mt2701_ies_set,

			ARRAY_SIZE(mt2701_ies_set), pin, align, value);

	else if (arg == PIN_CONFIG_INPUT_SCHMITT_ENABLE)

		return mtk_pconf_spec_set_ies_smt_range(regmap, mt2701_smt_set,

			ARRAY_SIZE(mt2701_smt_set), pin, align, value);

	return -EINVAL;

}



static const struct mtk_spec_pinmux_set mt2701_spec_pinmux[] = {

	MTK_PINMUX_SPEC(22, 0xb10, 3),

	MTK_PINMUX_SPEC(23, 0xb10, 4),
@@ -501,10 +489,14 @@ static const struct mtk_pinctrl_devdata mt2701_pinctrl_data = { 
	.n_grp_cls = ARRAY_SIZE(mt2701_drv_grp),

	.pin_drv_grp = mt2701_pin_drv,

	.n_pin_drv_grps = ARRAY_SIZE(mt2701_pin_drv),

	.spec_ies = mt2701_ies_set,

	.n_spec_ies = ARRAY_SIZE(mt2701_ies_set),

	.spec_pupd = mt2701_spec_pupd,

	.n_spec_pupd = ARRAY_SIZE(mt2701_spec_pupd),

	.spec_smt = mt2701_smt_set,

	.n_spec_smt = ARRAY_SIZE(mt2701_smt_set),

	.spec_pull_set = mtk_pctrl_spec_pull_set_samereg,

	.spec_ies_smt_set = mt2701_ies_smt_set,

	.spec_ies_smt_set = mtk_pconf_spec_set_ies_smt_range,

	.spec_pinmux_set = mt2701_spec_pinmux_set,

	.spec_dir_set = mt2701_spec_dir_set,

	.dir_offset = 0x0000,

drivers/pinctrl/mediatek/pinctrl-mt2712.c

+5 −14
Original line number Diff line number Diff line
@@ -275,19 +275,6 @@ static const struct mtk_pin_ies_smt_set mt2712_ies_set[] = { 
	MTK_PIN_IES_SMT_SPEC(207, 209, 0x8b0, 15)

};



static int mt2712_ies_smt_set(struct regmap *regmap, unsigned int pin,

			      unsigned char align,

			      int value, enum pin_config_param arg)

{

	if (arg == PIN_CONFIG_INPUT_ENABLE)

		return mtk_pconf_spec_set_ies_smt_range(regmap, mt2712_ies_set,

			ARRAY_SIZE(mt2712_ies_set), pin, align, value);

	if (arg == PIN_CONFIG_INPUT_SCHMITT_ENABLE)

		return mtk_pconf_spec_set_ies_smt_range(regmap, mt2712_smt_set,

			ARRAY_SIZE(mt2712_smt_set), pin, align, value);

	return -EINVAL;

}



static const struct mtk_drv_group_desc mt2712_drv_grp[] =  {

	/* 0E4E8SR 4/8/12/16 */

	MTK_DRV_GRP(4, 16, 1, 2, 4),
@@ -553,10 +540,14 @@ static const struct mtk_pinctrl_devdata mt2712_pinctrl_data = { 
	.n_grp_cls = ARRAY_SIZE(mt2712_drv_grp),

	.pin_drv_grp = mt2712_pin_drv,

	.n_pin_drv_grps = ARRAY_SIZE(mt2712_pin_drv),

	.spec_ies = mt2712_ies_set,

	.n_spec_ies = ARRAY_SIZE(mt2712_ies_set),

	.spec_pupd = mt2712_spec_pupd,

	.n_spec_pupd = ARRAY_SIZE(mt2712_spec_pupd),

	.spec_smt = mt2712_smt_set,

	.n_spec_smt = ARRAY_SIZE(mt2712_smt_set),

	.spec_pull_set = mtk_pctrl_spec_pull_set_samereg,

	.spec_ies_smt_set = mt2712_ies_smt_set,

	.spec_ies_smt_set = mtk_pconf_spec_set_ies_smt_range,

	.dir_offset = 0x0000,

	.pullen_offset = 0x0100,

	.pullsel_offset = 0x0200,

drivers/pinctrl/mediatek/pinctrl-mt8127.c

+5 −14
Original line number Diff line number Diff line
@@ -252,19 +252,6 @@ static const struct mtk_pin_ies_smt_set mt8127_smt_set[] = { 
	MTK_PIN_IES_SMT_SPEC(142, 142, 0x920, 13),

};



static int mt8127_ies_smt_set(struct regmap *regmap, unsigned int pin,

		unsigned char align, int value, enum pin_config_param arg)

{

	if (arg == PIN_CONFIG_INPUT_ENABLE)

		return mtk_pconf_spec_set_ies_smt_range(regmap, mt8127_ies_set,

			ARRAY_SIZE(mt8127_ies_set), pin, align, value);

	else if (arg == PIN_CONFIG_INPUT_SCHMITT_ENABLE)

		return mtk_pconf_spec_set_ies_smt_range(regmap, mt8127_smt_set,

			ARRAY_SIZE(mt8127_smt_set), pin, align, value);

	return -EINVAL;

}





static const struct mtk_pinctrl_devdata mt8127_pinctrl_data = {

	.pins = mtk_pins_mt8127,

	.npins = ARRAY_SIZE(mtk_pins_mt8127),
@@ -272,10 +259,14 @@ static const struct mtk_pinctrl_devdata mt8127_pinctrl_data = { 
	.n_grp_cls = ARRAY_SIZE(mt8127_drv_grp),

	.pin_drv_grp = mt8127_pin_drv,

	.n_pin_drv_grps = ARRAY_SIZE(mt8127_pin_drv),

	.spec_ies = mt8127_ies_set,

	.n_spec_ies = ARRAY_SIZE(mt8127_ies_set),

	.spec_pupd = mt8127_spec_pupd,

	.n_spec_pupd = ARRAY_SIZE(mt8127_spec_pupd),

	.spec_smt = mt8127_smt_set,

	.n_spec_smt = ARRAY_SIZE(mt8127_smt_set),

	.spec_pull_set = mtk_pctrl_spec_pull_set_samereg,

	.spec_ies_smt_set = mt8127_ies_smt_set,

	.spec_ies_smt_set = mtk_pconf_spec_set_ies_smt_range,

	.dir_offset = 0x0000,

	.pullen_offset = 0x0100,

	.pullsel_offset = 0x0200,

drivers/pinctrl/mediatek/pinctrl-mt8167.c

+5 −13
Original line number Diff line number Diff line
@@ -285,18 +285,6 @@ static const struct mtk_pin_ies_smt_set mt8167_smt_set[] = { 
	MTK_PIN_IES_SMT_SPEC(121, 124, 0xA10, 9),

};



static int mt8167_ies_smt_set(struct regmap *regmap, unsigned int pin,

		unsigned char align, int value, enum pin_config_param arg)

{

	if (arg == PIN_CONFIG_INPUT_ENABLE)

		return mtk_pconf_spec_set_ies_smt_range(regmap, mt8167_ies_set,

			ARRAY_SIZE(mt8167_ies_set), pin, align, value);

	else if (arg == PIN_CONFIG_INPUT_SCHMITT_ENABLE)

		return mtk_pconf_spec_set_ies_smt_range(regmap, mt8167_smt_set,

			ARRAY_SIZE(mt8167_smt_set), pin, align, value);

	return -EINVAL;

}



static const struct mtk_pinctrl_devdata mt8167_pinctrl_data = {

	.pins = mtk_pins_mt8167,

	.npins = ARRAY_SIZE(mtk_pins_mt8167),
@@ -304,10 +292,14 @@ static const struct mtk_pinctrl_devdata mt8167_pinctrl_data = { 
	.n_grp_cls = ARRAY_SIZE(mt8167_drv_grp),

	.pin_drv_grp = mt8167_pin_drv,

	.n_pin_drv_grps = ARRAY_SIZE(mt8167_pin_drv),

	.spec_ies = mt8167_ies_set,

	.n_spec_ies = ARRAY_SIZE(mt8167_ies_set),

	.spec_pupd = mt8167_spec_pupd,

	.n_spec_pupd = ARRAY_SIZE(mt8167_spec_pupd),

	.spec_smt = mt8167_smt_set,

	.n_spec_smt = ARRAY_SIZE(mt8167_smt_set),

	.spec_pull_set = mtk_pctrl_spec_pull_set_samereg,

	.spec_ies_smt_set = mt8167_ies_smt_set,

	.spec_ies_smt_set = mtk_pconf_spec_set_ies_smt_range,

	.dir_offset = 0x0000,

	.pullen_offset = 0x0500,

	.pullsel_offset = 0x0600,

drivers/pinctrl/mediatek/pinctrl-mt8173.c

+5 −13
Original line number Diff line number Diff line
@@ -167,18 +167,6 @@ static const struct mtk_pin_ies_smt_set mt8173_ies_set[] = { 
	MTK_PIN_IES_SMT_SPEC(133, 134, 0x910, 8)

};



static int mt8173_ies_smt_set(struct regmap *regmap, unsigned int pin,

		unsigned char align, int value, enum pin_config_param arg)

{

	if (arg == PIN_CONFIG_INPUT_ENABLE)

		return mtk_pconf_spec_set_ies_smt_range(regmap, mt8173_ies_set,

			ARRAY_SIZE(mt8173_ies_set), pin, align, value);

	else if (arg == PIN_CONFIG_INPUT_SCHMITT_ENABLE)

		return mtk_pconf_spec_set_ies_smt_range(regmap, mt8173_smt_set,

			ARRAY_SIZE(mt8173_smt_set), pin, align, value);

	return -EINVAL;

}



static const struct mtk_drv_group_desc mt8173_drv_grp[] =  {

	/* 0E4E8SR 4/8/12/16 */

	MTK_DRV_GRP(4, 16, 1, 2, 4),
@@ -312,10 +300,14 @@ static const struct mtk_pinctrl_devdata mt8173_pinctrl_data = { 
	.n_grp_cls = ARRAY_SIZE(mt8173_drv_grp),

	.pin_drv_grp = mt8173_pin_drv,

	.n_pin_drv_grps = ARRAY_SIZE(mt8173_pin_drv),

	.spec_ies = mt8173_ies_set,

	.n_spec_ies = ARRAY_SIZE(mt8173_ies_set),

	.spec_pupd = mt8173_spec_pupd,

	.n_spec_pupd = ARRAY_SIZE(mt8173_spec_pupd),

	.spec_smt = mt8173_smt_set,

	.n_spec_smt = ARRAY_SIZE(mt8173_smt_set),

	.spec_pull_set = mtk_pctrl_spec_pull_set_samereg,

	.spec_ies_smt_set = mt8173_ies_smt_set,

	.spec_ies_smt_set = mtk_pconf_spec_set_ies_smt_range,

	.dir_offset = 0x0000,

	.pullen_offset = 0x0100,

	.pullsel_offset = 0x0200,