lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v5 1/3] pinctrl: meson: add a new callback for SoCs fixup
From
Date
Hi,

On 08/11/2019 10:00, Qianggui Song wrote:
> 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: Qianggui Song <qianggui.song@amlogic.com>
> ---
> drivers/pinctrl/meson/pinctrl-meson-axg.c | 1 +
> drivers/pinctrl/meson/pinctrl-meson-g12a.c | 9 +++++++++
> drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 1 +
> drivers/pinctrl/meson/pinctrl-meson-gxl.c | 1 +
> drivers/pinctrl/meson/pinctrl-meson.c | 25 ++++++++++++++++++-------
> drivers/pinctrl/meson/pinctrl-meson.h | 5 +++++
> drivers/pinctrl/meson/pinctrl-meson8.c | 1 +
> drivers/pinctrl/meson/pinctrl-meson8b.c | 1 +
> 8 files changed, 37 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
> index ad502eda4afa..072765db93d7 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
> @@ -1066,6 +1066,7 @@
> .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[] = {
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
> index 582665fd362a..41850e3c0091 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
> @@ -1362,6 +1362,14 @@
> .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 @@
> .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[] = {
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
> index 5bfa56f3847e..926b9997159a 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
> @@ -851,6 +851,7 @@
> .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[] = {
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
> index 72c5373c8dc1..8b1a49f5da43 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
> @@ -820,6 +820,7 @@
> .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[] = {
> diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
> index 8bba9d053d9f..a812c6d986d9 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson.c
> @@ -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);

If pc->reg_mux is NULL, it will return "0" here, which is wrong.

Either keep the return ERR_PTR(-ENOENT); in meson_map_resource, or
return pc->reg_mux ? -ENOENT : PTR_ERR(pc->reg_mux);

> }
>
> 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);

Ditto

> }
>
> 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;
> }
>
> diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
> index c696f3241a36..bfa1d3599333 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson.h
> +++ b/drivers/pinctrl/meson/pinctrl-meson.h
> @@ -11,6 +11,8 @@
> #include <linux/regmap.h>
> #include <linux/types.h>
>
> +struct meson_pinctrl;
> +
> /**
> * struct meson_pmx_group - a pinmux group
> *
> @@ -114,6 +116,7 @@ struct meson_pinctrl_data {
> unsigned int num_banks;
> const struct pinmux_ops *pmx_ops;
> void *pmx_data;
> + int (*parse_dt)(struct meson_pinctrl *pc);
> };
>
> struct meson_pinctrl {
> @@ -171,3 +174,5 @@ int meson_pmx_get_groups(struct pinctrl_dev *pcdev,
>
> /* Common probe function */
> int meson_pinctrl_probe(struct platform_device *pdev);
> +/* Common ao groups extra dt parse function for SoCs before g12a */
> +int meson8_aobus_parse_dt_extra(struct meson_pinctrl *pc);
> diff --git a/drivers/pinctrl/meson/pinctrl-meson8.c b/drivers/pinctrl/meson/pinctrl-meson8.c
> index 0b97befa6335..dd17100efdcf 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson8.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson8.c
> @@ -1103,6 +1103,7 @@
> .num_funcs = ARRAY_SIZE(meson8_aobus_functions),
> .num_banks = ARRAY_SIZE(meson8_aobus_banks),
> .pmx_ops = &meson8_pmx_ops,
> + .parse_dt = &meson8_aobus_parse_dt_extra,
> };
>
> static const struct of_device_id meson8_pinctrl_dt_match[] = {
> diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c
> index a7de388388e6..2d5339edd0b7 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson8b.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c
> @@ -962,6 +962,7 @@
> .num_funcs = ARRAY_SIZE(meson8b_aobus_functions),
> .num_banks = ARRAY_SIZE(meson8b_aobus_banks),
> .pmx_ops = &meson8_pmx_ops,
> + .parse_dt = &meson8_aobus_parse_dt_extra,
> };
>
> static const struct of_device_id meson8b_pinctrl_dt_match[] = {
>

\
 
 \ /
  Last update: 2019-11-08 13:51    [W:0.104 / U:7.488 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site