|
@@ -593,7 +593,7 @@ static int mvebu_pinctrl_build_functions(struct platform_device *pdev,
|
|
|
int mvebu_pinctrl_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);
|
|
|
- struct device_node *np = pdev->dev.of_node;
|
|
|
+ struct resource *res;
|
|
|
struct mvebu_pinctrl *pctl;
|
|
|
void __iomem *base;
|
|
|
struct pinctrl_pin_desc *pdesc;
|
|
@@ -605,11 +605,10 @@ int mvebu_pinctrl_probe(struct platform_device *pdev)
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
- base = of_iomap(np, 0);
|
|
|
- if (!base) {
|
|
|
- dev_err(&pdev->dev, "unable to get base address\n");
|
|
|
- return -ENODEV;
|
|
|
- }
|
|
|
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
+ base = devm_ioremap_resource(&pdev->dev, res);
|
|
|
+ if (IS_ERR(base))
|
|
|
+ return PTR_ERR(base);
|
|
|
|
|
|
pctl = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_pinctrl),
|
|
|
GFP_KERNEL);
|