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

Commit c2ebf475 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Walleij
Browse files

pinctrl: uniphier: introduce capability flag 



The core part of the UniPhier pinctrl driver needs to support a new
capability for upcoming UniPhier ARMv8 SoCs.  This sometimes happens
because pinctrl drivers include really SoC-specific stuff.

This commit intends to tidy up SoC-specific parameters of the existing
drivers before adding the new one.  Having just one flag would be
better than adding a new struct member every time a new SoC-specific
capability comes up.

At this time, there is one flag, UNIPHIER_PINCTRL_CAPS_DBGMUX_SEPARATE.
This capability (I'd say rather quirk) was added for PH1-Pro4 and
PH1-Pro5 as requirement from a customer.  For those SoCs, one pin-mux
setting is controlled by the combination of two separate registers; the
LSB bits at register offset (8 * N) and the MSB bits at (8 * N + 4).
Because it is impossible to update two separate registers atomically,
the LOAD_PINCTRL register should be set in order to make the pin-mux
settings really effective.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 94bf176b

drivers/pinctrl/uniphier/pinctrl-uniphier-core.c

+25 −10
Original line number Diff line number Diff line
@@ -552,9 +552,8 @@ static int uniphier_pmx_set_one_mux(struct pinctrl_dev *pctldev, unsigned pin, 
				    unsigned muxval)

{

	struct uniphier_pinctrl_priv *priv = pinctrl_dev_get_drvdata(pctldev);

	unsigned mux_bits = priv->socdata->mux_bits;

	unsigned reg_stride = priv->socdata->reg_stride;

	unsigned reg, reg_end, shift, mask;

	unsigned int mux_bits, reg_stride, reg, reg_end, shift, mask;

	bool load_pinctrl;

	int ret;



	/* some pins need input-enabling */
@@ -563,6 +562,26 @@ static int uniphier_pmx_set_one_mux(struct pinctrl_dev *pctldev, unsigned pin, 
	if (ret)

		return ret;



	if (priv->socdata->caps & UNIPHIER_PINCTRL_CAPS_DBGMUX_SEPARATE) {

		/*

		 *  Mode     reg_offset     bit_position

		 *  Normal    4 * n        shift+3:shift

		 *  Debug     4 * n        shift+7:shift+4

		 */

		mux_bits = 4;

		reg_stride = 8;

		load_pinctrl = true;

	} else {

		/*

		 *  Mode     reg_offset     bit_position

		 *  Normal    8 * n        shift+3:shift

		 *  Debug     8 * n + 4    shift+3:shift

		 */

		mux_bits = 8;

		reg_stride = 4;

		load_pinctrl = false;

	}



	reg = UNIPHIER_PINCTRL_PINMUX_BASE + pin * mux_bits / 32 * reg_stride;

	reg_end = reg + reg_stride;

	shift = pin * mux_bits % 32;
@@ -580,7 +599,7 @@ static int uniphier_pmx_set_one_mux(struct pinctrl_dev *pctldev, unsigned pin, 
		muxval >>= mux_bits;

	}



	if (priv->socdata->load_pinctrl) {

	if (load_pinctrl) {

		ret = regmap_write(priv->regmap,

				   UNIPHIER_PINCTRL_LOAD_PINMUX, 1);

		if (ret)
@@ -658,12 +677,8 @@ int uniphier_pinctrl_probe(struct platform_device *pdev, 


	if (!socdata ||

	    !socdata->pins || !socdata->npins ||

	    !socdata->groups ||

	    !socdata->groups_count ||

	    !socdata->functions ||

	    !socdata->functions_count ||

	    !socdata->mux_bits ||

	    !socdata->reg_stride) {

	    !socdata->groups || !socdata->groups_count ||

	    !socdata->functions || !socdata->functions_count) {

		dev_err(dev, "pinctrl socdata lacks necessary members\n");

		return -EINVAL;

	}

drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c

+1 −3
Original line number Diff line number Diff line
@@ -852,9 +852,7 @@ static struct uniphier_pinctrl_socdata uniphier_ld4_pindata = { 
	.groups_count = ARRAY_SIZE(uniphier_ld4_groups),

	.functions = uniphier_ld4_functions,

	.functions_count = ARRAY_SIZE(uniphier_ld4_functions),

	.mux_bits = 8,

	.reg_stride = 4,

	.load_pinctrl = false,

	.caps = 0,

};



static int uniphier_ld4_pinctrl_probe(struct platform_device *pdev)

drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c

+1 −3
Original line number Diff line number Diff line
@@ -1240,9 +1240,7 @@ static struct uniphier_pinctrl_socdata uniphier_ld6b_pindata = { 
	.groups_count = ARRAY_SIZE(uniphier_ld6b_groups),

	.functions = uniphier_ld6b_functions,

	.functions_count = ARRAY_SIZE(uniphier_ld6b_functions),

	.mux_bits = 8,

	.reg_stride = 4,

	.load_pinctrl = false,

	.caps = 0,

};



static int uniphier_ld6b_pinctrl_probe(struct platform_device *pdev)

drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c

+1 −3
Original line number Diff line number Diff line
@@ -1526,9 +1526,7 @@ static struct uniphier_pinctrl_socdata uniphier_pro4_pindata = { 
	.groups_count = ARRAY_SIZE(uniphier_pro4_groups),

	.functions = uniphier_pro4_functions,

	.functions_count = ARRAY_SIZE(uniphier_pro4_functions),

	.mux_bits = 4,

	.reg_stride = 8,

	.load_pinctrl = true,

	.caps = UNIPHIER_PINCTRL_CAPS_DBGMUX_SEPARATE,

};



static int uniphier_pro4_pinctrl_probe(struct platform_device *pdev)

drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c

+1 −3
Original line number Diff line number Diff line
@@ -1317,9 +1317,7 @@ static struct uniphier_pinctrl_socdata uniphier_pro5_pindata = { 
	.groups_count = ARRAY_SIZE(uniphier_pro5_groups),

	.functions = uniphier_pro5_functions,

	.functions_count = ARRAY_SIZE(uniphier_pro5_functions),

	.mux_bits = 4,

	.reg_stride = 8,

	.load_pinctrl = true,

	.caps = UNIPHIER_PINCTRL_CAPS_DBGMUX_SEPARATE,

};



static int uniphier_pro5_pinctrl_probe(struct platform_device *pdev)