Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef088187 authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by Linus Walleij
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5a6ae9b8

drivers/pinctrl/mvebu/pinctrl-mvebu.c

+1 −5
Original line number Diff line number Diff line
@@ -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)

drivers/pinctrl/mvebu/pinctrl-mvebu.h

+1 −1
Original line number Diff line number Diff line
@@ -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