Commit ca784be3 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Felipe Balbi
Browse files

usb: start using the control module driver 



Start using the control module driver for powering on the PHY and for
writing to the mailbox instead of writing to the control module
registers on their own.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 01658f0f

Documentation/devicetree/bindings/usb/omap-usb.txt

+4 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ OMAP GLUE AND OTHER OMAP SPECIFIC COMPONENTS 
OMAP MUSB GLUE

 - compatible : Should be "ti,omap4-musb" or "ti,omap3-musb"

 - ti,hwmods : must be "usb_otg_hs"

 - ti,has-mailbox : to specify that omap uses an external mailbox

   (in control module) to communicate with the musb core during device connect

   and disconnect.

 - multipoint : Should be "1" indicating the musb controller supports

   multipoint. This is a MUSB configuration-specific setting.

 - num_eps : Specifies the number of endpoints. This is also a
@@ -24,6 +27,7 @@ SOC specific device node entry 
usb_otg_hs: usb_otg_hs@4a0ab000 {

	compatible = "ti,omap4-musb";

	ti,hwmods = "usb_otg_hs";

	ti,has-mailbox;

	multipoint = <1>;

	num_eps = <16>;

	ram_bits = <12>;

Documentation/devicetree/bindings/usb/usb-phy.txt

+2 −5
Original line number Diff line number Diff line
@@ -4,9 +4,7 @@ OMAP USB2 PHY 


Required properties:

 - compatible: Should be "ti,omap-usb2"

 - reg : Address and length of the register set for the device. Also

add the address of control module dev conf register until a driver for

control module is added

 - reg : Address and length of the register set for the device.



Optional properties:

 - ctrl-module : phandle of the control module used by PHY driver to power on
@@ -16,7 +14,6 @@ This is usually a subnode of ocp2scp to which it is connected. 


usb2phy@4a0ad080 {

	compatible = "ti,omap-usb2";

	reg = <0x4a0ad080 0x58>,

	      <0x4a002300 0x4>;

	reg = <0x4a0ad080 0x58>;

	ctrl-module = <&omap_control_usb>;

};

drivers/usb/musb/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config USB_MUSB_HDRC 
	select NOP_USB_XCEIV if (SOC_TI81XX || SOC_AM33XX)

	select TWL4030_USB if MACH_OMAP_3430SDP

	select TWL6030_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA

	select OMAP_CONTROL_USB if MACH_OMAP_4430SDP || MACH_OMAP4_PANDA

	select USB_OTG_UTILS

	help

	  Say Y here if your system has a dual role high speed USB

drivers/usb/musb/omap2430.c

+23 −45
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/err.h>

#include <linux/delay.h>

#include <linux/usb/musb-omap.h>

#include <linux/usb/omap_control_usb.h>



#include "musb_core.h"

#include "omap2430.h"
@@ -46,7 +47,7 @@ struct omap2430_glue { 
	struct platform_device	*musb;

	enum omap_musb_vbus_id_status status;

	struct work_struct	omap_musb_mailbox_work;

	u32 __iomem		*control_otghs;

	struct device		*control_otghs;

};

#define glue_to_musb(g)		platform_get_drvdata(g->musb)
@@ -54,26 +55,6 @@ struct omap2430_glue *_glue; 


static struct timer_list musb_idle_timer;



/**

 * omap4_usb_phy_mailbox - write to usb otg mailbox

 * @glue: struct omap2430_glue *

 * @val: the value to be written to the mailbox

 *

 * On detection of a device (ID pin is grounded), this API should be called

 * to set AVALID, VBUSVALID and ID pin is grounded.

 *

 * When OMAP is connected to a host (OMAP in device mode), this API

 * is called to set AVALID, VBUSVALID and ID pin in high impedance.

 *

 * XXX: This function will be removed once we have a seperate driver for

 * control module

 */

static void omap4_usb_phy_mailbox(struct omap2430_glue *glue, u32 val)

{

	if (glue->control_otghs)

		writel(val, glue->control_otghs);

}



static void musb_do_idle(unsigned long _musb)

{

	struct musb	*musb = (void *)_musb;
@@ -269,7 +250,6 @@ EXPORT_SYMBOL_GPL(omap_musb_mailbox); 


static void omap_musb_set_mailbox(struct omap2430_glue *glue)

{

	u32 val;

	struct musb *musb = glue_to_musb(glue);

	struct device *dev = musb->controller;

	struct musb_hdrc_platform_data *pdata = dev->platform_data;
@@ -285,8 +265,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue) 
		musb->xceiv->last_event = USB_EVENT_ID;

		if (musb->gadget_driver) {

			pm_runtime_get_sync(dev);

			val = AVALID | VBUSVALID;

			omap4_usb_phy_mailbox(glue, val);

			omap_control_usb_set_mode(glue->control_otghs,

				USB_MODE_HOST);

			omap2430_musb_set_vbus(musb, 1);

		}

		break;
@@ -299,8 +279,7 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue) 
		musb->xceiv->last_event = USB_EVENT_VBUS;

		if (musb->gadget_driver)

			pm_runtime_get_sync(dev);

		val = IDDIG | AVALID | VBUSVALID;

		omap4_usb_phy_mailbox(glue, val);

		omap_control_usb_set_mode(glue->control_otghs, USB_MODE_DEVICE);

		break;



	case OMAP_MUSB_ID_FLOAT:
@@ -317,8 +296,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue) 
			if (musb->xceiv->otg->set_vbus)

				otg_set_vbus(musb->xceiv->otg, 0);

		}

		val = SESSEND | IDDIG;

		omap4_usb_phy_mailbox(glue, val);

		omap_control_usb_set_mode(glue->control_otghs,

			USB_MODE_DISCONNECT);

		break;

	default:

		dev_dbg(dev, "ID float\n");
@@ -415,7 +394,6 @@ static int omap2430_musb_init(struct musb *musb) 
static void omap2430_musb_enable(struct musb *musb)

{

	u8		devctl;

	u32		val;

	unsigned long timeout = jiffies + msecs_to_jiffies(1000);

	struct device *dev = musb->controller;

	struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
@@ -425,8 +403,7 @@ static void omap2430_musb_enable(struct musb *musb) 
	switch (glue->status) {



	case OMAP_MUSB_ID_GROUND:

		val = AVALID | VBUSVALID;

		omap4_usb_phy_mailbox(glue, val);

		omap_control_usb_set_mode(glue->control_otghs, USB_MODE_HOST);

		if (data->interface_type != MUSB_INTERFACE_UTMI)

			break;

		devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
@@ -445,8 +422,7 @@ static void omap2430_musb_enable(struct musb *musb) 
		break;



	case OMAP_MUSB_VBUS_VALID:

		val = IDDIG | AVALID | VBUSVALID;

		omap4_usb_phy_mailbox(glue, val);

		omap_control_usb_set_mode(glue->control_otghs, USB_MODE_DEVICE);

		break;



	default:
@@ -456,14 +432,12 @@ static void omap2430_musb_enable(struct musb *musb) 


static void omap2430_musb_disable(struct musb *musb)

{

	u32 val;

	struct device *dev = musb->controller;

	struct omap2430_glue *glue = dev_get_drvdata(dev->parent);



	if (glue->status != OMAP_MUSB_UNKNOWN) {

		val = SESSEND | IDDIG;

		omap4_usb_phy_mailbox(glue, val);

	}

	if (glue->status != OMAP_MUSB_UNKNOWN)

		omap_control_usb_set_mode(glue->control_otghs,

			USB_MODE_DISCONNECT);

}



static int omap2430_musb_exit(struct musb *musb)
@@ -498,7 +472,6 @@ static int omap2430_probe(struct platform_device *pdev) 
	struct omap2430_glue		*glue;

	struct device_node		*np = pdev->dev.of_node;

	struct musb_hdrc_config		*config;

	struct resource			*res;

	int				ret = -ENOMEM;



	glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
@@ -521,12 +494,6 @@ static int omap2430_probe(struct platform_device *pdev) 
	glue->musb			= musb;

	glue->status			= OMAP_MUSB_UNKNOWN;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);



	glue->control_otghs = devm_request_and_ioremap(&pdev->dev, res);

	if (glue->control_otghs == NULL)

		dev_dbg(&pdev->dev, "Failed to obtain control memory\n");



	if (np) {

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

		if (!pdata) {
@@ -558,11 +525,22 @@ static int omap2430_probe(struct platform_device *pdev) 
		of_property_read_u32(np, "ram_bits", (u32 *)&config->ram_bits);

		of_property_read_u32(np, "power", (u32 *)&pdata->power);

		config->multipoint = of_property_read_bool(np, "multipoint");

		pdata->has_mailbox = of_property_read_bool(np,

		    "ti,has-mailbox");



		pdata->board_data	= data;

		pdata->config		= config;

	}



	if (pdata->has_mailbox) {

		glue->control_otghs = omap_get_control_dev();

		if (IS_ERR(glue->control_otghs)) {

			dev_vdbg(&pdev->dev, "Failed to get control device\n");

			return -ENODEV;

		}

	} else {

		glue->control_otghs = ERR_PTR(-ENODEV);

	}

	pdata->platform_ops		= &omap2430_ops;



	platform_set_drvdata(pdev, glue);

drivers/usb/musb/omap2430.h

+0 −9
Original line number Diff line number Diff line
@@ -49,13 +49,4 @@ 
#define OTG_FORCESTDBY		0x414

#	define	ENABLEFORCE		(1 << 0)



/*

 * Control Module bit definitions

 * XXX: Will be removed once we have a driver for control module.

 */

#define	AVALID				BIT(0)

#define	BVALID				BIT(1)

#define	VBUSVALID			BIT(2)

#define	SESSEND				BIT(3)

#define	IDDIG				BIT(4)

#endif	/* __MUSB_OMAP243X_H__ */