pinctrl: imx: Push imx_pinctrl_ops into drivers and staticize
Subsystems (4)
PATCH 1/10 pinctrl: imx: Push imx_pinctrl_ops into drivers and staticize
Move imx_pinctrl_ops into drivers and staticize. This is preparatory patch for follow up pinctrl drivers which will not use this variant of imx_pinctrl_ops content. This should not change size, as most of the deployments compiled in one pinctrl driver anyway. No functional change.
---
Cc: Alice Guo <[email protected]>
Cc: Jesse Taube <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Peter Robinson <[email protected]>
Cc: Tim Harvey <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
--- drivers/pinctrl/nxp/pinctrl-imx.c | 6 +----- drivers/pinctrl/nxp/pinctrl-imx.h | 4 ++-- drivers/pinctrl/nxp/pinctrl-imx5.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx6.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx7.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx8.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx8m.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx8ulp.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imx93.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-imxrt.c | 4 ++++ drivers/pinctrl/nxp/pinctrl-vf610.c | 4 ++++ 12 files changed, 43 insertions(+), 7 deletions(-)
drivers/pinctrl/nxp/pinctrl-imx.c +1 -5
@@ -18,7 +18,7 @@DECLARE_GLOBAL_DATA_PTR ; -static int imx_pinctrl_set_state (struct udevice *dev,struct udevice *config) +int imx_pinctrl_set_state (struct udevice *dev,struct udevice *config) {struct imx_pinctrl_priv *priv =dev_get_priv (dev);struct imx_pinctrl_soc_info *info = priv->info;
@@ -194,10 +194,6 @@ static int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config)return 0 ; } -const struct pinctrl_ops imx_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, -}; -int imx_pinctrl_probe (struct udevice *dev,struct imx_pinctrl_soc_info *info) {
drivers/pinctrl/nxp/pinctrl-imx.h +2 -2
@@ -28,8 +28,6 @@ struct imx_pinctrl_priv {struct imx_pinctrl_soc_info *info; }; -extern const struct pinctrl_ops imx_pinctrl_ops; -#define IMX_NO_PAD_CTL 0x80000000/* no pin config need */ #define IMX_PAD_SION 0x40000000/* set SION */
@@ -54,6 +52,8 @@ int imx_pinctrl_probe(struct udevice *dev, struct imx_pinctrl_soc_info *info);int imx_pinctrl_remove (struct udevice *dev); +int imx_pinctrl_set_state (struct udevice *dev,struct udevice *config); +#ifdef CONFIG_PINCTRL_IMX_SCU int imx_pinctrl_scu_conf_pins (struct imx_pinctrl_soc_info *info,u32 *pin_data,int npins);
drivers/pinctrl/nxp/pinctrl-imx5.c +4 -0
@@ -31,6 +31,10 @@ static const struct udevice_id imx5_pinctrl_match[] = { {/* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; +U_BOOT_DRIVER (imx5_pinctrl) = { .name ="imx5-pinctrl" , .id =UCLASS_PINCTRL ,
drivers/pinctrl/nxp/pinctrl-imx6.c +4 -0
@@ -40,6 +40,10 @@ static const struct udevice_id imx6_pinctrl_match[] = { {/* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; +U_BOOT_DRIVER (fsl_imx6q_iomuxc) = { .name ="fsl_imx6q_iomuxc" , .id =UCLASS_PINCTRL ,
drivers/pinctrl/nxp/pinctrl-imx7.c +4 -0
@@ -28,6 +28,10 @@ static const struct udevice_id imx7_pinctrl_match[] = { {/* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; +U_BOOT_DRIVER (imx7_pinctrl) = { .name ="imx7-pinctrl" , .id =UCLASS_PINCTRL ,
drivers/pinctrl/nxp/pinctrl-imx7ulp.c +4 -0
@@ -32,6 +32,10 @@ static const struct udevice_id imx7ulp_pinctrl_match[] = { {/* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; +U_BOOT_DRIVER (imx7ulp_pinctrl) = { .name ="imx7ulp-pinctrl" , .id =UCLASS_PINCTRL ,
drivers/pinctrl/nxp/pinctrl-imx8.c +4 -0
@@ -29,6 +29,10 @@ static const struct udevice_id imx8_pinctrl_match[] = { {/* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; +U_BOOT_DRIVER (imx8_pinctrl) = { .name ="imx8_pinctrl" , .id =UCLASS_PINCTRL ,
drivers/pinctrl/nxp/pinctrl-imx8m.c +4 -0
@@ -26,6 +26,10 @@ static const struct udevice_id imx8m_pinctrl_match[] = { {/* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; +U_BOOT_DRIVER (imx8mq_pinctrl) = { .name ="imx8mq-pinctrl" , .id =UCLASS_PINCTRL ,
drivers/pinctrl/nxp/pinctrl-imx8ulp.c +4 -0
@@ -31,6 +31,10 @@ static const struct udevice_id imx8ulp_pinctrl_match[] = { {/* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; +U_BOOT_DRIVER (imx8ulp_pinctrl) = { .name ="imx8ulp-pinctrl" , .id =UCLASS_PINCTRL ,
drivers/pinctrl/nxp/pinctrl-imx93.c +4 -0
@@ -26,6 +26,10 @@ static const struct udevice_id imx93_pinctrl_match[] = { {/* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; +U_BOOT_DRIVER (imx93_pinctrl) = { .name ="imx93-pinctrl" , .id =UCLASS_PINCTRL ,
drivers/pinctrl/nxp/pinctrl-imxrt.c +4 -0
@@ -27,6 +27,10 @@ static const struct udevice_id imxrt_pinctrl_match[] = { {/* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; +U_BOOT_DRIVER (imxrt_pinctrl) = { .name ="imxrt-pinctrl" , .id =UCLASS_PINCTRL ,
drivers/pinctrl/nxp/pinctrl-vf610.c +4 -0
@@ -27,6 +27,10 @@ static const struct udevice_id vf610_pinctrl_match[] = { {/* sentinel */ } }; +static const struct pinctrl_ops imx_pinctrl_ops = { + .set_state = imx_pinctrl_set_state, +}; +U_BOOT_DRIVER (vf610_pinctrl) = { .name ="vf610-pinctrl" , .id =UCLASS_PINCTRL ,
Signature · 1 line
2.45.2
PATCH 2/10 pinctrl: imx: Rename imx_pinctrl_ops to match drivers
Rename the structure instances to match driver names, so they can be easily looked up e.g. in objdump and readelf outputs. No functional change.
---
Cc: Alice Guo <[email protected]>
Cc: Jesse Taube <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Peter Robinson <[email protected]>
Cc: Tim Harvey <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
--- drivers/pinctrl/nxp/pinctrl-imx5.c | 4 ++-- drivers/pinctrl/nxp/pinctrl-imx6.c | 4 ++-- drivers/pinctrl/nxp/pinctrl-imx7.c | 4 ++-- drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 4 ++-- drivers/pinctrl/nxp/pinctrl-imx8.c | 4 ++-- drivers/pinctrl/nxp/pinctrl-imx8m.c | 4 ++-- drivers/pinctrl/nxp/pinctrl-imx8ulp.c | 4 ++-- drivers/pinctrl/nxp/pinctrl-imx93.c | 4 ++-- drivers/pinctrl/nxp/pinctrl-imxrt.c | 4 ++-- drivers/pinctrl/nxp/pinctrl-vf610.c | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-)
drivers/pinctrl/nxp/pinctrl-imx5.c +2 -2
@@ -31,7 +31,7 @@ static const struct udevice_id imx5_pinctrl_match[] = { {/* sentinel */ } }; -static const struct pinctrl_ops imx_pinctrl_ops = { +static const struct pinctrl_ops imx5_pinctrl_ops = { .set_state = imx_pinctrl_set_state, };
@@ -42,6 +42,6 @@ U_BOOT_DRIVER(imx5_pinctrl) = { .probe = imx5_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), - .ops = &imx_pinctrl_ops, + .ops = &imx5_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, };
drivers/pinctrl/nxp/pinctrl-imx6.c +2 -2
@@ -40,7 +40,7 @@ static const struct udevice_id imx6_pinctrl_match[] = { {/* sentinel */ } }; -static const struct pinctrl_ops imx_pinctrl_ops = { +static const struct pinctrl_ops imx6_pinctrl_ops = { .set_state = imx_pinctrl_set_state, };
@@ -51,7 +51,7 @@ U_BOOT_DRIVER(fsl_imx6q_iomuxc) = { .probe = imx6_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), - .ops = &imx_pinctrl_ops, + .ops = &imx6_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, };
drivers/pinctrl/nxp/pinctrl-imx7.c +2 -2
@@ -28,7 +28,7 @@ static const struct udevice_id imx7_pinctrl_match[] = { {/* sentinel */ } }; -static const struct pinctrl_ops imx_pinctrl_ops = { +static const struct pinctrl_ops imx7_pinctrl_ops = { .set_state = imx_pinctrl_set_state, };
@@ -39,6 +39,6 @@ U_BOOT_DRIVER(imx7_pinctrl) = { .probe = imx7_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), - .ops = &imx_pinctrl_ops, + .ops = &imx7_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, };
drivers/pinctrl/nxp/pinctrl-imx7ulp.c +2 -2
@@ -32,7 +32,7 @@ static const struct udevice_id imx7ulp_pinctrl_match[] = { {/* sentinel */ } }; -static const struct pinctrl_ops imx_pinctrl_ops = { +static const struct pinctrl_ops imx7ulp_pinctrl_ops = { .set_state = imx_pinctrl_set_state, };
@@ -43,6 +43,6 @@ U_BOOT_DRIVER(imx7ulp_pinctrl) = { .probe = imx7ulp_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), - .ops = &imx_pinctrl_ops, + .ops = &imx7ulp_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, };
drivers/pinctrl/nxp/pinctrl-imx8.c +2 -2
@@ -29,7 +29,7 @@ static const struct udevice_id imx8_pinctrl_match[] = { {/* sentinel */ } }; -static const struct pinctrl_ops imx_pinctrl_ops = { +static const struct pinctrl_ops imx8_pinctrl_ops = { .set_state = imx_pinctrl_set_state, };
@@ -40,6 +40,6 @@ U_BOOT_DRIVER(imx8_pinctrl) = { .probe = imx8_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), - .ops = &imx_pinctrl_ops, + .ops = &imx8_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, };
drivers/pinctrl/nxp/pinctrl-imx8m.c +2 -2
@@ -26,7 +26,7 @@ static const struct udevice_id imx8m_pinctrl_match[] = { {/* sentinel */ } }; -static const struct pinctrl_ops imx_pinctrl_ops = { +static const struct pinctrl_ops imx8m_pinctrl_ops = { .set_state = imx_pinctrl_set_state, };
@@ -37,6 +37,6 @@ U_BOOT_DRIVER(imx8mq_pinctrl) = { .probe = imx8mq_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), - .ops = &imx_pinctrl_ops, + .ops = &imx8m_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, };
drivers/pinctrl/nxp/pinctrl-imx8ulp.c +2 -2
@@ -31,7 +31,7 @@ static const struct udevice_id imx8ulp_pinctrl_match[] = { {/* sentinel */ } }; -static const struct pinctrl_ops imx_pinctrl_ops = { +static const struct pinctrl_ops imx8ulp_pinctrl_ops = { .set_state = imx_pinctrl_set_state, };
@@ -42,6 +42,6 @@ U_BOOT_DRIVER(imx8ulp_pinctrl) = { .probe = imx8ulp_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), - .ops = &imx_pinctrl_ops, + .ops = &imx8ulp_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, };
drivers/pinctrl/nxp/pinctrl-imx93.c +2 -2
@@ -26,7 +26,7 @@ static const struct udevice_id imx93_pinctrl_match[] = { {/* sentinel */ } }; -static const struct pinctrl_ops imx_pinctrl_ops = { +static const struct pinctrl_ops imx93_pinctrl_ops = { .set_state = imx_pinctrl_set_state, };
@@ -37,6 +37,6 @@ U_BOOT_DRIVER(imx93_pinctrl) = { .probe = imx93_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), - .ops = &imx_pinctrl_ops, + .ops = &imx93_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, };
drivers/pinctrl/nxp/pinctrl-imxrt.c +2 -2
@@ -27,7 +27,7 @@ static const struct udevice_id imxrt_pinctrl_match[] = { {/* sentinel */ } }; -static const struct pinctrl_ops imx_pinctrl_ops = { +static const struct pinctrl_ops imxrt_pinctrl_ops = { .set_state = imx_pinctrl_set_state, };
@@ -38,6 +38,6 @@ U_BOOT_DRIVER(imxrt_pinctrl) = { .probe = imxrt_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), - .ops = &imx_pinctrl_ops, + .ops = &imxrt_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, };
drivers/pinctrl/nxp/pinctrl-vf610.c +2 -2
@@ -27,7 +27,7 @@ static const struct udevice_id vf610_pinctrl_match[] = { {/* sentinel */ } }; -static const struct pinctrl_ops imx_pinctrl_ops = { +static const struct pinctrl_ops vf610_pinctrl_ops = { .set_state = imx_pinctrl_set_state, };
@@ -38,6 +38,6 @@ U_BOOT_DRIVER(vf610_pinctrl) = { .probe = vf610_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), - .ops = &imx_pinctrl_ops, + .ops = &vf610_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC, };
Signature · 1 line
2.45.2
PATCH 3/10 pinctrl: imx: Drop .remove callback for SCU variant
In reply to Marek VasutThe return callback for SCU variant of the pinctrl drivers does nothing but returns 0. Remove the return callback from the SCU driver itself, that has the same effect. No functional change.
---
Cc: Alice Guo <[email protected]>
Cc: Jesse Taube <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Peter Robinson <[email protected]>
Cc: Tim Harvey <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
--- drivers/pinctrl/nxp/pinctrl-imx.c | 3 --- drivers/pinctrl/nxp/pinctrl-imx8.c | 1 - 2 files changed, 4 deletions(-)
drivers/pinctrl/nxp/pinctrl-imx.c +0 -3
@@ -256,9 +256,6 @@ int imx_pinctrl_remove(struct udevice *dev)struct imx_pinctrl_priv *priv =dev_get_priv (dev);struct imx_pinctrl_soc_info *info = priv->info; -if (info->flags &IMX8_USE_SCU ) -return 0 ; -if (info->input_sel_base)unmap_sysmem (info->input_sel_base);if (info->base)
drivers/pinctrl/nxp/pinctrl-imx8.c +0 -1
@@ -38,7 +38,6 @@ U_BOOT_DRIVER(imx8_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx8_pinctrl_match), .probe = imx8_pinctrl_probe, - .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx8_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
Signature · 1 line
2.45.2
PATCH 4/10 pinctrl: imx: Inline struct imx_pinctrl_soc_info access into probe
In reply to Marek VasutThe probe function is identical across all the pinctrl drivers. Inline the imx_pinctrl_soc_info access into imx_pinctrl_probe() and drop all the duplicate probe functions. No functional change.
---
Cc: Alice Guo <[email protected]>
Cc: Jesse Taube <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Peter Robinson <[email protected]>
Cc: Tim Harvey <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
--- drivers/pinctrl/nxp/pinctrl-imx.c | 5 +++-- drivers/pinctrl/nxp/pinctrl-imx.h | 2 +- drivers/pinctrl/nxp/pinctrl-imx5.c | 10 +--------- drivers/pinctrl/nxp/pinctrl-imx6.c | 10 +--------- drivers/pinctrl/nxp/pinctrl-imx7.c | 10 +--------- drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 10 +--------- drivers/pinctrl/nxp/pinctrl-imx8.c | 10 +--------- drivers/pinctrl/nxp/pinctrl-imx8m.c | 10 +--------- drivers/pinctrl/nxp/pinctrl-imx8ulp.c | 10 +--------- drivers/pinctrl/nxp/pinctrl-imx93.c | 10 +--------- drivers/pinctrl/nxp/pinctrl-imxrt.c | 10 +--------- drivers/pinctrl/nxp/pinctrl-vf610.c | 10 +--------- 12 files changed, 14 insertions(+), 93 deletions(-)
drivers/pinctrl/nxp/pinctrl-imx.c +3 -2
@@ -194,9 +194,10 @@ int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config)return 0 ; } -int imx_pinctrl_probe (struct udevice *dev, -struct imx_pinctrl_soc_info *info) +int imx_pinctrl_probe (struct udevice *dev) { +struct imx_pinctrl_soc_info *info = + (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev);struct imx_pinctrl_priv *priv =dev_get_priv (dev);struct ofnode_phandle_args arg;ofnode node =dev_ofnode (dev);
drivers/pinctrl/nxp/pinctrl-imx.h +1 -1
@@ -48,7 +48,7 @@ struct imx_pinctrl_priv {#define IOMUXC_CONFIG_SION (0x1 << 4) -int imx_pinctrl_probe (struct udevice *dev,struct imx_pinctrl_soc_info *info); +int imx_pinctrl_probe (struct udevice *dev);int imx_pinctrl_remove (struct udevice *dev);
drivers/pinctrl/nxp/pinctrl-imx5.c +1 -9
@@ -11,14 +11,6 @@ static struct imx_pinctrl_soc_info imx5_pinctrl_soc_info __section(".data"); -static int imx5_pinctrl_probe (struct udevice *dev) -{ -struct imx_pinctrl_soc_info *info = - (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev); - -return imx_pinctrl_probe (dev, info); -} -static const struct udevice_id imx5_pinctrl_match[] = { { .compatible ="fsl,imx53-iomuxc" ,
@@ -39,7 +31,7 @@ U_BOOT_DRIVER(imx5_pinctrl) = { .name = "imx5-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx5_pinctrl_match), - .probe = imx5_pinctrl_probe, + .probe = imx_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx5_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx6.c +1 -9
@@ -20,14 +20,6 @@ static struct imx_pinctrl_soc_info imx6_snvs_pinctrl_soc_info = { .flags = ZERO_OFFSET_VALID, }; -static int imx6_pinctrl_probe (struct udevice *dev) -{ -struct imx_pinctrl_soc_info *info = - (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev); - -return imx_pinctrl_probe (dev, info); -} -static const struct udevice_id imx6_pinctrl_match[] = { { .compatible ="fsl,imx6q-iomuxc" , .data = (ulong)&imx6_pinctrl_soc_info }, { .compatible ="fsl,imx6dl-iomuxc" , .data = (ulong)&imx6_pinctrl_soc_info },
@@ -48,7 +40,7 @@ U_BOOT_DRIVER(fsl_imx6q_iomuxc) = { .name = "fsl_imx6q_iomuxc", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx6_pinctrl_match), - .probe = imx6_pinctrl_probe, + .probe = imx_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx6_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx7.c +1 -9
@@ -14,14 +14,6 @@ static struct imx_pinctrl_soc_info imx7_lpsr_pinctrl_soc_info = { .flags = ZERO_OFFSET_VALID, }; -static int imx7_pinctrl_probe (struct udevice *dev) -{ -struct imx_pinctrl_soc_info *info = - (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev); - -return imx_pinctrl_probe (dev, info); -} -static const struct udevice_id imx7_pinctrl_match[] = { { .compatible ="fsl,imx7d-iomuxc" , .data = (ulong)&imx7_pinctrl_soc_info }, { .compatible ="fsl,imx7d-iomuxc-lpsr" , .data = (ulong)&imx7_lpsr_pinctrl_soc_info },
@@ -36,7 +28,7 @@ U_BOOT_DRIVER(imx7_pinctrl) = { .name = "imx7-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx7_pinctrl_match), - .probe = imx7_pinctrl_probe, + .probe = imx_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx7_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx7ulp.c +1 -9
@@ -18,14 +18,6 @@ static struct imx_pinctrl_soc_info imx7ulp_pinctrl_soc_info1 = { .flags = ZERO_OFFSET_VALID | SHARE_MUX_CONF_REG | CFG_IBE_OBE, }; -static int imx7ulp_pinctrl_probe (struct udevice *dev) -{ -struct imx_pinctrl_soc_info *info = - (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev); - -return imx_pinctrl_probe (dev, info); -} -static const struct udevice_id imx7ulp_pinctrl_match[] = { { .compatible ="fsl,imx7ulp-iomuxc-0" , .data = (ulong)&imx7ulp_pinctrl_soc_info0 }, { .compatible ="fsl,imx7ulp-iomuxc-1" , .data = (ulong)&imx7ulp_pinctrl_soc_info1 },
@@ -40,7 +32,7 @@ U_BOOT_DRIVER(imx7ulp_pinctrl) = { .name = "imx7ulp-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx7ulp_pinctrl_match), - .probe = imx7ulp_pinctrl_probe, + .probe = imx_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx7ulp_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx8.c +1 -9
@@ -15,14 +15,6 @@ static struct imx_pinctrl_soc_info imx8_pinctrl_soc_info = { .flags = IMX8_USE_SCU, }; -static int imx8_pinctrl_probe (struct udevice *dev) -{ -struct imx_pinctrl_soc_info *info = - (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev); - -return imx_pinctrl_probe (dev, info); -} -static const struct udevice_id imx8_pinctrl_match[] = { { .compatible ="fsl,imx8qxp-iomuxc" , .data = (ulong)&imx8_pinctrl_soc_info }, { .compatible ="fsl,imx8qm-iomuxc" , .data = (ulong)&imx8_pinctrl_soc_info },
@@ -37,7 +29,7 @@ U_BOOT_DRIVER(imx8_pinctrl) = { .name = "imx8_pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx8_pinctrl_match), - .probe = imx8_pinctrl_probe, + .probe = imx_pinctrl_probe, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx8_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
drivers/pinctrl/nxp/pinctrl-imx8m.c +1 -9
@@ -10,14 +10,6 @@ static struct imx_pinctrl_soc_info imx8mq_pinctrl_soc_info __section(".data"); -static int imx8mq_pinctrl_probe (struct udevice *dev) -{ -struct imx_pinctrl_soc_info *info = - (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev); - -return imx_pinctrl_probe (dev, info); -} -static const struct udevice_id imx8m_pinctrl_match[] = { { .compatible ="fsl,imx8mq-iomuxc" , .data = (ulong)&imx8mq_pinctrl_soc_info }, { .compatible ="fsl,imx8mm-iomuxc" , .data = (ulong)&imx8mq_pinctrl_soc_info },
@@ -34,7 +26,7 @@ U_BOOT_DRIVER(imx8mq_pinctrl) = { .name = "imx8mq-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx8m_pinctrl_match), - .probe = imx8mq_pinctrl_probe, + .probe = imx_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx8m_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx8ulp.c +1 -9
@@ -17,14 +17,6 @@ static struct imx_pinctrl_soc_info imx8ulp_pinctrl_soc_info1 = { .flags = ZERO_OFFSET_VALID | SHARE_MUX_CONF_REG | CFG_IBE_OBE, }; -static int imx8ulp_pinctrl_probe (struct udevice *dev) -{ -struct imx_pinctrl_soc_info *info = - (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev); - -return imx_pinctrl_probe (dev, info); -} -static const struct udevice_id imx8ulp_pinctrl_match[] = { { .compatible ="fsl,imx8ulp-iomuxc0" , .data = (ulong)&imx8ulp_pinctrl_soc_info0 }, { .compatible ="fsl,imx8ulp-iomuxc1" , .data = (ulong)&imx8ulp_pinctrl_soc_info1 },
@@ -39,7 +31,7 @@ U_BOOT_DRIVER(imx8ulp_pinctrl) = { .name = "imx8ulp-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx8ulp_pinctrl_match), - .probe = imx8ulp_pinctrl_probe, + .probe = imx_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx8ulp_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx93.c +1 -9
@@ -12,14 +12,6 @@ static struct imx_pinctrl_soc_info imx93_pinctrl_soc_info __section(".data") = { .flags = ZERO_OFFSET_VALID, }; -static int imx93_pinctrl_probe (struct udevice *dev) -{ -struct imx_pinctrl_soc_info *info = - (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev); - -return imx_pinctrl_probe (dev, info); -} -static const struct udevice_id imx93_pinctrl_match[] = { { .compatible ="fsl,imx93-iomuxc" , .data = (ulong)&imx93_pinctrl_soc_info }, { .compatible ="fsl,imx91-iomuxc" , .data = (ulong)&imx93_pinctrl_soc_info },
@@ -34,7 +26,7 @@ U_BOOT_DRIVER(imx93_pinctrl) = { .name = "imx93-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx93_pinctrl_match), - .probe = imx93_pinctrl_probe, + .probe = imx_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx93_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imxrt.c +1 -9
@@ -13,14 +13,6 @@ static struct imx_pinctrl_soc_info imxrt_pinctrl_soc_info = { .flags = ZERO_OFFSET_VALID, }; -static int imxrt_pinctrl_probe (struct udevice *dev) -{ -struct imx_pinctrl_soc_info *info = - (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev); - -return imx_pinctrl_probe (dev, info); -} -static const struct udevice_id imxrt_pinctrl_match[] = { { .compatible ="fsl,imxrt-iomuxc" , .data = (ulong)&imxrt_pinctrl_soc_info },
@@ -35,7 +27,7 @@ U_BOOT_DRIVER(imxrt_pinctrl) = { .name = "imxrt-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imxrt_pinctrl_match), - .probe = imxrt_pinctrl_probe, + .probe = imx_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imxrt_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-vf610.c +1 -9
@@ -13,14 +13,6 @@ static struct imx_pinctrl_soc_info vf610_pinctrl_soc_info = { .flags = SHARE_MUX_CONF_REG | ZERO_OFFSET_VALID, }; -static int vf610_pinctrl_probe (struct udevice *dev) -{ -struct imx_pinctrl_soc_info *info = - (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev); - -return imx_pinctrl_probe (dev, info); -} -static const struct udevice_id vf610_pinctrl_match[] = { { .compatible ="fsl,vf610-iomuxc" , .data = (ulong)&vf610_pinctrl_soc_info },
@@ -35,7 +27,7 @@ U_BOOT_DRIVER(vf610_pinctrl) = { .name = "vf610-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(vf610_pinctrl_match), - .probe = vf610_pinctrl_probe, + .probe = imx_pinctrl_probe, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &vf610_pinctrl_ops,
Signature · 1 line
2.45.2
PATCH 5/10 pinctrl: imx: Split imx_pinctrl_probe() into common and mmio parts
In reply to Marek VasutSplit imx_pinctrl_probe() into imx_pinctrl_probe_common() and imx_pinctrl_probe_mmio(). The former does the common setup, the later does the common setup and MMIO access configuration. The common setup can be used as-is for SCU based systems, update the pinctrl-imx8 to call only the common setup, update all the other pinctrl drivers to call imx_pinctrl_probe_mmio().
No functional change.
---
Cc: Alice Guo <[email protected]>
Cc: Jesse Taube <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Peter Robinson <[email protected]>
Cc: Tim Harvey <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
--- drivers/pinctrl/nxp/pinctrl-imx.c | 26 ++++++++++++++++++-------- drivers/pinctrl/nxp/pinctrl-imx.h | 3 ++- drivers/pinctrl/nxp/pinctrl-imx5.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx6.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx7.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8m.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8ulp.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx93.c | 2 +- drivers/pinctrl/nxp/pinctrl-imxrt.c | 2 +- drivers/pinctrl/nxp/pinctrl-vf610.c | 2 +- 12 files changed, 30 insertions(+), 19 deletions(-)
drivers/pinctrl/nxp/pinctrl-imx.c +18 -8
@@ -194,16 +194,11 @@ int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config)return 0 ; } -int imx_pinctrl_probe (struct udevice *dev) +int imx_pinctrl_probe_common (struct udevice *dev) {struct imx_pinctrl_soc_info *info = (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev);struct imx_pinctrl_priv *priv =dev_get_priv (dev); -struct ofnode_phandle_args arg; -ofnode node =dev_ofnode (dev); -fdt_addr_t addr; -fdt_size_t size; -int ret;if (!info) {dev_err (dev,"wrong pinctrl info\n" );
@@ -213,8 +208,23 @@ int imx_pinctrl_probe(struct udevice *dev) priv->dev = dev; priv->info = info; -if (info->flags &IMX8_USE_SCU ) -return 0 ; +return 0 ; +} + +int imx_pinctrl_probe_mmio (struct udevice *dev) +{ +struct imx_pinctrl_soc_info *info = + (struct imx_pinctrl_soc_info *)dev_get_driver_data (dev); +struct imx_pinctrl_priv *priv =dev_get_priv (dev); +struct ofnode_phandle_args arg; +ofnode node =dev_ofnode (dev); +fdt_addr_t addr; +fdt_size_t size; +int ret; + + ret =imx_pinctrl_probe_common (dev); +if (ret) +return ret; addr =ofnode_get_addr_size_index (node,0 , &size);if (addr ==FDT_ADDR_T_NONE )
drivers/pinctrl/nxp/pinctrl-imx.h +2 -1
@@ -48,7 +48,8 @@ struct imx_pinctrl_priv {#define IOMUXC_CONFIG_SION (0x1 << 4) -int imx_pinctrl_probe (struct udevice *dev); +int imx_pinctrl_probe_common (struct udevice *dev); +int imx_pinctrl_probe_mmio (struct udevice *dev);int imx_pinctrl_remove (struct udevice *dev);
drivers/pinctrl/nxp/pinctrl-imx5.c +1 -1
@@ -31,7 +31,7 @@ U_BOOT_DRIVER(imx5_pinctrl) = { .name = "imx5-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx5_pinctrl_match), - .probe = imx_pinctrl_probe, + .probe = imx_pinctrl_probe_mmio, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx5_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx6.c +1 -1
@@ -40,7 +40,7 @@ U_BOOT_DRIVER(fsl_imx6q_iomuxc) = { .name = "fsl_imx6q_iomuxc", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx6_pinctrl_match), - .probe = imx_pinctrl_probe, + .probe = imx_pinctrl_probe_mmio, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx6_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx7.c +1 -1
@@ -28,7 +28,7 @@ U_BOOT_DRIVER(imx7_pinctrl) = { .name = "imx7-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx7_pinctrl_match), - .probe = imx_pinctrl_probe, + .probe = imx_pinctrl_probe_mmio, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx7_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx7ulp.c +1 -1
@@ -32,7 +32,7 @@ U_BOOT_DRIVER(imx7ulp_pinctrl) = { .name = "imx7ulp-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx7ulp_pinctrl_match), - .probe = imx_pinctrl_probe, + .probe = imx_pinctrl_probe_mmio, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx7ulp_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx8.c +1 -1
@@ -29,7 +29,7 @@ U_BOOT_DRIVER(imx8_pinctrl) = { .name = "imx8_pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx8_pinctrl_match), - .probe = imx_pinctrl_probe, + .probe = imx_pinctrl_probe_common, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx8_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
drivers/pinctrl/nxp/pinctrl-imx8m.c +1 -1
@@ -26,7 +26,7 @@ U_BOOT_DRIVER(imx8mq_pinctrl) = { .name = "imx8mq-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx8m_pinctrl_match), - .probe = imx_pinctrl_probe, + .probe = imx_pinctrl_probe_mmio, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx8m_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx8ulp.c +1 -1
@@ -31,7 +31,7 @@ U_BOOT_DRIVER(imx8ulp_pinctrl) = { .name = "imx8ulp-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx8ulp_pinctrl_match), - .probe = imx_pinctrl_probe, + .probe = imx_pinctrl_probe_mmio, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx8ulp_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imx93.c +1 -1
@@ -26,7 +26,7 @@ U_BOOT_DRIVER(imx93_pinctrl) = { .name = "imx93-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx93_pinctrl_match), - .probe = imx_pinctrl_probe, + .probe = imx_pinctrl_probe_mmio, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx93_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-imxrt.c +1 -1
@@ -27,7 +27,7 @@ U_BOOT_DRIVER(imxrt_pinctrl) = { .name = "imxrt-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imxrt_pinctrl_match), - .probe = imx_pinctrl_probe, + .probe = imx_pinctrl_probe_mmio, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imxrt_pinctrl_ops,
drivers/pinctrl/nxp/pinctrl-vf610.c +1 -1
@@ -27,7 +27,7 @@ U_BOOT_DRIVER(vf610_pinctrl) = { .name = "vf610-pinctrl", .id = UCLASS_PINCTRL, .of_match = of_match_ptr(vf610_pinctrl_match), - .probe = imx_pinctrl_probe, + .probe = imx_pinctrl_probe_mmio, .remove = imx_pinctrl_remove, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &vf610_pinctrl_ops,
Signature · 1 line
2.45.2
PATCH 6/10 pinctrl: imx: Rename imx_pinctrl_remove() to imx_pinctrl_remove_mmio()
In reply to Marek VasutThe current implementation of imx_pinctrl_remove() is specific to the MMIO accessor implementation, rename the function to imx_pinctrl_remove_mmio() to make this obvious. No functional change.
---
Cc: Alice Guo <[email protected]>
Cc: Jesse Taube <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Peter Robinson <[email protected]>
Cc: Tim Harvey <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
--- drivers/pinctrl/nxp/pinctrl-imx.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx.h | 2 +- drivers/pinctrl/nxp/pinctrl-imx5.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx6.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx7.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8m.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8ulp.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx93.c | 2 +- drivers/pinctrl/nxp/pinctrl-imxrt.c | 2 +- drivers/pinctrl/nxp/pinctrl-vf610.c | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
drivers/pinctrl/nxp/pinctrl-imx.c +1 -1
@@ -262,7 +262,7 @@ int imx_pinctrl_probe_mmio(struct udevice *dev)return 0 ; } -int imx_pinctrl_remove (struct udevice *dev) +int imx_pinctrl_remove_mmio (struct udevice *dev) {struct imx_pinctrl_priv *priv =dev_get_priv (dev);struct imx_pinctrl_soc_info *info = priv->info;
drivers/pinctrl/nxp/pinctrl-imx.h +1 -1
@@ -51,7 +51,7 @@ struct imx_pinctrl_priv {int imx_pinctrl_probe_common (struct udevice *dev);int imx_pinctrl_probe_mmio (struct udevice *dev); -int imx_pinctrl_remove (struct udevice *dev); +int imx_pinctrl_remove_mmio (struct udevice *dev);int imx_pinctrl_set_state (struct udevice *dev,struct udevice *config);
drivers/pinctrl/nxp/pinctrl-imx5.c +1 -1
@@ -32,7 +32,7 @@ U_BOOT_DRIVER(imx5_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx5_pinctrl_match), .probe = imx_pinctrl_probe_mmio, - .remove = imx_pinctrl_remove, + .remove = imx_pinctrl_remove_mmio, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx5_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
drivers/pinctrl/nxp/pinctrl-imx6.c +1 -1
@@ -41,7 +41,7 @@ U_BOOT_DRIVER(fsl_imx6q_iomuxc) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx6_pinctrl_match), .probe = imx_pinctrl_probe_mmio, - .remove = imx_pinctrl_remove, + .remove = imx_pinctrl_remove_mmio, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx6_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
drivers/pinctrl/nxp/pinctrl-imx7.c +1 -1
@@ -29,7 +29,7 @@ U_BOOT_DRIVER(imx7_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx7_pinctrl_match), .probe = imx_pinctrl_probe_mmio, - .remove = imx_pinctrl_remove, + .remove = imx_pinctrl_remove_mmio, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx7_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
drivers/pinctrl/nxp/pinctrl-imx7ulp.c +1 -1
@@ -33,7 +33,7 @@ U_BOOT_DRIVER(imx7ulp_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx7ulp_pinctrl_match), .probe = imx_pinctrl_probe_mmio, - .remove = imx_pinctrl_remove, + .remove = imx_pinctrl_remove_mmio, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx7ulp_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
drivers/pinctrl/nxp/pinctrl-imx8m.c +1 -1
@@ -27,7 +27,7 @@ U_BOOT_DRIVER(imx8mq_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx8m_pinctrl_match), .probe = imx_pinctrl_probe_mmio, - .remove = imx_pinctrl_remove, + .remove = imx_pinctrl_remove_mmio, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx8m_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
drivers/pinctrl/nxp/pinctrl-imx8ulp.c +1 -1
@@ -32,7 +32,7 @@ U_BOOT_DRIVER(imx8ulp_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx8ulp_pinctrl_match), .probe = imx_pinctrl_probe_mmio, - .remove = imx_pinctrl_remove, + .remove = imx_pinctrl_remove_mmio, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx8ulp_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
drivers/pinctrl/nxp/pinctrl-imx93.c +1 -1
@@ -27,7 +27,7 @@ U_BOOT_DRIVER(imx93_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imx93_pinctrl_match), .probe = imx_pinctrl_probe_mmio, - .remove = imx_pinctrl_remove, + .remove = imx_pinctrl_remove_mmio, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imx93_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
drivers/pinctrl/nxp/pinctrl-imxrt.c +1 -1
@@ -28,7 +28,7 @@ U_BOOT_DRIVER(imxrt_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(imxrt_pinctrl_match), .probe = imx_pinctrl_probe_mmio, - .remove = imx_pinctrl_remove, + .remove = imx_pinctrl_remove_mmio, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &imxrt_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
drivers/pinctrl/nxp/pinctrl-vf610.c +1 -1
@@ -28,7 +28,7 @@ U_BOOT_DRIVER(vf610_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(vf610_pinctrl_match), .probe = imx_pinctrl_probe_mmio, - .remove = imx_pinctrl_remove, + .remove = imx_pinctrl_remove_mmio, .priv_auto = sizeof(struct imx_pinctrl_priv), .ops = &vf610_pinctrl_ops, .flags = DM_FLAG_PRE_RELOC,
Signature · 1 line
2.45.2
PATCH 7/10 pinctrl: imx: Split imx_pinctrl_set_state() into common and mmio parts
In reply to Marek VasutSplit imx_pinctrl_set_state() into imx_pinctrl_set_state_common() and imx_pinctrl_set_state_mmio(). The former does the common configuration parsing, the later does call imx_pinctrl_set_state_common() and then does pin configuration using either SCU or MMIO accesses. The SCU part is going to be moved out in follow up patches.
This is a preparatory patch for follow up pinctrl drivers which do not use the MMIO accessors, but some other means, like SCU or otherwise. Those will call the common imx_pinctrl_set_state_common() function wrapped into some other imx_pinctrl_set_state_*() function, in a way similar to imx_pinctrl_set_state_mmio() does so for MMIO accesses.
Update all imx_pinctrl_set_state_mmio() call sites to call imx_pinctrl_set_state_mmio() instead.
No functional change.
---
Cc: Alice Guo <[email protected]>
Cc: Jesse Taube <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Peter Robinson <[email protected]>
Cc: Tim Harvey <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
--- drivers/pinctrl/nxp/pinctrl-imx.c | 56 ++++++++++++++++----------- drivers/pinctrl/nxp/pinctrl-imx.h | 4 +- drivers/pinctrl/nxp/pinctrl-imx5.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx6.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx7.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx7ulp.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8m.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx8ulp.c | 2 +- drivers/pinctrl/nxp/pinctrl-imx93.c | 2 +- drivers/pinctrl/nxp/pinctrl-imxrt.c | 2 +- drivers/pinctrl/nxp/pinctrl-vf610.c | 2 +- 12 files changed, 47 insertions(+), 33 deletions(-)
drivers/pinctrl/nxp/pinctrl-imx.c +34 -22
@@ -18,28 +18,15 @@DECLARE_GLOBAL_DATA_PTR ; -int imx_pinctrl_set_state (struct udevice *dev,struct udevice *config) +int imx_pinctrl_set_state_common (struct udevice *dev,struct udevice *config, +int pin_size,u32 **pin_data,int *npins) { -struct imx_pinctrl_priv *priv =dev_get_priv (dev); -struct imx_pinctrl_soc_info *info = priv->info;ofnode node =dev_ofnode (config);const struct fdt_property *prop; -u32 *pin_data; -int npins, size, pin_size; -int mux_reg, conf_reg, input_reg; -u32 input_val, mux_mode, config_val; -u32 mux_shift = info->mux_mask ?ffs (info->mux_mask) -1 :0 ; -int i, j =0 ; +int size;dev_dbg (dev,"%s: %s\n" , __func__, config->name); -if (info->flags &IMX8_USE_SCU ) - pin_size =SHARE_IMX8_PIN_SIZE ; -else if (info->flags &SHARE_MUX_CONF_REG ) - pin_size =SHARE_FSL_PIN_SIZE ; -else - pin_size =FSL_PIN_SIZE ; - prop =ofnode_get_property (node,"fsl,pins" , &size);if (!prop) {dev_err (dev,"No fsl,pins property in node %s\n" , config->name);
@@ -52,18 +39,43 @@ int imx_pinctrl_set_state(struct udevice *dev, struct udevice *config)return -EINVAL ; } - pin_data =devm_kzalloc (dev, size,0 ); -if (!pin_data) + *pin_data =devm_kzalloc (dev, size,0 ); +if (!*pin_data)return -ENOMEM ; -if (ofnode_read_u32_array (node,"fsl,pins" , - pin_data, size >>2 )) { +if (ofnode_read_u32_array (node,"fsl,pins" , *pin_data, size >>2 )) {dev_err (dev,"Error reading pin data.\n" ); -devm_kfree (dev, pin_data); +devm_kfree (dev, *pin_data);return -EINVAL ; } - npins = size / pin_size; + *npins = size / pin_size; + +return 0 ; +} + +int imx_pinctrl_set_state_mmio (struct udevice *dev,struct udevice *config) +{ +struct imx_pinctrl_priv *priv =dev_get_priv (dev); +struct imx_pinctrl_soc_info *info = priv->info; +u32 mux_shift = info->mux_mask ?ffs (info->mux_mask) -1 :0 ; +u32 input_val, mux_mode, config_val; +int mux_reg, conf_reg, input_reg; +int npins, pin_size; +int i, j =0 , ret; +u32 *pin_data; + +if (info->flags &IMX8_USE_SCU ) + pin_size =SHARE_IMX8_PIN_SIZE ; +else if (info->flags &SHARE_MUX_CONF_REG ) + pin_size =SHARE_FSL_PIN_SIZE ; +else + pin_size =FSL_PIN_SIZE ; + + ret =imx_pinctrl_set_state_common (dev, config, pin_size, + &pin_data, &npins); +if (ret) +return ret;if (info->flags &IMX8_USE_SCU ) {imx_pinctrl_scu_conf_pins (info, pin_data, npins);
drivers/pinctrl/nxp/pinctrl-imx.h +3 -1
@@ -53,7 +53,9 @@ int imx_pinctrl_probe_mmio(struct udevice *dev);int imx_pinctrl_remove_mmio (struct udevice *dev); -int imx_pinctrl_set_state (struct udevice *dev,struct udevice *config); +int imx_pinctrl_set_state_common (struct udevice *dev,struct udevice *config, +int pin_size,u32 **pin_data,int *npins); +int imx_pinctrl_set_state_mmio (struct udevice *dev,struct udevice *config);#ifdef CONFIG_PINCTRL_IMX_SCU int imx_pinctrl_scu_conf_pins(struct imx_pinctrl_soc_info *info,
drivers/pinctrl/nxp/pinctrl-imx5.c +1 -1
@@ -24,7 +24,7 @@ static const struct udevice_id imx5_pinctrl_match[] = { };static const struct pinctrl_ops imx5_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, + .set_state = imx_pinctrl_set_state_mmio, };U_BOOT_DRIVER (imx5_pinctrl) = {
drivers/pinctrl/nxp/pinctrl-imx6.c +1 -1
@@ -33,7 +33,7 @@ static const struct udevice_id imx6_pinctrl_match[] = { };static const struct pinctrl_ops imx6_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, + .set_state = imx_pinctrl_set_state_mmio, };U_BOOT_DRIVER (fsl_imx6q_iomuxc) = {
drivers/pinctrl/nxp/pinctrl-imx7.c +1 -1
@@ -21,7 +21,7 @@ static const struct udevice_id imx7_pinctrl_match[] = { };static const struct pinctrl_ops imx7_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, + .set_state = imx_pinctrl_set_state_mmio, };U_BOOT_DRIVER (imx7_pinctrl) = {
drivers/pinctrl/nxp/pinctrl-imx7ulp.c +1 -1
@@ -25,7 +25,7 @@ static const struct udevice_id imx7ulp_pinctrl_match[] = { };static const struct pinctrl_ops imx7ulp_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, + .set_state = imx_pinctrl_set_state_mmio, };U_BOOT_DRIVER (imx7ulp_pinctrl) = {
drivers/pinctrl/nxp/pinctrl-imx8.c +1 -1
@@ -22,7 +22,7 @@ static const struct udevice_id imx8_pinctrl_match[] = { };static const struct pinctrl_ops imx8_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, + .set_state = imx_pinctrl_set_state_mmio, };U_BOOT_DRIVER (imx8_pinctrl) = {
drivers/pinctrl/nxp/pinctrl-imx8m.c +1 -1
@@ -19,7 +19,7 @@ static const struct udevice_id imx8m_pinctrl_match[] = { };static const struct pinctrl_ops imx8m_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, + .set_state = imx_pinctrl_set_state_mmio, };U_BOOT_DRIVER (imx8mq_pinctrl) = {
drivers/pinctrl/nxp/pinctrl-imx8ulp.c +1 -1
@@ -24,7 +24,7 @@ static const struct udevice_id imx8ulp_pinctrl_match[] = { };static const struct pinctrl_ops imx8ulp_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, + .set_state = imx_pinctrl_set_state_mmio, };U_BOOT_DRIVER (imx8ulp_pinctrl) = {
drivers/pinctrl/nxp/pinctrl-imx93.c +1 -1
@@ -19,7 +19,7 @@ static const struct udevice_id imx93_pinctrl_match[] = { };static const struct pinctrl_ops imx93_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, + .set_state = imx_pinctrl_set_state_mmio, };U_BOOT_DRIVER (imx93_pinctrl) = {
drivers/pinctrl/nxp/pinctrl-imxrt.c +1 -1
@@ -20,7 +20,7 @@ static const struct udevice_id imxrt_pinctrl_match[] = { };static const struct pinctrl_ops imxrt_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, + .set_state = imx_pinctrl_set_state_mmio, };U_BOOT_DRIVER (imxrt_pinctrl) = {
drivers/pinctrl/nxp/pinctrl-vf610.c +1 -1
@@ -20,7 +20,7 @@ static const struct udevice_id vf610_pinctrl_match[] = { };static const struct pinctrl_ops vf610_pinctrl_ops = { - .set_state = imx_pinctrl_set_state, + .set_state = imx_pinctrl_set_state_mmio, };U_BOOT_DRIVER (vf610_pinctrl) = {
Signature · 1 line
2.45.2
PATCH 8/10 pinctrl: imx: Split imx_pinctrl_set_state_scu() from imx_pinctrl_set_state_mmio()
In reply to Marek VasutCall imx_pinctrl_set_state_common() from imx_pinctrl_scu_conf_pins(), rename imx_pinctrl_scu_conf_pins() to imx_pinctrl_set_state_scu(). Get rid of the unnecessary ifdeffery in pinctrl-imx.h in the process. Remove all SCU support from pinctrl-imx.c imx_pinctrl_set_state_mmio() which makes that function a pure MMIO pinctrl configuration accessor. Update pinctrl-imx8.c to call imx_pinctrl_set_state_scu directly.
No functional change.
This patch is best viewed with git show -w due to indent change.
---
Cc: Alice Guo <[email protected]>
Cc: Jesse Taube <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Peter Robinson <[email protected]>
Cc: Tim Harvey <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
--- drivers/pinctrl/nxp/pinctrl-imx.c | 212 ++++++++++++++--------------- drivers/pinctrl/nxp/pinctrl-imx.h | 12 +- drivers/pinctrl/nxp/pinctrl-imx8.c | 2 +- drivers/pinctrl/nxp/pinctrl-scu.c | 13 +- 4 files changed, 115 insertions(+), 124 deletions(-)
drivers/pinctrl/nxp/pinctrl-imx.c +102 -110
@@ -65,9 +65,7 @@ int imx_pinctrl_set_state_mmio(struct udevice *dev, struct udevice *config)int i, j =0 , ret;u32 *pin_data; -if (info->flags &IMX8_USE_SCU ) - pin_size =SHARE_IMX8_PIN_SIZE ; -else if (info->flags &SHARE_MUX_CONF_REG ) +if (info->flags &SHARE_MUX_CONF_REG ) pin_size =SHARE_FSL_PIN_SIZE ;else pin_size =FSL_PIN_SIZE ;
@@ -77,127 +75,121 @@ int imx_pinctrl_set_state_mmio(struct udevice *dev, struct udevice *config)if (ret)return ret; -if (info->flags &IMX8_USE_SCU ) { -imx_pinctrl_scu_conf_pins (info, pin_data, npins); - }else { -/* -* Refer to linux documentation for details: -* Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt -*/ -for (i =0 ; i < npins; i++) { - mux_reg = pin_data[j++]; - -if (!(info->flags &ZERO_OFFSET_VALID ) && !mux_reg) - mux_reg =-1 ; +/* +* Refer to linux documentation for details: +* Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt +*/ +for (i =0 ; i < npins; i++) { + mux_reg = pin_data[j++]; + +if (!(info->flags &ZERO_OFFSET_VALID ) && !mux_reg) + mux_reg =-1 ; + +if (info->flags &SHARE_MUX_CONF_REG ) { + conf_reg = mux_reg; + }else { + conf_reg = pin_data[j++]; +if (!(info->flags &ZERO_OFFSET_VALID ) && + !conf_reg) + conf_reg =-1 ; + } -if (info->flags &SHARE_MUX_CONF_REG ) { - conf_reg = mux_reg; - }else { - conf_reg = pin_data[j++]; -if (!(info->flags &ZERO_OFFSET_VALID ) && - !conf_reg) - conf_reg =-1 ; - } +if ((mux_reg ==-1 ) || (conf_reg ==-1 )) { +dev_err (dev,"Error mux_reg or conf_reg\n" ); +devm_kfree (dev, pin_data); +return -EINVAL ; + } -if ((mux_reg ==-1 ) || (conf_reg ==-1 )) { -dev_err (dev,"Error mux_reg or conf_reg\n" ); -devm_kfree (dev, pin_data); -return -EINVAL ; - } + input_reg = pin_data[j++]; + mux_mode = pin_data[j++]; + input_val = pin_data[j++]; + config_val = pin_data[j++]; - input_reg = pin_data[j++]; - mux_mode = pin_data[j++]; - input_val = pin_data[j++]; - config_val = pin_data[j++]; +dev_dbg (dev,"mux_reg 0x%x, conf_reg 0x%x, input_reg 0x%x, mux_mode 0x%x, input_val 0x%x, config_val 0x%x\n" , + mux_reg, conf_reg, input_reg, mux_mode, + input_val, config_val); -dev_dbg (dev,"mux_reg 0x%x, conf_reg 0x%x, " -"input_reg 0x%x, mux_mode 0x%x, " -"input_val 0x%x, config_val 0x%x\n" , - mux_reg, conf_reg, input_reg, mux_mode, - input_val, config_val); +if (config_val &IMX_PAD_SION ) + mux_mode |=IOMUXC_CONFIG_SION ; -if (config_val &IMX_PAD_SION ) - mux_mode |=IOMUXC_CONFIG_SION ; + config_val &= ~IMX_PAD_SION ; - config_val &= ~IMX_PAD_SION ; +/* Set Mux */ +if (info->flags &SHARE_MUX_CONF_REG ) { +clrsetbits_le32 (info->base + mux_reg, + info->mux_mask, + mux_mode << mux_shift); + }else { +writel (mux_mode, info->base + mux_reg); + } -/* Set Mux */ -if (info->flags &SHARE_MUX_CONF_REG ) { -clrsetbits_le32 (info->base + mux_reg, - info->mux_mask, - mux_mode << mux_shift); - }else { -writel (mux_mode, info->base + mux_reg); - } +dev_dbg (dev,"write mux: offset 0x%x val 0x%x\n" , + mux_reg, mux_mode); -dev_dbg (dev,"write mux: offset 0x%x val 0x%x\n" , - mux_reg, mux_mode); +/* +* Set select input +* +* If the select input value begins with 0xff, +* it's a quirky select input and the value should +* be interpreted as below. +* 31 23 15 7 0 +* | 0xff | shift | width | select | +* It's used to work around the problem that the +* select input for some pin is not implemented in +* the select input register but in some general +* purpose register. We encode the select input +* value, width and shift of the bit field into +* input_val cell of pin function ID in device tree, +* and then decode them here for setting up the select +* input bits in general purpose register. +*/ +if (input_val >>24 ==0xff ) { +u32 val = input_val; +u8 select = val &0xff ; +u8 width = (val >>8 ) &0xff ; +u8 shift = (val >>16 ) &0xff ; +u32 mask = ((1 << width) -1 ) << shift;/* -* Set select input -* -* If the select input value begins with 0xff, -* it's a quirky select input and the value should -* be interpreted as below. -* 31 23 15 7 0 -* | 0xff | shift | width | select | -* It's used to work around the problem that the -* select input for some pin is not implemented in -* the select input register but in some general -* purpose register. We encode the select input -* value, width and shift of the bit field into -* input_val cell of pin function ID in device tree, -* and then decode them here for setting up the select -* input bits in general purpose register. +* The input_reg[i] here is actually some +* IOMUXC general purpose register, not +* regular select input register. */ + val =readl (info->base + input_reg); + val &= ~mask; + val |= select << shift; +writel (val, info->base + input_reg); + }else if (input_reg) { +/* +* Regular select input register can never be +* at offset 0, and we only print register +* value for regular case. +*/ +if (info->input_sel_base) +writel (input_val, + info->input_sel_base + + input_reg); +else +writel (input_val, + info->base + input_reg); + +dev_dbg (dev,"select_input: offset 0x%x val 0x%x\n" , + input_reg, input_val); + } -if (input_val >>24 ==0xff ) { -u32 val = input_val; -u8 select = val &0xff ; -u8 width = (val >>8 ) &0xff ; -u8 shift = (val >>16 ) &0xff ; -u32 mask = ((1 << width) -1 ) << shift; -/* -* The input_reg[i] here is actually some -* IOMUXC general purpose register, not -* regular select input register. -*/ - val =readl (info->base + input_reg); - val &= ~mask; - val |= select << shift; -writel (val, info->base + input_reg); - }else if (input_reg) { -/* -* Regular select input register can never be -* at offset 0, and we only print register -* value for regular case. -*/ -if (info->input_sel_base) -writel (input_val, - info->input_sel_base + - input_reg); -else -writel (input_val, - info->base + input_reg); - -dev_dbg (dev,"select_input: offset 0x%x val " -"0x%x\n" , input_reg, input_val); +/* Set config */ +if (!(config_val &IMX_NO_PAD_CTL )) { +if (info->flags &SHARE_MUX_CONF_REG ) { +clrsetbits_le32 (info->base + conf_reg, + ~info->mux_mask, + config_val); + }else { +writel (config_val, + info->base + conf_reg); } -/* Set config */ -if (!(config_val &IMX_NO_PAD_CTL )) { -if (info->flags &SHARE_MUX_CONF_REG ) { -clrsetbits_le32 (info->base + conf_reg, - ~info->mux_mask, - config_val); - }else { -writel (config_val, - info->base + conf_reg); - } - -dev_dbg (dev,"write config: offset 0x%x val " -"0x%x\n" , conf_reg, config_val); - } +dev_dbg (dev,"write config: offset 0x%x val 0x%x\n" , + conf_reg, config_val); } }
drivers/pinctrl/nxp/pinctrl-imx.h +1 -11
@@ -56,16 +56,6 @@ int imx_pinctrl_remove_mmio(struct udevice *dev);int imx_pinctrl_set_state_common (struct udevice *dev,struct udevice *config,int pin_size,u32 **pin_data,int *npins);int imx_pinctrl_set_state_mmio (struct udevice *dev,struct udevice *config); - -#ifdef CONFIG_PINCTRL_IMX_SCU -int imx_pinctrl_scu_conf_pins (struct imx_pinctrl_soc_info *info, -u32 *pin_data,int npins); -#else -static inline int imx_pinctrl_scu_conf_pins (struct imx_pinctrl_soc_info *info, -u32 *pin_data,int npins) -{ -return 0 ; -} -#endif +int imx_pinctrl_set_state_scu (struct udevice *dev,struct udevice *config);#endif /* __DRIVERS_PINCTRL_IMX_H */
drivers/pinctrl/nxp/pinctrl-imx8.c +1 -1
@@ -22,7 +22,7 @@ static const struct udevice_id imx8_pinctrl_match[] = { };static const struct pinctrl_ops imx8_pinctrl_ops = { - .set_state = imx_pinctrl_set_state_mmio, + .set_state = imx_pinctrl_set_state_scu, };U_BOOT_DRIVER (imx8_pinctrl) = {
drivers/pinctrl/nxp/pinctrl-scu.c +11 -2
@@ -3,6 +3,7 @@* Copyright 2018-2019 NXP */ +#include <dm.h> #include <errno.h> #include <linux/bitops.h> #include <asm/io.h>
@@ -44,13 +45,21 @@ static int imx_pinconf_scu_set(struct imx_pinctrl_soc_info *info, u32 pad,return 0 ; } -int imx_pinctrl_scu_conf_pins (struct imx_pinctrl_soc_info *info,u32 *pin_data, -int npins) +int imx_pinctrl_set_state_scu (struct udevice *dev,struct udevice *config) { +struct imx_pinctrl_priv *priv =dev_get_priv (dev); +struct imx_pinctrl_soc_info *info = priv->info;int pin_id, mux, config_val; +u32 *pin_data;int i, j =0 ; +int npins;int ret; + ret =imx_pinctrl_set_state_common (dev, config,SHARE_IMX8_PIN_SIZE , + &pin_data, &npins); +if (ret) +return ret; +/* * Refer to linux documentation for details: * Documentation/devicetree/bindings/pinctrl/fsl,imx-pinctrl.txt
Signature · 1 line
2.45.2
PATCH 9/10 pinctrl: imx: Fold imx_pinctrl_set_state_scu() from pinctrl-imx8.c
In reply to Marek VasutThe only user of the SCU pinctrl code is pinctrl-imx8.c , fold the entire pinctrl-scu.c code into pinctrl-imx8.c and remove the matching Kconfig symbols and Makefile entries. No functional change.
---
Cc: Alice Guo <[email protected]>
Cc: Jesse Taube <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Peter Robinson <[email protected]>
Cc: Tim Harvey <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
--- drivers/pinctrl/nxp/Kconfig | 4 -- drivers/pinctrl/nxp/Makefile | 1 - drivers/pinctrl/nxp/pinctrl-imx.h | 1 - drivers/pinctrl/nxp/pinctrl-imx8.c | 71 +++++++++++++++++++++++++++ drivers/pinctrl/nxp/pinctrl-scu.c | 79 ------------------------------ 5 files changed, 71 insertions(+), 85 deletions(-) delete mode 100644 drivers/pinctrl/nxp/pinctrl-scu.c
drivers/pinctrl/nxp/Kconfig +0 -4
@@ -1,9 +1,6 @@ config PINCTRL_IMX bool -config PINCTRL_IMX_SCU - bool - config PINCTRL_IMX5 bool "IMX5 pinctrl driver" depends on ARCH_MX5 && PINCTRL_FULL
@@ -79,7 +76,6 @@ config PINCTRL_IMX8 depends on ARCH_IMX8 && PINCTRL_FULL select DEVRES select PINCTRL_IMX - select PINCTRL_IMX_SCU help Say Y here to enable the imx8 pinctrl driver
drivers/pinctrl/nxp/Makefile +0 -1
@@ -4,7 +4,6 @@ obj-$(CONFIG_PINCTRL_IMX6) += pinctrl-imx6.o obj-$(CONFIG_PINCTRL_IMX7) += pinctrl-imx7.o obj-$(CONFIG_PINCTRL_IMX7ULP) += pinctrl-imx7ulp.o obj-$(CONFIG_PINCTRL_IMX8ULP) += pinctrl-imx8ulp.o -obj-$(CONFIG_PINCTRL_IMX_SCU) += pinctrl-scu.o obj-$(CONFIG_PINCTRL_IMX8) += pinctrl-imx8.o obj-$(CONFIG_PINCTRL_IMX8M) += pinctrl-imx8m.o obj-$(CONFIG_PINCTRL_IMX93) += pinctrl-imx93.o
drivers/pinctrl/nxp/pinctrl-imx.h +0 -1
@@ -56,6 +56,5 @@ int imx_pinctrl_remove_mmio(struct udevice *dev);int imx_pinctrl_set_state_common (struct udevice *dev,struct udevice *config,int pin_size,u32 **pin_data,int *npins);int imx_pinctrl_set_state_mmio (struct udevice *dev,struct udevice *config); -int imx_pinctrl_set_state_scu (struct udevice *dev,struct udevice *config);#endif /* __DRIVERS_PINCTRL_IMX_H */
drivers/pinctrl/nxp/pinctrl-imx8.c +71 -0
83 lines not on this page · raw message
drivers/pinctrl/nxp/pinctrl-scu.c deleted +0 -79
79 lines not on this page · raw message
Signature · 1 line
2.45.2
PATCH 10/10 pinctrl: imx: Split MMIO accessors into pinctrl-imx-mmio.c
In reply to Marek VasutSplit MMIO accessors into pinctrl-imx-mmio.c and build this file only if Kconfig symbol PINCTRL_IMX_MMIO is selected. Select PINCTRL_IMX_MMIO Kconfig symbol for all but pinctrl-imx8.c driver, which does not use the MMIO accessors. This reduces the amount of code compiled on platforms which do not use the code.
No functional change.
---
Cc: Alice Guo <[email protected]>
Cc: Jesse Taube <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Peter Robinson <[email protected]>
Cc: Tim Harvey <[email protected]>
Cc: Tom Rini <[email protected]>
Cc: [email protected]
--- drivers/pinctrl/nxp/Kconfig | 22 ++- drivers/pinctrl/nxp/Makefile | 1 + drivers/pinctrl/nxp/pinctrl-imx-mmio.c | 228 +++++++++++++++++++++++++ drivers/pinctrl/nxp/pinctrl-imx.c | 208 ---------------------- 4 files changed, 242 insertions(+), 217 deletions(-) create mode 100644 drivers/pinctrl/nxp/pinctrl-imx-mmio.c
drivers/pinctrl/nxp/Kconfig +13 -9
@@ -1,11 +1,15 @@ config PINCTRL_IMX bool +config PINCTRL_IMX_MMIO + bool + select PINCTRL_IMX + config PINCTRL_IMX5 bool "IMX5 pinctrl driver" depends on ARCH_MX5 && PINCTRL_FULL select DEVRES - select PINCTRL_IMX + select PINCTRL_IMX_MMIO help Say Y here to enable the imx5 pinctrl driver
@@ -19,7 +23,7 @@ config PINCTRL_IMX6 bool "IMX6 pinctrl driver" depends on ARCH_MX6 && PINCTRL_FULL select DEVRES - select PINCTRL_IMX + select PINCTRL_IMX_MMIO help Say Y here to enable the imx6 pinctrl driver
@@ -33,7 +37,7 @@ config PINCTRL_IMX7 bool "IMX7 pinctrl driver" depends on ARCH_MX7 && PINCTRL_FULL select DEVRES - select PINCTRL_IMX + select PINCTRL_IMX_MMIO help Say Y here to enable the imx7 pinctrl driver
@@ -47,7 +51,7 @@ config PINCTRL_IMX7ULP bool "IMX7ULP pinctrl driver" depends on ARCH_MX7ULP && PINCTRL_FULL select DEVRES - select PINCTRL_IMX + select PINCTRL_IMX_MMIO help Say Y here to enable the imx7ulp pinctrl driver
@@ -61,7 +65,7 @@ config PINCTRL_IMX8ULP bool "IMX8ULP pinctrl driver" depends on ARCH_IMX8ULP && PINCTRL_FULL select DEVRES - select PINCTRL_IMX + select PINCTRL_IMX_MMIO help Say Y here to enable the imx8ulp pinctrl driver
@@ -88,7 +92,7 @@ config PINCTRL_IMX8 config PINCTRL_IMX8M bool "IMX8M pinctrl driver" depends on ARCH_IMX8M && PINCTRL_FULL - select PINCTRL_IMX + select PINCTRL_IMX_MMIO help Say Y here to enable the imx8m pinctrl driver
@@ -101,7 +105,7 @@ config PINCTRL_IMX8M config PINCTRL_IMX93 bool "IMX8M pinctrl driver" depends on ARCH_IMX9 && PINCTRL_FULL - select PINCTRL_IMX + select PINCTRL_IMX_MMIO help Say Y here to enable the imx8m pinctrl driver
@@ -125,7 +129,7 @@ config PINCTRL_IMXRT bool "IMXRT pinctrl driver" depends on ARCH_IMXRT && PINCTRL_FULL select DEVRES - select PINCTRL_IMX + select PINCTRL_IMX_MMIO help Say Y here to enable the imxrt pinctrl driver
@@ -139,7 +143,7 @@ config PINCTRL_VYBRID bool "Vybrid (vf610) pinctrl driver" depends on ARCH_VF610 && PINCTRL_FULL select DEVRES - select PINCTRL_IMX + select PINCTRL_IMX_MMIO help Say Y here to enable the Vybrid (vf610) pinctrl driver
drivers/pinctrl/nxp/Makefile +1 -0
@@ -1,4 +1,5 @@ obj-$(CONFIG_PINCTRL_IMX) += pinctrl-imx.o +obj-$(CONFIG_PINCTRL_IMX_MMIO) += pinctrl-imx-mmio.o obj-$(CONFIG_PINCTRL_IMX5) += pinctrl-imx5.o obj-$(CONFIG_PINCTRL_IMX6) += pinctrl-imx6.o obj-$(CONFIG_PINCTRL_IMX7) += pinctrl-imx7.o
drivers/pinctrl/nxp/pinctrl-imx-mmio.c new file +228 -0
228 lines not on this page · raw message
drivers/pinctrl/nxp/pinctrl-imx.c +0 -208
217 lines not on this page · raw message
Signature · 1 line
2.45.2
Fabio Estevam
maintainerTom,
Quoted 6 lines · Marek Vasut
Move
imx_pinctrl_opsinto drivers and staticize. This is preparatory patch for follow up pinctrl drivers which will not use this variant ofimx_pinctrl_opscontent. This should not change size, as most of the deployments compiled in one pinctrl driver anyway. No functional change.
The u-boot-imx/master-next fails with this series applied:
https://source.denx.de/u-boot/custodians/u-boot-imx/-/jobs/1005082
This is unrelated to this series, though.
Any ideas?
Quoted 10 lines · Fabio Estevam
Tom,
Quoted 6 lines · Marek Vasut
Move
imx_pinctrl_opsinto drivers and staticize. This is preparatory patch for follow up pinctrl drivers which will not use this variant ofimx_pinctrl_opscontent. This should not change size, as most of the deployments compiled in one pinctrl driver anyway. No functional change.
Quoted 7 lines
The u-boot-imx/master-next fails with this series applied:
https://source.denx.de/u-boot/custodians/u-boot-imx/-/jobs/1005082
This is unrelated to this series, though.
Any ideas?
Does it always fail , i.e. did you try to rerun the pipeline ?
Did you try to rebase on current u-boot/master , does it still fail ?
The link I sent to Alice also has an associated build run, which does pass, but admittedly that has one extra patch on top, which should have no impact:
https://source.denx.de/u-boot/custodians/u-boot-imx/-/jobs/1005082
Fabio Estevam
maintainerHi Marek,
Quoted 1 line · Marek Vasut
Does it always fail , i.e. did you try to rerun the pipeline ?
I had to retry a few times and then it eventually succeeded.
I will send a PR soon.
Thanks
Quoted 10 lines · Fabio Estevam
Tom,
Quoted 6 lines · Marek Vasut
Move
imx_pinctrl_opsinto drivers and staticize. This is preparatory patch for follow up pinctrl drivers which will not use this variant ofimx_pinctrl_opscontent. This should not change size, as most of the deployments compiled in one pinctrl driver anyway. No functional change.
Quoted 7 lines
The u-boot-imx/master-next fails with this series applied:
https://source.denx.de/u-boot/custodians/u-boot-imx/-/jobs/1005082
This is unrelated to this series, though.
Any ideas?
Yeah, sorry, hit retry a few times. I'd like to not have to disable that specific test, but I don't have any better ideas.
Signature · 1 line
Tom
Quoted 8 lines · Marek Vasut
Move
imx_pinctrl_opsinto drivers and staticize. This is preparatory patch for follow up pinctrl drivers which will not use this variant ofimx_pinctrl_opscontent. This should not change size, as most of the deployments compiled in one pinctrl driver anyway. No functional change.Signed-off-by Marek Vasut <[email protected]>
Applied the series, thanks.