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

Commit d98d033c authored by Shawn Guo's avatar Shawn Guo
Browse files

i2c: mxs: adopt pinctrl support 



Cc: linux-i2c@vger.kernel.org
Cc: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 39febc01

drivers/i2c/busses/i2c-mxs.c

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

#include <linux/jiffies.h>

#include <linux/io.h>

#include <linux/pinctrl/consumer.h>



#include <mach/common.h>
@@ -323,10 +324,15 @@ static int __devinit mxs_i2c_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct mxs_i2c_dev *i2c;

	struct i2c_adapter *adap;

	struct pinctrl *pinctrl;

	struct resource *res;

	resource_size_t res_size;

	int err, irq;



	pinctrl = devm_pinctrl_get_select_default(dev);

	if (IS_ERR(pinctrl))

		return PTR_ERR(pinctrl);



	i2c = devm_kzalloc(dev, sizeof(struct mxs_i2c_dev), GFP_KERNEL);

	if (!i2c)

		return -ENOMEM;