pinctrl: sophgo: introduce generic probe function

Since different series of the Sophgo chip share a common pinctrl data
structure. It is necessary to add a common probe function to alloc
the this data structure. Add pctrl_init callback to allow soc to perform
its own initialization.

Signed-off-by: Inochi Amaoto <inochiama@gmail.com>
Link: https://lore.kernel.org/20250211051801.470800-5-inochiama@gmail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/sophgo/pinctrl-cv1800b.c b/drivers/pinctrl/sophgo/pinctrl-cv1800b.c
index ca6fb374ee1598bdac005c2033e7a2f62a1b8079..82db602124777c80f106639daf95e1d30f2eed5a 100644 (file)
--- a/drivers/pinctrl/sophgo/pinctrl-cv1800b.c
+++ b/drivers/pinctrl/sophgo/pinctrl-cv1800b.c
@@ -443,6 +443,9 @@ static const struct sophgo_pinctrl_data cv1800b_pindata = {
        .pdnames        = cv1800b_power_domain_desc,
        .vddio_ops      = &cv1800b_vddio_cfg_ops,
        .cfg_ops        = &cv1800_cfg_ops,
+       .pctl_ops       = &cv1800_pctrl_ops,
+       .pmx_ops        = &cv1800_pmx_ops,
+       .pconf_ops      = &cv1800_pconf_ops,
        .npins          = ARRAY_SIZE(cv1800b_pins),
        .npds           = ARRAY_SIZE(cv1800b_power_domain_desc),
        .pinsize        = sizeof(struct cv1800_pin),
@@ -455,7 +458,7 @@ static const struct of_device_id cv1800b_pinctrl_ids[] = {
 MODULE_DEVICE_TABLE(of, cv1800b_pinctrl_ids);
 
 static struct platform_driver cv1800b_pinctrl_driver = {
-       .probe  = cv1800_pinctrl_probe,
+       .probe  = sophgo_pinctrl_probe,
        .driver = {
                .name                   = "cv1800b-pinctrl",
                .suppress_bind_attrs    = true,

diff --git a/drivers/pinctrl/sophgo/pinctrl-cv1812h.c b/drivers/pinctrl/sophgo/pinctrl-cv1812h.c
index df2c2697a1fd6ebb616c9dfdb856d3efffdbb346..881a4d7ef5890090a8904e6d94cef07c9b1f2fa9 100644 (file)
--- a/drivers/pinctrl/sophgo/pinctrl-cv1812h.c
+++ b/drivers/pinctrl/sophgo/pinctrl-cv1812h.c
@@ -752,6 +752,9 @@ static const struct sophgo_pinctrl_data cv1812h_pindata = {
        .pdnames        = cv1812h_power_domain_desc,
        .vddio_ops      = &cv1812h_vddio_cfg_ops,
        .cfg_ops        = &cv1800_cfg_ops,
+       .pctl_ops       = &cv1800_pctrl_ops,
+       .pmx_ops        = &cv1800_pmx_ops,
+       .pconf_ops      = &cv1800_pconf_ops,
        .npins          = ARRAY_SIZE(cv1812h_pins),
        .npds           = ARRAY_SIZE(cv1812h_power_domain_desc),
        .pinsize        = sizeof(struct cv1800_pin),
@@ -764,7 +767,7 @@ static const struct of_device_id cv1812h_pinctrl_ids[] = {
 MODULE_DEVICE_TABLE(of, cv1812h_pinctrl_ids);
 
 static struct platform_driver cv1812h_pinctrl_driver = {
-       .probe  = cv1800_pinctrl_probe,
+       .probe  = sophgo_pinctrl_probe,
        .driver = {
                .name                   = "cv1812h-pinctrl",
                .suppress_bind_attrs    = true,

diff --git a/drivers/pinctrl/sophgo/pinctrl-cv18xx.c b/drivers/pinctrl/sophgo/pinctrl-cv18xx.c
index 66111110c4b3f1fa6e4f85ca641d156b759c63a4..c3a2dcf71f2a694370c0ab608cfcf4dc67c455f5 100644 (file)
--- a/drivers/pinctrl/sophgo/pinctrl-cv18xx.c
+++ b/drivers/pinctrl/sophgo/pinctrl-cv18xx.c
@@ -15,8 +15,6 @@
 #include <linux/seq_file.h>
 #include <linux/spinlock.h>
 
-#include <linux/pinctrl/consumer.h>
-#include <linux/pinctrl/machine.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinctrl.h>
@@ -25,7 +23,6 @@
 #include <dt-bindings/pinctrl/pinctrl-cv18xx.h>
 
 #include "../pinctrl-utils.h"
-#include "../pinconf.h"
 #include "../pinmux.h"
 #include "pinctrl-cv18xx.h"
 
@@ -195,7 +192,7 @@ static int cv1800_dt_node_to_map_post(struct device_node *cur,
        return cv1800_set_power_cfg(pctrl, pin->power_domain, power);
 }
 
-static const struct pinctrl_ops cv1800_pctrl_ops = {
+const struct pinctrl_ops cv1800_pctrl_ops = {
        .get_groups_count       = pinctrl_generic_get_group_count,
        .get_group_name         = pinctrl_generic_get_group_name,
        .get_group_pins         = pinctrl_generic_get_group_pins,
@@ -203,6 +200,7 @@ static const struct pinctrl_ops cv1800_pctrl_ops = {
        .dt_node_to_map         = sophgo_pctrl_dt_node_to_map,
        .dt_free_map            = pinctrl_utils_free_map,
 };
+EXPORT_SYMBOL_GPL(cv1800_pctrl_ops);
 
 static void cv1800_set_pinmux_config(struct sophgo_pinctrl *pctrl,
                                     const struct sophgo_pin *sp, u32 config)
@@ -224,13 +222,14 @@ static void cv1800_set_pinmux_config(struct sophgo_pinctrl *pctrl,
                writel_relaxed(mux2, reg_mux2);
 }
 
-static const struct pinmux_ops cv1800_pmx_ops = {
+const struct pinmux_ops cv1800_pmx_ops = {
        .get_functions_count    = pinmux_generic_get_function_count,
        .get_function_name      = pinmux_generic_get_function_name,
        .get_function_groups    = pinmux_generic_get_function_groups,
        .set_mux                = sophgo_pmx_set_mux,
        .strict                 = true,
 };
+EXPORT_SYMBOL_GPL(cv1800_pmx_ops);
 
 #define PIN_IO_PULLUP          BIT(2)
 #define PIN_IO_PULLDOWN                BIT(3)
@@ -404,37 +403,25 @@ static int cv1800_set_pinconf_config(struct sophgo_pinctrl *pctrl,
        return 0;
 }
 
-static const struct pinconf_ops cv1800_pconf_ops = {
+const struct pinconf_ops cv1800_pconf_ops = {
        .pin_config_get                 = cv1800_pconf_get,
        .pin_config_set                 = sophgo_pconf_set,
        .pin_config_group_set           = sophgo_pconf_group_set,
        .is_generic                     = true,
 };
+EXPORT_SYMBOL_GPL(cv1800_pconf_ops);
 
-int cv1800_pinctrl_probe(struct platform_device *pdev)
+static int cv1800_pinctrl_init(struct platform_device *pdev,
+                              struct sophgo_pinctrl *pctrl)
 {
-       struct device *dev = &pdev->dev;
-       struct sophgo_pinctrl *pctrl;
+       const struct sophgo_pinctrl_data *pctrl_data = pctrl->data;
        struct cv1800_priv *priv;
-       const struct sophgo_pinctrl_data *pctrl_data;
-       int ret;
-
-       pctrl_data = device_get_match_data(dev);
-       if (!pctrl_data)
-               return -ENODEV;
-
-       if (pctrl_data->npins == 0 || pctrl_data->npds == 0)
-               return dev_err_probe(dev, -EINVAL, "invalid pin data\n");
-
-       pctrl = devm_kzalloc(dev, sizeof(*pctrl), GFP_KERNEL);
-       if (!pctrl)
-               return -ENOMEM;
 
-       priv = devm_kzalloc(dev, sizeof(struct cv1800_priv), GFP_KERNEL);
+       priv = devm_kzalloc(&pdev->dev, sizeof(struct cv1800_priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
 
-       priv->power_cfg = devm_kcalloc(dev, pctrl_data->npds,
+       priv->power_cfg = devm_kcalloc(&pdev->dev, pctrl_data->npds,
                                       sizeof(u32), GFP_KERNEL);
        if (!priv->power_cfg)
                return -ENOMEM;
@@ -447,33 +434,13 @@ int cv1800_pinctrl_probe(struct platform_device *pdev)
        if (IS_ERR(priv->regs[1]))
                return PTR_ERR(priv->regs[1]);
 
-       pctrl->pdesc.name = dev_name(dev);
-       pctrl->pdesc.pins = pctrl_data->pins;
-       pctrl->pdesc.npins = pctrl_data->npins;
-       pctrl->pdesc.pctlops = &cv1800_pctrl_ops;
-       pctrl->pdesc.pmxops = &cv1800_pmx_ops;
-       pctrl->pdesc.confops = &cv1800_pconf_ops;
-       pctrl->pdesc.owner = THIS_MODULE;
-
-       pctrl->data = pctrl_data;
        pctrl->priv_ctrl = priv;
-       pctrl->dev = dev;
-       raw_spin_lock_init(&pctrl->lock);
-       mutex_init(&pctrl->mutex);
-
-       platform_set_drvdata(pdev, pctrl);
 
-       ret = devm_pinctrl_register_and_init(dev, &pctrl->pdesc,
-                                            pctrl, &pctrl->pctrl_dev);
-       if (ret)
-               return dev_err_probe(dev, ret,
-                                    "fail to register pinctrl driver\n");
-
-       return pinctrl_enable(pctrl->pctrl_dev);
+       return 0;
 }
-EXPORT_SYMBOL_GPL(cv1800_pinctrl_probe);
 
 const struct sophgo_cfg_ops cv1800_cfg_ops = {
+       .pctrl_init = cv1800_pinctrl_init,
        .verify_pinmux_config = cv1800_verify_pinmux_config,
        .verify_pin_group = cv1800_verify_pin_group,
        .dt_node_to_map_post = cv1800_dt_node_to_map_post,

diff --git a/drivers/pinctrl/sophgo/pinctrl-cv18xx.h b/drivers/pinctrl/sophgo/pinctrl-cv18xx.h
index 821e554e550ba7aa2c55b8e77cf4492c1845f43d..759c0e604acf411c6a1b07d4c49de2c8b33682f5 100644 (file)
--- a/drivers/pinctrl/sophgo/pinctrl-cv18xx.h
+++ b/drivers/pinctrl/sophgo/pinctrl-cv18xx.h
@@ -68,10 +68,11 @@ static inline enum cv1800_pin_io_type cv1800_pin_io_type(const struct cv1800_pin
        return FIELD_GET(CV1800_PIN_IO_TYPE, pin->pin.flags);
 };
 
+extern const struct pinctrl_ops cv1800_pctrl_ops;
+extern const struct pinmux_ops cv1800_pmx_ops;
+extern const struct pinconf_ops cv1800_pconf_ops;
 extern const struct sophgo_cfg_ops cv1800_cfg_ops;
 
-int cv1800_pinctrl_probe(struct platform_device *pdev);
-
 #define CV1800_FUNC_PIN(_id, _power_domain, _type,                     \
                        _mux_area, _mux_offset, _mux_func_max)          \
        {                                                               \

diff --git a/drivers/pinctrl/sophgo/pinctrl-sg2000.c b/drivers/pinctrl/sophgo/pinctrl-sg2000.c
index 9580bd285699a1c7169165423721248b1b757035..0e303d2fa10404922f68b2a62c51c77b95eddbcd 100644 (file)
--- a/drivers/pinctrl/sophgo/pinctrl-sg2000.c
+++ b/drivers/pinctrl/sophgo/pinctrl-sg2000.c
@@ -752,6 +752,9 @@ static const struct sophgo_pinctrl_data sg2000_pindata = {
        .pdnames        = sg2000_power_domain_desc,
        .vddio_ops      = &sg2000_vddio_cfg_ops,
        .cfg_ops        = &cv1800_cfg_ops,
+       .pctl_ops       = &cv1800_pctrl_ops,
+       .pmx_ops        = &cv1800_pmx_ops,
+       .pconf_ops      = &cv1800_pconf_ops,
        .npins          = ARRAY_SIZE(sg2000_pins),
        .npds           = ARRAY_SIZE(sg2000_power_domain_desc),
        .pinsize        = sizeof(struct cv1800_pin),
@@ -764,7 +767,7 @@ static const struct of_device_id sg2000_pinctrl_ids[] = {
 MODULE_DEVICE_TABLE(of, sg2000_pinctrl_ids);
 
 static struct platform_driver sg2000_pinctrl_driver = {
-       .probe  = cv1800_pinctrl_probe,
+       .probe  = sophgo_pinctrl_probe,
        .driver = {
                .name                   = "sg2000-pinctrl",
                .suppress_bind_attrs    = true,

diff --git a/drivers/pinctrl/sophgo/pinctrl-sg2002.c b/drivers/pinctrl/sophgo/pinctrl-sg2002.c
index e3041a8b8ba6b4cb11af18883ab6d70ff9892e59..2443fff1bc00d78ebc9b3596272af6611099b12e 100644 (file)
--- a/drivers/pinctrl/sophgo/pinctrl-sg2002.c
+++ b/drivers/pinctrl/sophgo/pinctrl-sg2002.c
@@ -523,6 +523,9 @@ static const struct sophgo_pinctrl_data sg2002_pindata = {
        .pdnames        = sg2002_power_domain_desc,
        .vddio_ops      = &sg2002_vddio_cfg_ops,
        .cfg_ops        = &cv1800_cfg_ops,
+       .pctl_ops       = &cv1800_pctrl_ops,
+       .pmx_ops        = &cv1800_pmx_ops,
+       .pconf_ops      = &cv1800_pconf_ops,
        .npins          = ARRAY_SIZE(sg2002_pins),
        .npds           = ARRAY_SIZE(sg2002_power_domain_desc),
        .pinsize        = sizeof(struct cv1800_pin),
@@ -535,7 +538,7 @@ static const struct of_device_id sg2002_pinctrl_ids[] = {
 MODULE_DEVICE_TABLE(of, sg2002_pinctrl_ids);
 
 static struct platform_driver sg2002_pinctrl_driver = {
-       .probe  = cv1800_pinctrl_probe,
+       .probe  = sophgo_pinctrl_probe,
        .driver = {
                .name                   = "sg2002-pinctrl",
                .suppress_bind_attrs    = true,

diff --git a/drivers/pinctrl/sophgo/pinctrl-sophgo-common.c b/drivers/pinctrl/sophgo/pinctrl-sophgo-common.c
index 957d84e75643e42b4c2db18674cd9397cc94d0a7..7f1fd68db19e0998e1bc78f75f7980912bb31b70 100644 (file)
--- a/drivers/pinctrl/sophgo/pinctrl-sophgo-common.c
+++ b/drivers/pinctrl/sophgo/pinctrl-sophgo-common.c
@@ -400,5 +400,52 @@ int sophgo_pinctrl_reg2schmitt(struct sophgo_pinctrl *pctrl,
        return map[reg];
 }
 
+int sophgo_pinctrl_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct sophgo_pinctrl *pctrl;
+       const struct sophgo_pinctrl_data *pctrl_data;
+       int ret;
+
+       pctrl_data = device_get_match_data(dev);
+       if (!pctrl_data)
+               return -ENODEV;
+
+       if (pctrl_data->npins == 0)
+               return dev_err_probe(dev, -EINVAL, "invalid pin data\n");
+
+       pctrl = devm_kzalloc(dev, sizeof(*pctrl), GFP_KERNEL);
+       if (!pctrl)
+               return -ENOMEM;
+
+       pctrl->pdesc.name = dev_name(dev);
+       pctrl->pdesc.pins = pctrl_data->pins;
+       pctrl->pdesc.npins = pctrl_data->npins;
+       pctrl->pdesc.pctlops = pctrl_data->pctl_ops;
+       pctrl->pdesc.pmxops = pctrl_data->pmx_ops;
+       pctrl->pdesc.confops = pctrl_data->pconf_ops;
+       pctrl->pdesc.owner = THIS_MODULE;
+
+       pctrl->data = pctrl_data;
+       pctrl->dev = dev;
+       raw_spin_lock_init(&pctrl->lock);
+       mutex_init(&pctrl->mutex);
+
+       ret = pctrl->data->cfg_ops->pctrl_init(pdev, pctrl);
+       if (ret)
+               return ret;
+
+       platform_set_drvdata(pdev, pctrl);
+
+       ret = devm_pinctrl_register_and_init(dev, &pctrl->pdesc,
+                                            pctrl, &pctrl->pctrl_dev);
+       if (ret)
+               return dev_err_probe(dev, ret,
+                                    "fail to register pinctrl driver\n");
+
+       return pinctrl_enable(pctrl->pctrl_dev);
+}
+EXPORT_SYMBOL_GPL(sophgo_pinctrl_probe);
+
 MODULE_DESCRIPTION("Common pinctrl helper function for the Sophgo SoC");
 MODULE_LICENSE("GPL");

diff --git a/drivers/pinctrl/sophgo/pinctrl-sophgo.h b/drivers/pinctrl/sophgo/pinctrl-sophgo.h
index f8b094a09f7c03b133489874ca75adacd632b257..4cd9b5484894a4917bc01cfa0825534a5a0f62dc 100644 (file)
--- a/drivers/pinctrl/sophgo/pinctrl-sophgo.h
+++ b/drivers/pinctrl/sophgo/pinctrl-sophgo.h
@@ -29,6 +29,7 @@ struct sophgo_pin_mux_config {
 /**
  * struct sophgo_cfg_ops - pin configuration operations
  *
+ * @pctrl_init: soc specific init callback
  * @verify_pinmux_config: verify the pinmux config for a pin
  * @verify_pin_group: verify the whole pinmux group
  * @dt_node_to_map_post: post init for the pinmux config map
@@ -37,6 +38,8 @@ struct sophgo_pin_mux_config {
  * @set_pinmux_config: set mux config (the caller holds lock)
  */
 struct sophgo_cfg_ops {
+       int (*pctrl_init)(struct platform_device *pdev,
+                         struct sophgo_pinctrl *pctrl);
        int (*verify_pinmux_config)(const struct sophgo_pin_mux_config *config);
        int (*verify_pin_group)(const struct sophgo_pin_mux_config *pinmuxs,
                                unsigned int npins);
@@ -81,6 +84,9 @@ struct sophgo_pinctrl_data {
        const char                              * const *pdnames;
        const struct sophgo_vddio_cfg_ops       *vddio_ops;
        const struct sophgo_cfg_ops             *cfg_ops;
+       const struct pinctrl_ops                *pctl_ops;
+       const struct pinmux_ops                 *pmx_ops;
+       const struct pinconf_ops                *pconf_ops;
        u16                                     npins;
        u16                                     npds;
        u16                                     pinsize;
@@ -125,5 +131,6 @@ int sophgo_pinctrl_schmitt2reg(struct sophgo_pinctrl *pctrl,
 int sophgo_pinctrl_reg2schmitt(struct sophgo_pinctrl *pctrl,
                               const struct sophgo_pin *pin,
                               const u32 *power_cfg, u32 reg);
+int sophgo_pinctrl_probe(struct platform_device *pdev);
 
 #endif /* _PINCTRL_SOPHGO_H */