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>
This commit is contained in:
Родитель
5a6ae9b801
Коммит
ef088187e1
|
@ -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,
|
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_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);
|
||||||
struct mvebu_mpp_ctrl_data *mpp_data;
|
struct mvebu_mpp_ctrl_data *mpp_data;
|
||||||
struct regmap *regmap;
|
struct regmap *regmap;
|
||||||
u32 offset;
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
regmap = syscon_node_to_regmap(syscon_dev->of_node);
|
regmap = syscon_node_to_regmap(syscon_dev->of_node);
|
||||||
if (IS_ERR(regmap))
|
if (IS_ERR(regmap))
|
||||||
return PTR_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),
|
mpp_data = devm_kcalloc(&pdev->dev, soc->ncontrols, sizeof(*mpp_data),
|
||||||
GFP_KERNEL);
|
GFP_KERNEL);
|
||||||
if (!mpp_data)
|
if (!mpp_data)
|
||||||
|
|
|
@ -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_probe(struct platform_device *pdev);
|
||||||
int mvebu_pinctrl_simple_mmio_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,
|
int mvebu_pinctrl_simple_regmap_probe(struct platform_device *pdev,
|
||||||
struct device *syscon_dev);
|
struct device *syscon_dev, u32 offset);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче