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

Commit 76b1f723 authored by Fabio Estevam's avatar Fabio Estevam Committed by Wolfram Sang
Browse files

i2c: imx: Let device core handle pinctrl 



Since commit ab78029e (drivers/pinctrl: grab default handles from device core),
we can rely on device core for handling pinctrl.

So remove devm_pinctrl_get_select_default() from the driver.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 4243fa0b

drivers/i2c/busses/i2c-imx.c

+0 −8
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_i2c.h>

#include <linux/pinctrl/consumer.h>

#include <linux/platform_data/i2c-imx.h>



/** Defines ********************************************************************
@@ -493,7 +492,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev) 
	struct imx_i2c_struct *i2c_imx;

	struct resource *res;

	struct imxi2c_platform_data *pdata = pdev->dev.platform_data;

	struct pinctrl *pinctrl;

	void __iomem *base;

	int irq, ret;

	u32 bitrate;
@@ -535,12 +533,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev) 
	i2c_imx->adapter.dev.of_node	= pdev->dev.of_node;

	i2c_imx->base			= base;



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl)) {

		dev_err(&pdev->dev, "can't get/select pinctrl\n");

		return PTR_ERR(pinctrl);

	}



	/* Get I2C clock */

	i2c_imx->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(i2c_imx->clk)) {