pinctrl: mvebu: remove the offset property for regmap

The offset property of the pinctrl node, when a regmap is used in the
device tree, was never used nor documented in the binding. Moreover, the
compatible string is enough to let the driver know which offset using.

So this patch removes the property and move the information at the driver
level.

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
index e4dda12d371a473faa1c6aa48bfcc01280ec0b18..163d4614b0f80233957d23a13949fe32330bb6be 100644 (file)
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.c
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.c
@@ -810,21 +810,17 @@ int mvebu_regmap_mpp_ctrl_set(struct mvebu_mpp_ctrl_data *data,
 }
 
 int mvebu_pinctrl_simple_regmap_probe(struct platform_device *pdev,
-                                     struct device *syscon_dev)
+                                     struct device *syscon_dev, u32 offset)
 {
        struct mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);
        struct mvebu_mpp_ctrl_data *mpp_data;
        struct regmap *regmap;
-       u32 offset;
        int i;
 
        regmap = syscon_node_to_regmap(syscon_dev->of_node);
        if (IS_ERR(regmap))
                return PTR_ERR(regmap);
 
-       if (of_property_read_u32(pdev->dev.of_node, "offset", &offset))
-               return -EINVAL;
-
        mpp_data = devm_kcalloc(&pdev->dev, soc->ncontrols, sizeof(*mpp_data),
                                GFP_KERNEL);
        if (!mpp_data)

diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.h b/drivers/pinctrl/mvebu/pinctrl-mvebu.h
index c90704e74884c525fffd21fd921f768bb5455dd2..75bba436bf5903deb72235f12a8f8f36030f3ce3 100644 (file)
--- a/drivers/pinctrl/mvebu/pinctrl-mvebu.h
+++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.h
@@ -210,6 +210,6 @@ int mvebu_regmap_mpp_ctrl_set(struct mvebu_mpp_ctrl_data *data, unsigned pid,
 int mvebu_pinctrl_probe(struct platform_device *pdev);
 int mvebu_pinctrl_simple_mmio_probe(struct platform_device *pdev);
 int mvebu_pinctrl_simple_regmap_probe(struct platform_device *pdev,
-                                     struct device *syscon_dev);
+                                     struct device *syscon_dev, u32 offset);
 
 #endif