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

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

USB: chipidea: add imx usbmisc support 



i.MX usb controllers share non-core registers, which may include
SoC specific controls. We turn it into a usbmisc device and usbmisc
driver set operations needed by ci13xxx_imx driver.

For example, Sabrelite board has bad over-current design, we can
usbmisc to disable over-current detection.

Acked-by: default avatarSascha Hauer <s.hauer@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 08d9c74d

Documentation/devicetree/bindings/usb/ci13xxx-imx.txt

+5 −0
Original line number Diff line number Diff line
@@ -7,7 +7,10 @@ Required properties: 


Optional properties:

- fsl,usbphy: phandler of usb phy that connects to the only one port

- fsl,usbmisc: phandler of non-core register device, with one argument

  that indicate usb controller index

- vbus-supply: regulator for vbus

- disable-over-current: disable over current detect



Examples:

usb@02184000 { /* USB OTG */
@@ -15,4 +18,6 @@ usb@02184000 { /* USB OTG */ 
	reg = <0x02184000 0x200>;

	interrupts = <0 43 0x04>;

	fsl,usbphy = <&usbphy1>;

	fsl,usbmisc = <&usbmisc 0>;

	disable-over-current;

};

Documentation/devicetree/bindings/usb/usbmisc-imx.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
* Freescale i.MX non-core registers



Required properties:

- #index-cells: Cells used to descibe usb controller index. Should be <1>

- compatible: Should be one of below:

	"fsl,imx6q-usbmisc" for imx6q

- reg: Should contain registers location and length



Examples:

usbmisc@02184800 {

	#index-cells = <1>;

	compatible = "fsl,imx6q-usbmisc";

	reg = <0x02184800 0x200>;

};

drivers/usb/chipidea/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,5 +15,5 @@ ifneq ($(CONFIG_PCI),) 
endif



ifneq ($(CONFIG_OF_DEVICE),)

	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_imx.o

	obj-$(CONFIG_USB_CHIPIDEA)	+= ci13xxx_imx.o usbmisc_imx6q.o

endif

drivers/usb/chipidea/ci13xxx_imx.c

+64 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/regulator/consumer.h>



#include "ci.h"

#include "ci13xxx_imx.h"



#define pdev_to_phy(pdev) \

	((struct usb_phy *)platform_get_drvdata(pdev))
@@ -34,6 +35,55 @@ struct ci13xxx_imx_data { 
	struct regulator *reg_vbus;

};



static const struct usbmisc_ops *usbmisc_ops;



/* Common functions shared by usbmisc drivers */



int usbmisc_set_ops(const struct usbmisc_ops *ops)

{

	if (usbmisc_ops)

		return -EBUSY;



	usbmisc_ops = ops;



	return 0;

}

EXPORT_SYMBOL_GPL(usbmisc_set_ops);



void usbmisc_unset_ops(const struct usbmisc_ops *ops)

{

	usbmisc_ops = NULL;

}

EXPORT_SYMBOL_GPL(usbmisc_unset_ops);



int usbmisc_get_init_data(struct device *dev, struct usbmisc_usb_device *usbdev)

{

	struct device_node *np = dev->of_node;

	struct of_phandle_args args;

	int ret;



	usbdev->dev = dev;



	ret = of_parse_phandle_with_args(np, "fsl,usbmisc", "#index-cells",

					0, &args);

	if (ret) {

		dev_err(dev, "Failed to parse property fsl,usbmisc, errno %d\n",

			ret);

		memset(usbdev, 0, sizeof(*usbdev));

		return ret;

	}

	usbdev->index = args.args[0];

	of_node_put(args.np);



	if (of_find_property(np, "disable-over-current", NULL))

		usbdev->disable_oc = 1;



	return 0;

}

EXPORT_SYMBOL_GPL(usbmisc_get_init_data);



/* End of common functions shared by usbmisc drivers*/



static struct ci13xxx_platform_data ci13xxx_imx_platdata __devinitdata  = {

	.name			= "ci13xxx_imx",

	.flags			= CI13XXX_REQUIRE_TRANSCEIVER |
@@ -51,6 +101,10 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev) 
	struct regulator *reg_vbus;

	int ret;



	if (of_find_property(pdev->dev.of_node, "fsl,usbmisc", NULL)

		&& !usbmisc_ops)

		return -EPROBE_DEFER;



	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);

	if (!data) {

		dev_err(&pdev->dev, "Failed to allocate CI13xxx-IMX data!\n");
@@ -120,6 +174,16 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev) 
		*pdev->dev.dma_mask = DMA_BIT_MASK(32);

		dma_set_coherent_mask(&pdev->dev, *pdev->dev.dma_mask);

	}



	if (usbmisc_ops && usbmisc_ops->init) {

		ret = usbmisc_ops->init(&pdev->dev);

		if (ret) {

			dev_err(&pdev->dev,

				"usbmisc init failed, ret=%d\n", ret);

			goto err;

		}

	}



	plat_ci = ci13xxx_add_device(&pdev->dev,

				pdev->resource, pdev->num_resources,

				&ci13xxx_imx_platdata);

drivers/usb/chipidea/ci13xxx_imx.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2012 Freescale Semiconductor, Inc.

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



/* Used to set SoC specific callbacks */

struct usbmisc_ops {

	/* It's called once when probe a usb device */

	int (*init)(struct device *dev);

};



struct usbmisc_usb_device {

	struct device *dev; /* usb controller device */

	int index;



	int disable_oc:1; /* over current detect disabled */

};



int usbmisc_set_ops(const struct usbmisc_ops *ops);

void usbmisc_unset_ops(const struct usbmisc_ops *ops);

int

usbmisc_get_init_data(struct device *dev, struct usbmisc_usb_device *usbdev);