Commit 03e9f0ca authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: clean up after enable refactoring 



commit 2243a87d
"pinctrl: avoid duplicated calling enable_pinmux_setting for a pin"
removed the .disable callback from the struct pinmux_ops,
making the .enable() callback the only remaining callback.

However .enable() is a bad name as it seems to imply that a
muxing can also be disabled. Rename the callback to .set_mux()
and also take this opportunity to clean out any remaining
mentions of .disable() from the documentation.

Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Acked-by: default avatarFan Wu <fwu@marvell.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 32745581

Documentation/pinctrl.txt

+2 −12
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ static int foo_get_groups(struct pinctrl_dev *pctldev, unsigned selector, 
	return 0;

}



int foo_enable(struct pinctrl_dev *pctldev, unsigned selector,

int foo_set_mux(struct pinctrl_dev *pctldev, unsigned selector,

		unsigned group)

{

	u8 regbit = (1 << selector + group);
@@ -711,21 +711,11 @@ int foo_enable(struct pinctrl_dev *pctldev, unsigned selector, 
	return 0;

}



void foo_disable(struct pinctrl_dev *pctldev, unsigned selector,

		unsigned group)

{

	u8 regbit = (1 << selector + group);



	writeb((readb(MUX) & ~(regbit)), MUX)

	return 0;

}



struct pinmux_ops foo_pmxops = {

	.get_functions_count = foo_get_functions_count,

	.get_function_name = foo_get_fname,

	.get_function_groups = foo_get_groups,

	.enable = foo_enable,

	.disable = foo_disable,

	.set_mux = foo_set_mux,

};



/* Pinmux operations are handled by some pin controller */

drivers/pinctrl/berlin/berlin.c

+4 −4
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ berlin_pinctrl_find_function_by_name(struct berlin_pinctrl *pctrl, 
	return NULL;

}



static int berlin_pinmux_enable(struct pinctrl_dev *pctrl_dev,

static int berlin_pinmux_set(struct pinctrl_dev *pctrl_dev,

			     unsigned function,

			     unsigned group)

{
@@ -197,7 +197,7 @@ static const struct pinmux_ops berlin_pinmux_ops = { 
	.get_functions_count	= &berlin_pinmux_get_functions_count,

	.get_function_name	= &berlin_pinmux_get_function_name,

	.get_function_groups	= &berlin_pinmux_get_function_groups,

	.enable			= &berlin_pinmux_enable,

	.set_mux		= &berlin_pinmux_set,

};



static int berlin_pinctrl_add_function(struct berlin_pinctrl *pctrl,

drivers/pinctrl/mvebu/pinctrl-mvebu.c

+3 −3
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static int mvebu_pinmux_get_groups(struct pinctrl_dev *pctldev, unsigned fid, 
	return 0;

}



static int mvebu_pinmux_enable(struct pinctrl_dev *pctldev, unsigned fid,

static int mvebu_pinmux_set(struct pinctrl_dev *pctldev, unsigned fid,

			    unsigned gid)

{

	struct mvebu_pinctrl *pctl = pinctrl_dev_get_drvdata(pctldev);
@@ -344,7 +344,7 @@ static const struct pinmux_ops mvebu_pinmux_ops = { 
	.get_function_groups = mvebu_pinmux_get_groups,

	.gpio_request_enable = mvebu_pinmux_gpio_request_enable,

	.gpio_set_direction = mvebu_pinmux_gpio_set_direction,

	.enable = mvebu_pinmux_enable,

	.set_mux = mvebu_pinmux_set,

};



static int mvebu_pinctrl_get_groups_count(struct pinctrl_dev *pctldev)

drivers/pinctrl/nomadik/pinctrl-abx500.c

+3 −3
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static int abx500_pmx_get_func_groups(struct pinctrl_dev *pctldev, 
	return 0;

}



static int abx500_pmx_enable(struct pinctrl_dev *pctldev, unsigned function,

static int abx500_pmx_set(struct pinctrl_dev *pctldev, unsigned function,

			  unsigned group)

{

	struct abx500_pinctrl *pct = pinctrl_dev_get_drvdata(pctldev);
@@ -784,7 +784,7 @@ static const struct pinmux_ops abx500_pinmux_ops = { 
	.get_functions_count = abx500_pmx_get_funcs_cnt,

	.get_function_name = abx500_pmx_get_func_name,

	.get_function_groups = abx500_pmx_get_func_groups,

	.enable = abx500_pmx_enable,

	.set_mux = abx500_pmx_set,

	.gpio_request_enable = abx500_gpio_request_enable,

	.gpio_disable_free = abx500_gpio_disable_free,

};

drivers/pinctrl/nomadik/pinctrl-nomadik.c

+3 −3
Original line number Diff line number Diff line
@@ -1647,7 +1647,7 @@ static int nmk_pmx_get_func_groups(struct pinctrl_dev *pctldev, 
	return 0;

}



static int nmk_pmx_enable(struct pinctrl_dev *pctldev, unsigned function,

static int nmk_pmx_set(struct pinctrl_dev *pctldev, unsigned function,

		       unsigned group)

{

	struct nmk_pinctrl *npct = pinctrl_dev_get_drvdata(pctldev);
@@ -1810,7 +1810,7 @@ static const struct pinmux_ops nmk_pinmux_ops = { 
	.get_functions_count = nmk_pmx_get_funcs_cnt,

	.get_function_name = nmk_pmx_get_func_name,

	.get_function_groups = nmk_pmx_get_func_groups,

	.enable = nmk_pmx_enable,

	.set_mux = nmk_pmx_set,

	.gpio_request_enable = nmk_gpio_request_enable,

	.gpio_disable_free = nmk_gpio_disable_free,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE