From: Marek Vasut Date: Fri, 24 Jan 2025 14:50:53 +0000 (+0100) Subject: pinctrl: imx: Inline struct imx_pinctrl_soc_info access into probe X-Git-Tag: v2025.04-rc1~2^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=def8012d5b8b02a5936c0fbb315326fd9c8bc3e4;p=pandora-u-boot.git pinctrl: imx: Inline struct imx_pinctrl_soc_info access into probe The 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. Signed-off-by: Marek Vasut --- diff --git a/drivers/pinctrl/nxp/pinctrl-imx.c b/drivers/pinctrl/nxp/pinctrl-imx.c index 3443cf459db..2d142c3a8a9 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx.c +++ b/drivers/pinctrl/nxp/pinctrl-imx.c @@ -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); diff --git a/drivers/pinctrl/nxp/pinctrl-imx.h b/drivers/pinctrl/nxp/pinctrl-imx.h index 02f05fdf20e..b25f7988f46 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx.h +++ b/drivers/pinctrl/nxp/pinctrl-imx.h @@ -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); diff --git a/drivers/pinctrl/nxp/pinctrl-imx5.c b/drivers/pinctrl/nxp/pinctrl-imx5.c index 56f0e174888..544c5093336 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx5.c +++ b/drivers/pinctrl/nxp/pinctrl-imx5.c @@ -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, diff --git a/drivers/pinctrl/nxp/pinctrl-imx6.c b/drivers/pinctrl/nxp/pinctrl-imx6.c index 23b5566d358..ae16ce73755 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx6.c +++ b/drivers/pinctrl/nxp/pinctrl-imx6.c @@ -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, diff --git a/drivers/pinctrl/nxp/pinctrl-imx7.c b/drivers/pinctrl/nxp/pinctrl-imx7.c index faccd2ef8aa..87a35835566 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx7.c +++ b/drivers/pinctrl/nxp/pinctrl-imx7.c @@ -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, diff --git a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c index 3288926ad9e..1f4fce455d6 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx7ulp.c +++ b/drivers/pinctrl/nxp/pinctrl-imx7ulp.c @@ -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, diff --git a/drivers/pinctrl/nxp/pinctrl-imx8.c b/drivers/pinctrl/nxp/pinctrl-imx8.c index 85e5e5f5237..40976a9b588 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8.c @@ -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, diff --git a/drivers/pinctrl/nxp/pinctrl-imx8m.c b/drivers/pinctrl/nxp/pinctrl-imx8m.c index 661e08cd1b7..b1dabaaae7a 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8m.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8m.c @@ -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, diff --git a/drivers/pinctrl/nxp/pinctrl-imx8ulp.c b/drivers/pinctrl/nxp/pinctrl-imx8ulp.c index 40901f31752..e482ad5536d 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8ulp.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8ulp.c @@ -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, diff --git a/drivers/pinctrl/nxp/pinctrl-imx93.c b/drivers/pinctrl/nxp/pinctrl-imx93.c index 4db224d32a4..d5736e21067 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx93.c +++ b/drivers/pinctrl/nxp/pinctrl-imx93.c @@ -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, diff --git a/drivers/pinctrl/nxp/pinctrl-imxrt.c b/drivers/pinctrl/nxp/pinctrl-imxrt.c index 4383015fb33..db523a9005a 100644 --- a/drivers/pinctrl/nxp/pinctrl-imxrt.c +++ b/drivers/pinctrl/nxp/pinctrl-imxrt.c @@ -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, diff --git a/drivers/pinctrl/nxp/pinctrl-vf610.c b/drivers/pinctrl/nxp/pinctrl-vf610.c index 0e17b8c9ff9..e56df6dde56 100644 --- a/drivers/pinctrl/nxp/pinctrl-vf610.c +++ b/drivers/pinctrl/nxp/pinctrl-vf610.c @@ -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,