|
@@ -292,20 +292,14 @@ static struct pinctrl_desc berlin_pctrl_desc = {
|
|
|
.owner = THIS_MODULE,
|
|
|
};
|
|
|
|
|
|
-int berlin_pinctrl_probe(struct platform_device *pdev,
|
|
|
- const struct berlin_pinctrl_desc *desc)
|
|
|
+int berlin_pinctrl_probe_regmap(struct platform_device *pdev,
|
|
|
+ const struct berlin_pinctrl_desc *desc,
|
|
|
+ struct regmap *regmap)
|
|
|
{
|
|
|
struct device *dev = &pdev->dev;
|
|
|
- struct device_node *parent_np = of_get_parent(dev->of_node);
|
|
|
struct berlin_pinctrl *pctrl;
|
|
|
- struct regmap *regmap;
|
|
|
int ret;
|
|
|
|
|
|
- regmap = syscon_node_to_regmap(parent_np);
|
|
|
- of_node_put(parent_np);
|
|
|
- if (IS_ERR(regmap))
|
|
|
- return PTR_ERR(regmap);
|
|
|
-
|
|
|
pctrl = devm_kzalloc(dev, sizeof(*pctrl), GFP_KERNEL);
|
|
|
if (!pctrl)
|
|
|
return -ENOMEM;
|
|
@@ -330,3 +324,17 @@ int berlin_pinctrl_probe(struct platform_device *pdev,
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
+
|
|
|
+int berlin_pinctrl_probe(struct platform_device *pdev,
|
|
|
+ const struct berlin_pinctrl_desc *desc)
|
|
|
+{
|
|
|
+ struct device *dev = &pdev->dev;
|
|
|
+ struct device_node *parent_np = of_get_parent(dev->of_node);
|
|
|
+ struct regmap *regmap = syscon_node_to_regmap(parent_np);
|
|
|
+
|
|
|
+ of_node_put(parent_np);
|
|
|
+ if (IS_ERR(regmap))
|
|
|
+ return PTR_ERR(regmap);
|
|
|
+
|
|
|
+ return berlin_pinctrl_probe_regmap(pdev, desc, regmap);
|
|
|
+}
|