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

Commit b4dbb258 authored by Richard Zhao's avatar Richard Zhao Committed by Greg Kroah-Hartman
Browse files

USB: chipidea: imx: add pinctrl support 



Some controllers may not need to setup pinctrl, so we don't fail the
probe if pinctrl get/select failed.

Tested-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
Tested-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarRichard Zhao <richard.zhao@freescale.com>
Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d142d6be

drivers/usb/chipidea/ci13xxx_imx.c

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

#include <linux/clk.h>

#include <linux/regulator/consumer.h>

#include <linux/pinctrl/consumer.h>



#include "ci.h"

#include "ci13xxx_imx.h"
@@ -99,6 +100,7 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev) 
	struct device_node *phy_np;

	struct resource *res;

	struct regulator *reg_vbus;

	struct pinctrl *pinctrl;

	int ret;



	if (of_find_property(pdev->dev.of_node, "fsl,usbmisc", NULL)
@@ -117,6 +119,11 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev) 
		return -ENOENT;

	}



	pinctrl = devm_pinctrl_get_select_default(&pdev->dev);

	if (IS_ERR(pinctrl))

		dev_warn(&pdev->dev, "pinctrl get/select failed, err=%ld\n",

			PTR_ERR(pinctrl));



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

	if (IS_ERR(data->clk)) {

		dev_err(&pdev->dev,