Skip to content

Commit

Permalink
usb: otg: Separate otg members from usb_phy
Browse files Browse the repository at this point in the history 
Introducing struct otg and collecting otg specific members
to it from struct usb_phy. There are no changes to
struct usb_phy at this stage. This also renames
transceiver specific functions, and offers aliases for the
old otg ones.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Heikki Krogerus authored and Felipe Balbi committed Feb 13, 2012
1 parent de07e18 commit 7a8a3a9
Show file tree
Hide file tree
Showing 2 changed files with 98 additions and 36 deletions.
38 changes: 19 additions & 19 deletions drivers/usb/otg/otg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,56 +15,56 @@

#include <linux/usb/otg.h>

static struct usb_phy *xceiv;
static struct usb_phy *phy;

/**
* otg_get_transceiver - find the (single) OTG transceiver
* usb_get_transceiver - find the (single) USB 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.
* calling usb_put_transceiver() to release that count.
*
* For use by USB host and peripheral drivers.
*/
struct usb_phy *otg_get_transceiver(void)
struct usb_phy *usb_get_transceiver(void)
{
if (xceiv)
get_device(xceiv->dev);
return xceiv;
if (phy)
get_device(phy->dev);
return phy;
}
EXPORT_SYMBOL(otg_get_transceiver);
EXPORT_SYMBOL(usb_get_transceiver);

/**
* otg_put_transceiver - release the (single) OTG transceiver
* @x: the transceiver returned by otg_get_transceiver()
* usb_put_transceiver - release the (single) USB transceiver
* @x: the transceiver returned by usb_get_transceiver()
*
* Releases a refcount the caller received from otg_get_transceiver().
* Releases a refcount the caller received from usb_get_transceiver().
*
* For use by USB host and peripheral drivers.
*/
void otg_put_transceiver(struct usb_phy *x)
void usb_put_transceiver(struct usb_phy *x)
{
if (x)
put_device(x->dev);
}
EXPORT_SYMBOL(otg_put_transceiver);
EXPORT_SYMBOL(usb_put_transceiver);

/**
* otg_set_transceiver - declare the (single) OTG transceiver
* @x: the USB OTG transceiver to be used; or NULL
* usb_set_transceiver - declare the (single) USB transceiver
* @x: the USB 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 usb_phy *x)
int usb_set_transceiver(struct usb_phy *x)
{
if (xceiv && x)
if (phy && x)
return -EBUSY;
xceiv = x;
phy = x;
return 0;
}
EXPORT_SYMBOL(otg_set_transceiver);
EXPORT_SYMBOL(usb_set_transceiver);

const char *otg_state_string(enum usb_otg_state state)
{
Expand Down
96 changes: 79 additions & 17 deletions include/linux/usb/otg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,36 @@ struct usb_phy;
/* for transceivers connected thru an ULPI interface, the user must
* provide access ops
*/
struct otg_io_access_ops {
struct usb_phy_io_ops {
int (*read)(struct usb_phy *x, u32 reg);
int (*write)(struct usb_phy *x, u32 val, u32 reg);
};

struct usb_otg {
u8 default_a;

struct usb_phy *phy;
struct usb_bus *host;
struct usb_gadget *gadget;

/* bind/unbind the host controller */
int (*set_host)(struct usb_otg *otg, struct usb_bus *host);

/* bind/unbind the peripheral controller */
int (*set_peripheral)(struct usb_otg *otg,
struct usb_gadget *gadget);

/* effective for A-peripheral, ignored for B devices */
int (*set_vbus)(struct usb_otg *otg, bool enabled);

/* for B devices only: start session with A-Host */
int (*start_srp)(struct usb_otg *otg);

/* start or continue HNP role switch */
int (*start_hnp)(struct usb_otg *otg);

};

/*
* the otg driver needs to interact with both device side and host side
* usb controllers. it decides which controller is active at a given
Expand All @@ -68,11 +93,13 @@ struct usb_phy {
enum usb_otg_state state;
enum usb_phy_events last_event;

struct usb_otg *otg;

struct usb_bus *host;
struct usb_gadget *gadget;

struct otg_io_access_ops *io_ops;
void __iomem *io_priv;
struct usb_phy_io_ops *io_ops;
void __iomem *io_priv;

/* for notification of usb_phy_events */
struct atomic_notifier_head notifier;
Expand Down Expand Up @@ -115,7 +142,7 @@ struct usb_phy {


/* for board-specific init logic */
extern int otg_set_transceiver(struct usb_phy *);
extern int usb_set_transceiver(struct usb_phy *);

#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
/* sometimes transceivers are accessed only through e.g. ULPI */
Expand All @@ -132,15 +159,15 @@ static inline void usb_nop_xceiv_unregister(void)
#endif

/* helpers for direct access thru low-level io interface */
static inline int otg_io_read(struct usb_phy *x, u32 reg)
static inline int usb_phy_io_read(struct usb_phy *x, u32 reg)
{
if (x->io_ops && x->io_ops->read)
return x->io_ops->read(x, reg);

return -EINVAL;
}

static inline int otg_io_write(struct usb_phy *x, u32 val, u32 reg)
static inline int usb_phy_io_write(struct usb_phy *x, u32 val, u32 reg)
{
if (x->io_ops && x->io_ops->write)
return x->io_ops->write(x, val, reg);
Expand All @@ -149,7 +176,7 @@ static inline int otg_io_write(struct usb_phy *x, u32 val, u32 reg)
}

static inline int
otg_init(struct usb_phy *x)
usb_phy_init(struct usb_phy *x)
{
if (x->init)
return x->init(x);
Expand All @@ -158,24 +185,24 @@ otg_init(struct usb_phy *x)
}

static inline void
otg_shutdown(struct usb_phy *x)
usb_phy_shutdown(struct usb_phy *x)
{
if (x->shutdown)
x->shutdown(x);
}

/* for usb host and peripheral controller drivers */
#ifdef CONFIG_USB_OTG_UTILS
extern struct usb_phy *otg_get_transceiver(void);
extern void otg_put_transceiver(struct usb_phy *);
extern struct usb_phy *usb_get_transceiver(void);
extern void usb_put_transceiver(struct usb_phy *);
extern const char *otg_state_string(enum usb_otg_state state);
#else
static inline struct usb_phy *otg_get_transceiver(void)
static inline struct usb_phy *usb_get_transceiver(void)
{
return NULL;
}

static inline void otg_put_transceiver(struct usb_phy *x)
static inline void usb_put_transceiver(struct usb_phy *x)
{
}

Expand All @@ -189,20 +216,29 @@ static inline const char *otg_state_string(enum usb_otg_state state)
static inline int
otg_start_hnp(struct usb_phy *x)
{
if (x->otg && x->otg->start_hnp)
return x->otg->start_hnp(x->otg);

return x->start_hnp(x);
}

/* Context: can sleep */
static inline int
otg_set_vbus(struct usb_phy *x, bool enabled)
{
if (x->otg && x->otg->set_vbus)
return x->otg->set_vbus(x->otg, enabled);

return x->set_vbus(x, enabled);
}

/* for HCDs */
static inline int
otg_set_host(struct usb_phy *x, struct usb_bus *host)
{
if (x->otg && x->otg->set_host)
return x->otg->set_host(x->otg, host);

return x->set_host(x, host);
}

Expand All @@ -212,18 +248,23 @@ otg_set_host(struct usb_phy *x, struct usb_bus *host)
static inline int
otg_set_peripheral(struct usb_phy *x, struct usb_gadget *periph)
{
if (x->otg && x->otg->set_peripheral)
return x->otg->set_peripheral(x->otg, periph);

return x->set_peripheral(x, periph);
}

static inline int
otg_set_power(struct usb_phy *x, unsigned mA)
usb_phy_set_power(struct usb_phy *x, unsigned mA)
{
return x->set_power(x, mA);
if (x && x->set_power)
return x->set_power(x, mA);
return 0;
}

/* Context: can sleep */
static inline int
otg_set_suspend(struct usb_phy *x, int suspend)
usb_phy_set_suspend(struct usb_phy *x, int suspend)
{
if (x->set_suspend != NULL)
return x->set_suspend(x, suspend);
Expand All @@ -234,23 +275,44 @@ otg_set_suspend(struct usb_phy *x, int suspend)
static inline int
otg_start_srp(struct usb_phy *x)
{
if (x->otg && x->otg->start_srp)
return x->otg->start_srp(x->otg);

return x->start_srp(x);
}

/* notifiers */
static inline int
otg_register_notifier(struct usb_phy *x, struct notifier_block *nb)
usb_register_notifier(struct usb_phy *x, struct notifier_block *nb)
{
return atomic_notifier_chain_register(&x->notifier, nb);
}

static inline void
otg_unregister_notifier(struct usb_phy *x, struct notifier_block *nb)
usb_unregister_notifier(struct usb_phy *x, struct notifier_block *nb)
{
atomic_notifier_chain_unregister(&x->notifier, nb);
}

/* for OTG controller drivers (and maybe other stuff) */
extern int usb_bus_start_enum(struct usb_bus *bus, unsigned port_num);

/* Temporary aliases for transceiver functions */
#define otg_set_transceiver(x) usb_set_transceiver(x)
#define otg_get_transceiver() usb_get_transceiver()
#define otg_put_transceiver(x) usb_put_transceiver(x)

#define otg_io_read(x, a) usb_phy_io_read(x, a)
#define otg_io_write(x, a, b) usb_phy_io_write(x, a, b)

#define otg_init(x) usb_phy_init(x)
#define otg_shutdown(x) usb_phy_shutdown(x)
#define otg_set_power(x, a) usb_phy_set_power(x, a)
#define otg_set_suspend(x, a) usb_phy_set_suspend(x, a)

#define otg_register_notifier(x, a) usb_register_notifier(x, a)
#define otg_unregister_notifier(x, a) usb_unregiser_notifier(x, a)

#define otg_io_access_ops usb_phy_io_ops

#endif /* __LINUX_USB_OTG_H */

0 comments on commit 7a8a3a9

Please sign in to comment.