* [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU related functions
@ 2020-09-07 12:32 Anson Huang
2020-09-07 12:32 ` [PATCH V2 2/3] pinctrl: imx: Support building SCU pinctrl core driver as module Anson Huang
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Anson Huang @ 2020-09-07 12:32 UTC (permalink / raw)
To: aisheng.dong, festevam, shawnguo, stefan, kernel, linus.walleij,
s.hauer, linux-gpio, linux-kernel, linux-arm-kernel
Cc: Linux-imx
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.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
Changes since V1:
- split V1 [1/2] patch to 2 patches, this patch does the change of using function
callbacks for SCU related functions.
---
drivers/pinctrl/freescale/pinctrl-imx.c | 8 +++----
drivers/pinctrl/freescale/pinctrl-imx.h | 37 +++++++++++++++++------------
drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 3 +++
drivers/pinctrl/freescale/pinctrl-imx8qm.c | 3 +++
drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 3 +++
5 files changed, 35 insertions(+), 19 deletions(-)
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..40927ca 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;
+};
+
struct imx_pinctrl_soc_info {
const struct pinctrl_pin_desc *pins;
unsigned int npins;
@@ -98,21 +113,13 @@ struct imx_pinctrl_soc_info {
struct pinctrl_gpio_range *range,
unsigned offset,
bool input);
-};
-
-/**
- * @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;
+ int (*imx_pinconf_get)(struct pinctrl_dev *pctldev, unsigned int pin_id,
+ unsigned long *config);
+ int (*imx_pinconf_set)(struct pinctrl_dev *pctldev, unsigned int pin_id,
+ unsigned long *configs, unsigned int num_configs);
+ void (*imx_pinctrl_parse_pin)(struct imx_pinctrl *ipctl,
+ unsigned int *pin_id, struct imx_pin *pin,
+ const __be32 **list_p);
};
#define IMX_CFG_PARAMS_DECODE(p, m, o) \
diff --git a/drivers/pinctrl/freescale/pinctrl-imx8dxl.c b/drivers/pinctrl/freescale/pinctrl-imx8dxl.c
index 12b97da..d3020c0 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx8dxl.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx8dxl.c
@@ -159,6 +159,9 @@ static struct imx_pinctrl_soc_info imx8dxl_pinctrl_info = {
.pins = imx8dxl_pinctrl_pads,
.npins = ARRAY_SIZE(imx8dxl_pinctrl_pads),
.flags = IMX_USE_SCU,
+ .imx_pinconf_get = imx_pinconf_get_scu,
+ .imx_pinconf_set = imx_pinconf_set_scu,
+ .imx_pinctrl_parse_pin = imx_pinctrl_parse_pin_scu,
};
static const struct of_device_id imx8dxl_pinctrl_of_match[] = {
diff --git a/drivers/pinctrl/freescale/pinctrl-imx8qm.c b/drivers/pinctrl/freescale/pinctrl-imx8qm.c
index 095acf4..8f46b940 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx8qm.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx8qm.c
@@ -292,6 +292,9 @@ static const struct imx_pinctrl_soc_info imx8qm_pinctrl_info = {
.pins = imx8qm_pinctrl_pads,
.npins = ARRAY_SIZE(imx8qm_pinctrl_pads),
.flags = IMX_USE_SCU,
+ .imx_pinconf_get = imx_pinconf_get_scu,
+ .imx_pinconf_set = imx_pinconf_set_scu,
+ .imx_pinctrl_parse_pin = imx_pinctrl_parse_pin_scu,
};
static const struct of_device_id imx8qm_pinctrl_of_match[] = {
diff --git a/drivers/pinctrl/freescale/pinctrl-imx8qxp.c b/drivers/pinctrl/freescale/pinctrl-imx8qxp.c
index 81ebd4c..6776ad6 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx8qxp.c
+++ b/drivers/pinctrl/freescale/pinctrl-imx8qxp.c
@@ -198,6 +198,9 @@ static struct imx_pinctrl_soc_info imx8qxp_pinctrl_info = {
.pins = imx8qxp_pinctrl_pads,
.npins = ARRAY_SIZE(imx8qxp_pinctrl_pads),
.flags = IMX_USE_SCU,
+ .imx_pinconf_get = imx_pinconf_get_scu,
+ .imx_pinconf_set = imx_pinconf_set_scu,
+ .imx_pinctrl_parse_pin = imx_pinctrl_parse_pin_scu,
};
static const struct of_device_id imx8qxp_pinctrl_of_match[] = {
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH V2 2/3] pinctrl: imx: Support building SCU pinctrl core driver as module
2020-09-07 12:32 [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU related functions Anson Huang
@ 2020-09-07 12:32 ` Anson Huang
2020-09-08 2:43 ` Aisheng Dong
2020-09-07 12:32 ` [PATCH V2 3/3] pinctrl: imx: Support building i.MX " Anson Huang
2020-09-08 2:38 ` [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU related functions Aisheng Dong
2 siblings, 1 reply; 8+ messages in thread
From: Anson Huang @ 2020-09-07 12:32 UTC (permalink / raw)
To: aisheng.dong, festevam, shawnguo, stefan, kernel, linus.walleij,
s.hauer, linux-gpio, linux-kernel, linux-arm-kernel
Cc: Linux-imx
Change PINCTR_IMX_SCU to tristate, remove unnecessary #ifdef and add
module author, description and license to support building SCU pinctrl
core driver as module.
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
---
Changes since V1:
- split V1 [1/2] patch to 2 patches, this patch supports building SCU pinctrl core
driver as module;
- remove unnecessary #ifdef check and #else block.
---
drivers/pinctrl/freescale/Kconfig | 2 +-
drivers/pinctrl/freescale/pinctrl-imx.h | 20 --------------------
drivers/pinctrl/freescale/pinctrl-scu.c | 5 +++++
3 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/drivers/pinctrl/freescale/Kconfig b/drivers/pinctrl/freescale/Kconfig
index 08fcf5c..452c499 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 core driver"
depends on IMX_SCU
select PINCTRL_IMX
diff --git a/drivers/pinctrl/freescale/pinctrl-imx.h b/drivers/pinctrl/freescale/pinctrl-imx.h
index 40927ca..fd8c4b6 100644
--- a/drivers/pinctrl/freescale/pinctrl-imx.h
+++ b/drivers/pinctrl/freescale/pinctrl-imx.h
@@ -144,7 +144,6 @@ struct imx_pinctrl_soc_info {
int imx_pinctrl_probe(struct platform_device *pdev,
const struct imx_pinctrl_soc_info *info);
-#ifdef CONFIG_PINCTRL_IMX_SCU
#define BM_PAD_CTL_GP_ENABLE BIT(30)
#define BM_PAD_CTL_IFMUX_ENABLE BIT(31)
#define BP_PAD_CTL_IFMUX 27
@@ -157,23 +156,4 @@ int imx_pinconf_set_scu(struct pinctrl_dev *pctldev, unsigned pin_id,
void imx_pinctrl_parse_pin_scu(struct imx_pinctrl *ipctl,
unsigned int *pin_id, struct imx_pin *pin,
const __be32 **list_p);
-#else
-static inline int imx_pinconf_get_scu(struct pinctrl_dev *pctldev,
- unsigned pin_id, unsigned long *config)
-{
- return -EINVAL;
-}
-static inline int imx_pinconf_set_scu(struct pinctrl_dev *pctldev,
- unsigned pin_id, unsigned long *configs,
- unsigned num_configs)
-{
- return -EINVAL;
-}
-static inline void imx_pinctrl_parse_pin_scu(struct imx_pinctrl *ipctl,
- unsigned int *pin_id,
- struct imx_pin *pin,
- const __be32 **list_p)
-{
-}
-#endif
#endif /* __DRIVERS_PINCTRL_IMX_H */
diff --git a/drivers/pinctrl/freescale/pinctrl-scu.c b/drivers/pinctrl/freescale/pinctrl-scu.c
index 9df45d3..59b5f8a 100644
--- a/drivers/pinctrl/freescale/pinctrl-scu.c
+++ b/drivers/pinctrl/freescale/pinctrl-scu.c
@@ -7,6 +7,7 @@
#include <linux/err.h>
#include <linux/firmware/imx/sci.h>
+#include <linux/module.h>
#include <linux/of_address.h>
#include <linux/pinctrl/pinctrl.h>
#include <linux/platform_device.h>
@@ -123,3 +124,7 @@ void imx_pinctrl_parse_pin_scu(struct imx_pinctrl *ipctl,
pin_scu->mux_mode, pin_scu->config);
}
EXPORT_SYMBOL_GPL(imx_pinctrl_parse_pin_scu);
+
+MODULE_AUTHOR("Dong Aisheng <aisheng.dong@nxp.com>");
+MODULE_DESCRIPTION("NXP i.MX SCU common pinctrl driver");
+MODULE_LICENSE("GPL v2");
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH V2 3/3] pinctrl: imx: Support building i.MX pinctrl core driver as module
2020-09-07 12:32 [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU related functions Anson Huang
2020-09-07 12:32 ` [PATCH V2 2/3] pinctrl: imx: Support building SCU pinctrl core driver as module Anson Huang
@ 2020-09-07 12:32 ` Anson Huang
2020-09-08 2:45 ` Aisheng Dong
2020-09-08 2:38 ` [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU related functions Aisheng Dong
2 siblings, 1 reply; 8+ messages in thread
From: Anson Huang @ 2020-09-07 12:32 UTC (permalink / raw)
To: aisheng.dong, festevam, shawnguo, stefan, kernel, linus.walleij,
s.hauer, linux-gpio, linux-kernel, linux-arm-kernel
Cc: Linux-imx
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 <Anson.Huang@nxp.com>
---
Changes since V1:
- Correct module author, using "i.MX pinctrl core driver" instead of "i.MX pinctrl driver".
---
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 452c499..0058d3a 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 core driver"
+ 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..c96fe64 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("Dong Aisheng <aisheng.dong@nxp.com>");
+MODULE_DESCRIPTION("NXP i.MX common pinctrl driver");
+MODULE_LICENSE("GPL v2");
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* RE: [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU related functions
2020-09-07 12:32 [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU related functions Anson Huang
2020-09-07 12:32 ` [PATCH V2 2/3] pinctrl: imx: Support building SCU pinctrl core driver as module Anson Huang
2020-09-07 12:32 ` [PATCH V2 3/3] pinctrl: imx: Support building i.MX " Anson Huang
@ 2020-09-08 2:38 ` Aisheng Dong
2020-09-08 5:04 ` Anson Huang
2 siblings, 1 reply; 8+ messages in thread
From: Aisheng Dong @ 2020-09-08 2:38 UTC (permalink / raw)
To: Anson Huang, festevam, shawnguo, stefan, kernel, linus.walleij,
s.hauer, linux-gpio, linux-kernel, linux-arm-kernel
Cc: dl-linux-imx
> From: Anson Huang <Anson.Huang@nxp.com>
> Sent: Monday, September 7, 2020 8:33 PM
>
> 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.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> Changes since V1:
> - split V1 [1/2] patch to 2 patches, this patch does the change of using
> function
> callbacks for SCU related functions.
> ---
> drivers/pinctrl/freescale/pinctrl-imx.c | 8 +++----
> drivers/pinctrl/freescale/pinctrl-imx.h | 37
> +++++++++++++++++------------
> drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 3 +++
> drivers/pinctrl/freescale/pinctrl-imx8qm.c | 3 +++
> drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 3 +++
> 5 files changed, 35 insertions(+), 19 deletions(-)
>
> 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..40927ca 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;
> +};
> +
You seems missed my question in the former patch review.
Could you clarify a bit why need move this part code?
Regards
Aisheng
> struct imx_pinctrl_soc_info {
> const struct pinctrl_pin_desc *pins;
> unsigned int npins;
> @@ -98,21 +113,13 @@ struct imx_pinctrl_soc_info {
> struct pinctrl_gpio_range *range,
> unsigned offset,
> bool input);
> -};
> -
> -/**
> - * @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;
> + int (*imx_pinconf_get)(struct pinctrl_dev *pctldev, unsigned int pin_id,
> + unsigned long *config);
> + int (*imx_pinconf_set)(struct pinctrl_dev *pctldev, unsigned int pin_id,
> + unsigned long *configs, unsigned int num_configs);
> + void (*imx_pinctrl_parse_pin)(struct imx_pinctrl *ipctl,
> + unsigned int *pin_id, struct imx_pin *pin,
> + const __be32 **list_p);
> };
>
> #define IMX_CFG_PARAMS_DECODE(p, m, o) \ diff --git
> a/drivers/pinctrl/freescale/pinctrl-imx8dxl.c
> b/drivers/pinctrl/freescale/pinctrl-imx8dxl.c
> index 12b97da..d3020c0 100644
> --- a/drivers/pinctrl/freescale/pinctrl-imx8dxl.c
> +++ b/drivers/pinctrl/freescale/pinctrl-imx8dxl.c
> @@ -159,6 +159,9 @@ static struct imx_pinctrl_soc_info imx8dxl_pinctrl_info
> = {
> .pins = imx8dxl_pinctrl_pads,
> .npins = ARRAY_SIZE(imx8dxl_pinctrl_pads),
> .flags = IMX_USE_SCU,
> + .imx_pinconf_get = imx_pinconf_get_scu,
> + .imx_pinconf_set = imx_pinconf_set_scu,
> + .imx_pinctrl_parse_pin = imx_pinctrl_parse_pin_scu,
> };
>
> static const struct of_device_id imx8dxl_pinctrl_of_match[] = { diff --git
> a/drivers/pinctrl/freescale/pinctrl-imx8qm.c
> b/drivers/pinctrl/freescale/pinctrl-imx8qm.c
> index 095acf4..8f46b940 100644
> --- a/drivers/pinctrl/freescale/pinctrl-imx8qm.c
> +++ b/drivers/pinctrl/freescale/pinctrl-imx8qm.c
> @@ -292,6 +292,9 @@ static const struct imx_pinctrl_soc_info
> imx8qm_pinctrl_info = {
> .pins = imx8qm_pinctrl_pads,
> .npins = ARRAY_SIZE(imx8qm_pinctrl_pads),
> .flags = IMX_USE_SCU,
> + .imx_pinconf_get = imx_pinconf_get_scu,
> + .imx_pinconf_set = imx_pinconf_set_scu,
> + .imx_pinctrl_parse_pin = imx_pinctrl_parse_pin_scu,
> };
>
> static const struct of_device_id imx8qm_pinctrl_of_match[] = { diff --git
> a/drivers/pinctrl/freescale/pinctrl-imx8qxp.c
> b/drivers/pinctrl/freescale/pinctrl-imx8qxp.c
> index 81ebd4c..6776ad6 100644
> --- a/drivers/pinctrl/freescale/pinctrl-imx8qxp.c
> +++ b/drivers/pinctrl/freescale/pinctrl-imx8qxp.c
> @@ -198,6 +198,9 @@ static struct imx_pinctrl_soc_info imx8qxp_pinctrl_info
> = {
> .pins = imx8qxp_pinctrl_pads,
> .npins = ARRAY_SIZE(imx8qxp_pinctrl_pads),
> .flags = IMX_USE_SCU,
> + .imx_pinconf_get = imx_pinconf_get_scu,
> + .imx_pinconf_set = imx_pinconf_set_scu,
> + .imx_pinctrl_parse_pin = imx_pinctrl_parse_pin_scu,
> };
>
> static const struct of_device_id imx8qxp_pinctrl_of_match[] = {
> --
> 2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH V2 2/3] pinctrl: imx: Support building SCU pinctrl core driver as module
2020-09-07 12:32 ` [PATCH V2 2/3] pinctrl: imx: Support building SCU pinctrl core driver as module Anson Huang
@ 2020-09-08 2:43 ` Aisheng Dong
2020-09-08 5:06 ` Anson Huang
0 siblings, 1 reply; 8+ messages in thread
From: Aisheng Dong @ 2020-09-08 2:43 UTC (permalink / raw)
To: Anson Huang, festevam, shawnguo, stefan, kernel, linus.walleij,
s.hauer, linux-gpio, linux-kernel, linux-arm-kernel
Cc: dl-linux-imx
> From: Anson Huang <Anson.Huang@nxp.com>
> Sent: Monday, September 7, 2020 8:33 PM
>
> Change PINCTR_IMX_SCU to tristate, remove unnecessary #ifdef and add
> module author, description and license to support building SCU pinctrl core
> driver as module.
>
> Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> ---
> Changes since V1:
> - split V1 [1/2] patch to 2 patches, this patch supports building SCU pinctrl
> core
> driver as module;
> - remove unnecessary #ifdef check and #else block.
> ---
> drivers/pinctrl/freescale/Kconfig | 2 +-
> drivers/pinctrl/freescale/pinctrl-imx.h | 20 --------------------
> drivers/pinctrl/freescale/pinctrl-scu.c | 5 +++++
> 3 files changed, 6 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/pinctrl/freescale/Kconfig b/drivers/pinctrl/freescale/Kconfig
> index 08fcf5c..452c499 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 core driver"
> depends on IMX_SCU
> select PINCTRL_IMX
>
[...]
> diff --git a/drivers/pinctrl/freescale/pinctrl-imx.h
> b/drivers/pinctrl/freescale/pinctrl-imx.h
> index 40927ca..fd8c4b6 100644
> --- a/drivers/pinctrl/freescale/pinctrl-imx.h
> +++ b/drivers/pinctrl/freescale/pinctrl-imx.h
> @@ -144,7 +144,6 @@ struct imx_pinctrl_soc_info { int
> imx_pinctrl_probe(struct platform_device *pdev,
> const struct imx_pinctrl_soc_info *info);
>
> -#ifdef CONFIG_PINCTRL_IMX_SCU
> #define BM_PAD_CTL_GP_ENABLE BIT(30)
> #define BM_PAD_CTL_IFMUX_ENABLE BIT(31)
> #define BP_PAD_CTL_IFMUX 27
> @@ -157,23 +156,4 @@ int imx_pinconf_set_scu(struct pinctrl_dev *pctldev,
> unsigned pin_id, void imx_pinctrl_parse_pin_scu(struct imx_pinctrl *ipctl,
> unsigned int *pin_id, struct imx_pin *pin,
> const __be32 **list_p);
> -#else
> -static inline int imx_pinconf_get_scu(struct pinctrl_dev *pctldev,
> - unsigned pin_id, unsigned long *config)
> -{
> - return -EINVAL;
> -}
> -static inline int imx_pinconf_set_scu(struct pinctrl_dev *pctldev,
> - unsigned pin_id, unsigned long *configs,
> - unsigned num_configs)
> -{
> - return -EINVAL;
> -}
> -static inline void imx_pinctrl_parse_pin_scu(struct imx_pinctrl *ipctl,
> - unsigned int *pin_id,
> - struct imx_pin *pin,
> - const __be32 **list_p)
> -{
> -}
> -#endif
> #endif /* __DRIVERS_PINCTRL_IMX_H */
Should this part of changes go to Patch 1?
> diff --git a/drivers/pinctrl/freescale/pinctrl-scu.c
> b/drivers/pinctrl/freescale/pinctrl-scu.c
> index 9df45d3..59b5f8a 100644
> --- a/drivers/pinctrl/freescale/pinctrl-scu.c
> +++ b/drivers/pinctrl/freescale/pinctrl-scu.c
> @@ -7,6 +7,7 @@
>
> #include <linux/err.h>
> #include <linux/firmware/imx/sci.h>
> +#include <linux/module.h>
> #include <linux/of_address.h>
> #include <linux/pinctrl/pinctrl.h>
> #include <linux/platform_device.h>
> @@ -123,3 +124,7 @@ void imx_pinctrl_parse_pin_scu(struct imx_pinctrl
> *ipctl,
> pin_scu->mux_mode, pin_scu->config);
> }
> EXPORT_SYMBOL_GPL(imx_pinctrl_parse_pin_scu);
> +
> +MODULE_AUTHOR("Dong Aisheng <aisheng.dong@nxp.com>");
> +MODULE_DESCRIPTION("NXP i.MX SCU common pinctrl driver");
> +MODULE_LICENSE("GPL v2");
> --
> 2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH V2 3/3] pinctrl: imx: Support building i.MX pinctrl core driver as module
2020-09-07 12:32 ` [PATCH V2 3/3] pinctrl: imx: Support building i.MX " Anson Huang
@ 2020-09-08 2:45 ` Aisheng Dong
0 siblings, 0 replies; 8+ messages in thread
From: Aisheng Dong @ 2020-09-08 2:45 UTC (permalink / raw)
To: Anson Huang, festevam, shawnguo, stefan, kernel, linus.walleij,
s.hauer, linux-gpio, linux-kernel, linux-arm-kernel
Cc: dl-linux-imx
> From: Anson Huang <Anson.Huang@nxp.com>
> Sent: Monday, September 7, 2020 8:33 PM
>
> 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 <Anson.Huang@nxp.com>
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com>
Regards
Aisheng
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU related functions
2020-09-08 2:38 ` [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU related functions Aisheng Dong
@ 2020-09-08 5:04 ` Anson Huang
0 siblings, 0 replies; 8+ messages in thread
From: Anson Huang @ 2020-09-08 5:04 UTC (permalink / raw)
To: Aisheng Dong, festevam, shawnguo, stefan, kernel, linus.walleij,
s.hauer, linux-gpio, linux-kernel, linux-arm-kernel
Cc: dl-linux-imx
> Subject: RE: [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU
> related functions
>
> > From: Anson Huang <Anson.Huang@nxp.com>
> > Sent: Monday, September 7, 2020 8:33 PM
> >
> > 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.
> >
> > Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> > ---
> > Changes since V1:
> > - split V1 [1/2] patch to 2 patches, this patch does the change of
> > using function
> > callbacks for SCU related functions.
> > ---
> > drivers/pinctrl/freescale/pinctrl-imx.c | 8 +++----
> > drivers/pinctrl/freescale/pinctrl-imx.h | 37
> > +++++++++++++++++------------
> > drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 3 +++
> > drivers/pinctrl/freescale/pinctrl-imx8qm.c | 3 +++
> > drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 3 +++
> > 5 files changed, 35 insertions(+), 19 deletions(-)
> >
> > 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..40927ca 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;
> > +};
> > +
>
> You seems missed my question in the former patch review.
> Could you clarify a bit why need move this part code?
Please check the mail, I have replied it yestoday as below, the function needs to use imx_pinctrl structure,
so it needs to be moved, otherwise, build will fail.
> 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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* RE: [PATCH V2 2/3] pinctrl: imx: Support building SCU pinctrl core driver as module
2020-09-08 2:43 ` Aisheng Dong
@ 2020-09-08 5:06 ` Anson Huang
0 siblings, 0 replies; 8+ messages in thread
From: Anson Huang @ 2020-09-08 5:06 UTC (permalink / raw)
To: Aisheng Dong, festevam, shawnguo, stefan, kernel, linus.walleij,
s.hauer, linux-gpio, linux-kernel, linux-arm-kernel
Cc: dl-linux-imx
> Subject: RE: [PATCH V2 2/3] pinctrl: imx: Support building SCU pinctrl core
> driver as module
>
> > From: Anson Huang <Anson.Huang@nxp.com>
> > Sent: Monday, September 7, 2020 8:33 PM
> >
> > Change PINCTR_IMX_SCU to tristate, remove unnecessary #ifdef and add
> > module author, description and license to support building SCU pinctrl
> > core driver as module.
> >
> > Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
> > ---
> > Changes since V1:
> > - split V1 [1/2] patch to 2 patches, this patch supports building SCU
> > pinctrl core
> > driver as module;
> > - remove unnecessary #ifdef check and #else block.
> > ---
> > drivers/pinctrl/freescale/Kconfig | 2 +-
> > drivers/pinctrl/freescale/pinctrl-imx.h | 20 --------------------
> > drivers/pinctrl/freescale/pinctrl-scu.c | 5 +++++
> > 3 files changed, 6 insertions(+), 21 deletions(-)
> >
> > diff --git a/drivers/pinctrl/freescale/Kconfig
> > b/drivers/pinctrl/freescale/Kconfig
> > index 08fcf5c..452c499 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 core driver"
> > depends on IMX_SCU
> > select PINCTRL_IMX
> >
>
> [...]
>
> > diff --git a/drivers/pinctrl/freescale/pinctrl-imx.h
> > b/drivers/pinctrl/freescale/pinctrl-imx.h
> > index 40927ca..fd8c4b6 100644
> > --- a/drivers/pinctrl/freescale/pinctrl-imx.h
> > +++ b/drivers/pinctrl/freescale/pinctrl-imx.h
> > @@ -144,7 +144,6 @@ struct imx_pinctrl_soc_info { int
> > imx_pinctrl_probe(struct platform_device *pdev,
> > const struct imx_pinctrl_soc_info *info);
> >
> > -#ifdef CONFIG_PINCTRL_IMX_SCU
> > #define BM_PAD_CTL_GP_ENABLE BIT(30)
> > #define BM_PAD_CTL_IFMUX_ENABLE BIT(31)
> > #define BP_PAD_CTL_IFMUX 27
> > @@ -157,23 +156,4 @@ int imx_pinconf_set_scu(struct pinctrl_dev
> > *pctldev, unsigned pin_id, void imx_pinctrl_parse_pin_scu(struct
> imx_pinctrl *ipctl,
> > unsigned int *pin_id, struct imx_pin *pin,
> > const __be32 **list_p);
> > -#else
> > -static inline int imx_pinconf_get_scu(struct pinctrl_dev *pctldev,
> > - unsigned pin_id, unsigned long *config)
> > -{
> > - return -EINVAL;
> > -}
> > -static inline int imx_pinconf_set_scu(struct pinctrl_dev *pctldev,
> > - unsigned pin_id, unsigned long *configs,
> > - unsigned num_configs)
> > -{
> > - return -EINVAL;
> > -}
> > -static inline void imx_pinctrl_parse_pin_scu(struct imx_pinctrl *ipctl,
> > - unsigned int *pin_id,
> > - struct imx_pin *pin,
> > - const __be32 **list_p)
> > -{
> > -}
> > -#endif
> > #endif /* __DRIVERS_PINCTRL_IMX_H */
>
> Should this part of changes go to Patch 1?
OK, will send V3.
Anson
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-09-08 5:08 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-07 12:32 [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU related functions Anson Huang
2020-09-07 12:32 ` [PATCH V2 2/3] pinctrl: imx: Support building SCU pinctrl core driver as module Anson Huang
2020-09-08 2:43 ` Aisheng Dong
2020-09-08 5:06 ` Anson Huang
2020-09-07 12:32 ` [PATCH V2 3/3] pinctrl: imx: Support building i.MX " Anson Huang
2020-09-08 2:45 ` Aisheng Dong
2020-09-08 2:38 ` [PATCH V2 1/3] pinctrl: imx: Use function callbacks for SCU related functions Aisheng Dong
2020-09-08 5:04 ` Anson Huang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).