USB: otg: sharable otg transceiver ops
Move otg_get/set/put_transceiver() from omap specific code to common otg.c so other upcoming drivers can share them. [ dbrownell@users.sourceforge.net: move to drivers/usb/otg, dox ] Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Felipe Balbi <me@felipebalbi.com> Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
68144e0cc9
commit
3cb22d6586
3 changed files with 71 additions and 43 deletions
|
@ -77,44 +77,6 @@
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------*/
|
/*-------------------------------------------------------------------------*/
|
||||||
|
|
||||||
#if defined(CONFIG_ARCH_OMAP_OTG) || defined(CONFIG_USB_MUSB_OTG)
|
|
||||||
|
|
||||||
static struct otg_transceiver *xceiv;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* otg_get_transceiver - find the (single) OTG transceiver driver
|
|
||||||
*
|
|
||||||
* Returns the transceiver driver, after getting a refcount to it; or
|
|
||||||
* null if there is no such transceiver. The caller is responsible for
|
|
||||||
* releasing that count.
|
|
||||||
*/
|
|
||||||
struct otg_transceiver *otg_get_transceiver(void)
|
|
||||||
{
|
|
||||||
if (xceiv)
|
|
||||||
get_device(xceiv->dev);
|
|
||||||
return xceiv;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(otg_get_transceiver);
|
|
||||||
|
|
||||||
void otg_put_transceiver(struct otg_transceiver *x)
|
|
||||||
{
|
|
||||||
put_device(x->dev);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(otg_put_transceiver);
|
|
||||||
|
|
||||||
int otg_set_transceiver(struct otg_transceiver *x)
|
|
||||||
{
|
|
||||||
if (xceiv && x)
|
|
||||||
return -EBUSY;
|
|
||||||
xceiv = x;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL(otg_set_transceiver);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------*/
|
|
||||||
|
|
||||||
#if defined(CONFIG_ARCH_OMAP_OTG) || defined(CONFIG_ARCH_OMAP15XX)
|
#if defined(CONFIG_ARCH_OMAP_OTG) || defined(CONFIG_ARCH_OMAP15XX)
|
||||||
|
|
||||||
static void omap2_usb_devconf_clear(u8 port, u32 mask)
|
static void omap2_usb_devconf_clear(u8 port, u32 mask)
|
||||||
|
|
|
@ -2,12 +2,13 @@
|
||||||
# OTG infrastructure and transceiver drivers
|
# OTG infrastructure and transceiver drivers
|
||||||
#
|
#
|
||||||
|
|
||||||
|
# infrastructure
|
||||||
|
obj-$(CONFIG_USB_OTG_UTILS) += otg.o
|
||||||
|
|
||||||
|
# transceiver drivers
|
||||||
obj-$(CONFIG_USB_GPIO_VBUS) += gpio_vbus.o
|
obj-$(CONFIG_USB_GPIO_VBUS) += gpio_vbus.o
|
||||||
obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
|
obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
|
||||||
|
|
||||||
ifeq ($(CONFIG_USB_DEBUG),y)
|
ccflags-$(CONFIG_USB_DEBUG) += -DDEBUG
|
||||||
EXTRA_CFLAGS += -DDEBUG
|
ccflags-$(CONFIG_USB_GADGET_DEBUG) += -DDEBUG
|
||||||
else ifeq ($(CONFIG_USB_GADGET_DEBUG),y)
|
|
||||||
EXTRA_CFLAGS += -DDEBUG
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
65
drivers/usb/otg/otg.c
Normal file
65
drivers/usb/otg/otg.c
Normal file
|
@ -0,0 +1,65 @@
|
||||||
|
/*
|
||||||
|
* otg.c -- USB OTG utility code
|
||||||
|
*
|
||||||
|
* Copyright (C) 2004 Texas Instruments
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/device.h>
|
||||||
|
|
||||||
|
#include <linux/usb/otg.h>
|
||||||
|
|
||||||
|
static struct otg_transceiver *xceiv;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* otg_get_transceiver - find the (single) OTG transceiver
|
||||||
|
*
|
||||||
|
* Returns the transceiver driver, after getting a refcount to it; or
|
||||||
|
* null if there is no such transceiver. The caller is responsible for
|
||||||
|
* calling otg_put_transceiver() to release that count.
|
||||||
|
*
|
||||||
|
* For use by USB host and peripheral drivers.
|
||||||
|
*/
|
||||||
|
struct otg_transceiver *otg_get_transceiver(void)
|
||||||
|
{
|
||||||
|
if (xceiv)
|
||||||
|
get_device(xceiv->dev);
|
||||||
|
return xceiv;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(otg_get_transceiver);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* otg_put_transceiver - release the (single) OTG transceiver
|
||||||
|
* @x: the transceiver returned by otg_get_transceiver()
|
||||||
|
*
|
||||||
|
* Releases a refcount the caller received from otg_get_transceiver().
|
||||||
|
*
|
||||||
|
* For use by USB host and peripheral drivers.
|
||||||
|
*/
|
||||||
|
void otg_put_transceiver(struct otg_transceiver *x)
|
||||||
|
{
|
||||||
|
put_device(x->dev);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(otg_put_transceiver);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* otg_set_transceiver - declare the (single) OTG transceiver
|
||||||
|
* @x: the USB OTG transceiver to be used; or NULL
|
||||||
|
*
|
||||||
|
* This call is exclusively for use by transceiver drivers, which
|
||||||
|
* coordinate the activities of drivers for host and peripheral
|
||||||
|
* controllers, and in some cases for VBUS current regulation.
|
||||||
|
*/
|
||||||
|
int otg_set_transceiver(struct otg_transceiver *x)
|
||||||
|
{
|
||||||
|
if (xceiv && x)
|
||||||
|
return -EBUSY;
|
||||||
|
xceiv = x;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(otg_set_transceiver);
|
Loading…
Reference in a new issue