Commit fd422964 authored by Qianggui Song's avatar Qianggui Song Committed by Linus Walleij
Browse files

pinctrl: meson: add a new callback for SoCs fixup 



In meson_pinctrl_parse_dt, it contains two parts: reg parsing and
SoC relative fixup for AO. Several fixups in the same code make it hard
to maintain, so move all fixups to each SoC's callback and make
meson_pinctrl_parse_dt just do the reg parsing, separate these two
parts.Overview of all current Meson SoCs fixup is as below:

+------+--------------------------------------+--------------------------+
|      |                                      |                          |
| SoC  |                EE domain             |        AO domain         |
+------+--------------------------------------+--------------------------+
|m8    | parse regs:                          | parse regs:              |
|m8b   |   gpio,mux,pull,pull-enable(skip ds) |    gpio,mux,pull(skip ds)|
|gxl   | fixup:                               | fixup:                   |
|gxbb  |   no                                 |     pull-enable = pull;  |
|axg   |                                      |                          |
+------+--------------------------------------+--------------------------+
|g12a  | parse regs:                          | parse regs:              |
|sm1   |   gpio,mux,pull,pull-enable,ds       |   gpio,mux,ds            |
|      | fixup:                               | fixup:                   |
|      |   no                                 |   pull = gpio;           |
|      |                                      |   pull-enable = gpio;    |
+------+--------------------------------------+--------------------------+
|a1 or | parse regs:                                                     |
|later |  gpio/mux (without ao domain)                                   |
|SoCs  | fixup:                                                          |
|      |  pull = gpio; pull-enable = gpio; ds = gpio;                    |
+------+-----------------------------------------------------------------+
Since m8-axg share the same ao fixup, make a common function
meson8_aobus_parse_dt_extra to do the job.

Signed-off-by: default avatarQianggui Song <qianggui.song@amlogic.com>
Link: https://lore.kernel.org/r/1573819429-6937-2-git-send-email-qianggui.song@amlogic.com


Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 58afa801

drivers/pinctrl/meson/pinctrl-meson-axg.c

+1 −0
Original line number Diff line number Diff line
@@ -1066,6 +1066,7 @@ static struct meson_pinctrl_data meson_axg_aobus_pinctrl_data = { 
	.num_banks	= ARRAY_SIZE(meson_axg_aobus_banks),

	.pmx_ops	= &meson_axg_pmx_ops,

	.pmx_data	= &meson_axg_aobus_pmx_banks_data,

	.parse_dt	= meson8_aobus_parse_dt_extra,

};



static const struct of_device_id meson_axg_pinctrl_dt_match[] = {

drivers/pinctrl/meson/pinctrl-meson-g12a.c

+9 −0
Original line number Diff line number Diff line
@@ -1362,6 +1362,14 @@ static struct meson_axg_pmx_data meson_g12a_aobus_pmx_banks_data = { 
	.num_pmx_banks	= ARRAY_SIZE(meson_g12a_aobus_pmx_banks),

};



static int meson_g12a_aobus_parse_dt_extra(struct meson_pinctrl *pc)

{

	pc->reg_pull = pc->reg_gpio;

	pc->reg_pullen = pc->reg_gpio;



	return 0;

}



static struct meson_pinctrl_data meson_g12a_periphs_pinctrl_data = {

	.name		= "periphs-banks",

	.pins		= meson_g12a_periphs_pins,
@@ -1388,6 +1396,7 @@ static struct meson_pinctrl_data meson_g12a_aobus_pinctrl_data = { 
	.num_banks	= ARRAY_SIZE(meson_g12a_aobus_banks),

	.pmx_ops	= &meson_axg_pmx_ops,

	.pmx_data	= &meson_g12a_aobus_pmx_banks_data,

	.parse_dt	= meson_g12a_aobus_parse_dt_extra,

};



static const struct of_device_id meson_g12a_pinctrl_dt_match[] = {

drivers/pinctrl/meson/pinctrl-meson-gxbb.c

+1 −0
Original line number Diff line number Diff line
@@ -851,6 +851,7 @@ static struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = { 
	.num_funcs	= ARRAY_SIZE(meson_gxbb_aobus_functions),

	.num_banks	= ARRAY_SIZE(meson_gxbb_aobus_banks),

	.pmx_ops	= &meson8_pmx_ops,

	.parse_dt	= meson8_aobus_parse_dt_extra,

};



static const struct of_device_id meson_gxbb_pinctrl_dt_match[] = {

drivers/pinctrl/meson/pinctrl-meson-gxl.c

+1 −0
Original line number Diff line number Diff line
@@ -820,6 +820,7 @@ static struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = { 
	.num_funcs	= ARRAY_SIZE(meson_gxl_aobus_functions),

	.num_banks	= ARRAY_SIZE(meson_gxl_aobus_banks),

	.pmx_ops	= &meson8_pmx_ops,

	.parse_dt	= meson8_aobus_parse_dt_extra,

};



static const struct of_device_id meson_gxl_pinctrl_dt_match[] = {

drivers/pinctrl/meson/pinctrl-meson.c

+20 −9
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static struct regmap *meson_map_resource(struct meson_pinctrl *pc, 


	i = of_property_match_string(node, "reg-names", name);

	if (of_address_to_resource(node, i, &res))

		return ERR_PTR(-ENOENT);

		return NULL;



	base = devm_ioremap_resource(pc->dev, &res);

	if (IS_ERR(base))
@@ -665,26 +665,24 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc, 
	pc->of_node = gpio_np;



	pc->reg_mux = meson_map_resource(pc, gpio_np, "mux");

	if (IS_ERR(pc->reg_mux)) {

	if (IS_ERR_OR_NULL(pc->reg_mux)) {

		dev_err(pc->dev, "mux registers not found\n");

		return PTR_ERR(pc->reg_mux);

		return pc->reg_mux ? PTR_ERR(pc->reg_mux) : -ENOENT;

	}



	pc->reg_gpio = meson_map_resource(pc, gpio_np, "gpio");

	if (IS_ERR(pc->reg_gpio)) {

	if (IS_ERR_OR_NULL(pc->reg_gpio)) {

		dev_err(pc->dev, "gpio registers not found\n");

		return PTR_ERR(pc->reg_gpio);

		return pc->reg_gpio ? PTR_ERR(pc->reg_gpio) : -ENOENT;

	}



	pc->reg_pull = meson_map_resource(pc, gpio_np, "pull");

	/* Use gpio region if pull one is not present */

	if (IS_ERR(pc->reg_pull))

		pc->reg_pull = pc->reg_gpio;

		pc->reg_pull = NULL;



	pc->reg_pullen = meson_map_resource(pc, gpio_np, "pull-enable");

	/* Use pull region if pull-enable one is not present */

	if (IS_ERR(pc->reg_pullen))

		pc->reg_pullen = pc->reg_pull;

		pc->reg_pullen = NULL;



	pc->reg_ds = meson_map_resource(pc, gpio_np, "ds");

	if (IS_ERR(pc->reg_ds)) {
@@ -692,6 +690,19 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc, 
		pc->reg_ds = NULL;

	}



	if (pc->data->parse_dt)

		return pc->data->parse_dt(pc);



	return 0;

}



int meson8_aobus_parse_dt_extra(struct meson_pinctrl *pc)

{

	if (!pc->reg_pull)

		return -EINVAL;



	pc->reg_pullen = pc->reg_pull;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE