by Anson Huang

[permalink] [raw]

Subject: RE: [PATCH 1/2] pinctrl: imx: Support building SCU pinctrl driver as module

> Subject: RE: [PATCH 1/2] pinctrl: imx: Support building SCU pinctrl driver as
> module
>
> > From: Anson Huang <[email protected]>
> > Sent: Thursday, July 16, 2020 11:07 PM
> > Subject: [PATCH 1/2] pinctrl: imx: Support building SCU pinctrl driver
> > as module
> >
> > To support building i.MX SCU pinctrl driver as module, below things
> > need to be
> > changed:
> >
> > - Export SCU related functions
>
> This line seems not comply with the patch anymore
>

OK.

> > and use "IS_ENABLED" instead of
> > "ifdef" to support SCU pinctrl driver user and itself to be
> > built as module;
> > - Use function callbacks for SCU related functions in pinctrl-imx.c
> > in order to support the scenario of PINCTRL_IMX is built in
> > while PINCTRL_IMX_SCU is built as module;
> > - All drivers using SCU pinctrl driver need to initialize the
> > SCU related function callback;
> > - Change PINCTR_IMX_SCU to tristate;
> > - Add module author, description and license.
> >
> > With above changes, i.MX SCU pinctrl driver can be built as module.
> >
> > Signed-off-by: Anson Huang <[email protected]>
> > ---
> > drivers/pinctrl/freescale/Kconfig | 2 +-
> > drivers/pinctrl/freescale/pinctrl-imx.c | 8 ++--
> > drivers/pinctrl/freescale/pinctrl-imx.h | 57 ++++++++++++-----------------
> > drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 3 ++
> > drivers/pinctrl/freescale/pinctrl-imx8qm.c | 3 ++
> > drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 3 ++
> > drivers/pinctrl/freescale/pinctrl-scu.c | 5 +++
> > 7 files changed, 42 insertions(+), 39 deletions(-)
> >
> > diff --git a/drivers/pinctrl/freescale/Kconfig
> > b/drivers/pinctrl/freescale/Kconfig
> > index 08fcf5c..570355c 100644
> > --- a/drivers/pinctrl/freescale/Kconfig
> > +++ b/drivers/pinctrl/freescale/Kconfig
> > @@ -7,7 +7,7 @@ config PINCTRL_IMX
> > select REGMAP
> >
> > config PINCTRL_IMX_SCU
> > - bool
> > + tristate "IMX SCU pinctrl driver"
>
> IMX SCU pinctrl core driver
>

Will change it in V2.

> > depends on IMX_SCU
> > select PINCTRL_IMX
> >
> > diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c
> > b/drivers/pinctrl/freescale/pinctrl-imx.c
> > index 507e4af..b80c450 100644
> > --- a/drivers/pinctrl/freescale/pinctrl-imx.c
> > +++ b/drivers/pinctrl/freescale/pinctrl-imx.c
> > @@ -373,7 +373,7 @@ static int imx_pinconf_get(struct pinctrl_dev
> *pctldev,
> > const struct imx_pinctrl_soc_info *info = ipctl->info;
> >
> > if (info->flags & IMX_USE_SCU)
> > - return imx_pinconf_get_scu(pctldev, pin_id, config);
> > + return info->imx_pinconf_get(pctldev, pin_id, config);
> > else
> > return imx_pinconf_get_mmio(pctldev, pin_id, config); } @@
> -423,7
> > +423,7 @@ static int imx_pinconf_set(struct pinctrl_dev *pctldev,
> > const struct imx_pinctrl_soc_info *info = ipctl->info;
> >
> > if (info->flags & IMX_USE_SCU)
> > - return imx_pinconf_set_scu(pctldev, pin_id,
> > + return info->imx_pinconf_set(pctldev, pin_id,
> > configs, num_configs);
> > else
> > return imx_pinconf_set_mmio(pctldev, pin_id, @@ -440,7 +440,7
> @@
> > static void imx_pinconf_dbg_show(struct pinctrl_dev *pctldev,
> > int ret;
> >
> > if (info->flags & IMX_USE_SCU) {
> > - ret = imx_pinconf_get_scu(pctldev, pin_id, &config);
> > + ret = info->imx_pinconf_get(pctldev, pin_id, &config);
> > if (ret) {
> > dev_err(ipctl->dev, "failed to get %s pinconf\n",
> > pin_get_name(pctldev, pin_id));
> > @@ -629,7 +629,7 @@ static int imx_pinctrl_parse_groups(struct
> > device_node *np,
> > for (i = 0; i < grp->num_pins; i++) {
> > pin = &((struct imx_pin *)(grp->data))[i];
> > if (info->flags & IMX_USE_SCU)
> > - imx_pinctrl_parse_pin_scu(ipctl, &grp->pins[i],
> > + info->imx_pinctrl_parse_pin(ipctl, &grp->pins[i],
> > pin, &list);
> > else
> > imx_pinctrl_parse_pin_mmio(ipctl, &grp->pins[i], diff --git
> > a/drivers/pinctrl/freescale/pinctrl-imx.h
> > b/drivers/pinctrl/freescale/pinctrl-imx.h
> > index 333d32b..bdb86c2 100644
> > --- a/drivers/pinctrl/freescale/pinctrl-imx.h
> > +++ b/drivers/pinctrl/freescale/pinctrl-imx.h
> > @@ -75,6 +75,21 @@ struct imx_cfg_params_decode {
> > bool invert;
> > };
> >
> > +/**
> > + * @dev: a pointer back to containing device
> > + * @base: the offset to the controller in virtual memory */ struct
> > +imx_pinctrl {
> > + struct device *dev;
> > + struct pinctrl_dev *pctl;
> > + void __iomem *base;
> > + void __iomem *input_sel_base;
> > + const struct imx_pinctrl_soc_info *info;
> > + struct imx_pin_reg *pin_regs;
> > + unsigned int group_index;
> > + struct mutex mutex;
> > +};
>
> Any reason to move this part of code?

It is because below function callback added in imx_pinctrl_soc_info structure need to use imx_pinctrl, otherwise,
build will fail.

+ void (*imx_pinctrl_parse_pin)(struct imx_pinctrl *ipctl,

Anson

2020-09-07 08:37:27

by Anson Huang

[permalink] [raw]

Subject: RE: [PATCH 2/2] pinctrl: imx: Support building i.MX pinctrl driver as module

> Subject: RE: [PATCH 2/2] pinctrl: imx: Support building i.MX pinctrl driver as
> module
>
> > From: Anson Huang <[email protected]>
> > Sent: Thursday, July 16, 2020 11:07 PM
> > Subject: [PATCH 2/2] pinctrl: imx: Support building i.MX pinctrl
> > driver as module
> >
>
> S/pinctrl driver/pinctrl core driver
>
> This also applies for Patch 1/2.

OK

>
> > Change PINCTRL_IMX to tristate to support loadable module build.
> >
> > And i.MX common pinctrl driver should depend on CONFIG_OF to make sure
> > no build error when i.MX common pinctrl driver is enabled for
> > different architectures without CONFIG_OF.
> >
> > Also add module author, description and license.
> >
> > Signed-off-by: Anson Huang <[email protected]>
> > ---
> > drivers/pinctrl/freescale/Kconfig | 3 ++-
> > drivers/pinctrl/freescale/pinctrl-imx.c | 5 +++++
> > 2 files changed, 7 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/pinctrl/freescale/Kconfig
> > b/drivers/pinctrl/freescale/Kconfig
> > index 570355c..922ae4b 100644
> > --- a/drivers/pinctrl/freescale/Kconfig
> > +++ b/drivers/pinctrl/freescale/Kconfig
> > @@ -1,6 +1,7 @@
> > # SPDX-License-Identifier: GPL-2.0-only config PINCTRL_IMX
> > - bool
> > + tristate "IMX pinctrl driver"
>
> IMX pinctrl core driver

OK

>
> > + depends on OF
> > select GENERIC_PINCTRL_GROUPS
> > select GENERIC_PINMUX_FUNCTIONS
> > select GENERIC_PINCONF
> > diff --git a/drivers/pinctrl/freescale/pinctrl-imx.c
> > b/drivers/pinctrl/freescale/pinctrl-imx.c
> > index b80c450..3eaafb6 100644
> > --- a/drivers/pinctrl/freescale/pinctrl-imx.c
> > +++ b/drivers/pinctrl/freescale/pinctrl-imx.c
> > @@ -11,6 +11,7 @@
> > #include <linux/init.h>
> > #include <linux/io.h>
> > #include <linux/mfd/syscon.h>
> > +#include <linux/module.h>
> > #include <linux/of.h>
> > #include <linux/of_device.h>
> > #include <linux/of_address.h>
> > @@ -898,3 +899,7 @@ const struct dev_pm_ops imx_pinctrl_pm_ops = {
> > imx_pinctrl_resume)
> > };
> > EXPORT_SYMBOL_GPL(imx_pinctrl_pm_ops);
> > +
> > +MODULE_AUTHOR("Linus Walleij <[email protected]>");
>
> MODULE_AUTHOR("Dong Aisheng <[email protected]>");
>

OK.

Anson