usb: rename phy to usb_phy in OTG
This patch prepares the introduction of the generic PHY support in the USB OTG common functions. The USB PHY member of the OTG structure is renamed to 'usb_phy' and modifications are done in all drivers accessing it. Renaming this pointer will allow to keep the compatibility for USB PHY drivers. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:

committed by
Felipe Balbi

parent
e47d92545c
commit
19c1eac268
@@ -211,7 +211,7 @@ static int ulpi_init(struct usb_phy *phy)
|
||||
|
||||
static int ulpi_set_host(struct usb_otg *otg, struct usb_bus *host)
|
||||
{
|
||||
struct usb_phy *phy = otg->phy;
|
||||
struct usb_phy *phy = otg->usb_phy;
|
||||
unsigned int flags = usb_phy_io_read(phy, ULPI_IFC_CTRL);
|
||||
|
||||
if (!host) {
|
||||
@@ -237,7 +237,7 @@ static int ulpi_set_host(struct usb_otg *otg, struct usb_bus *host)
|
||||
|
||||
static int ulpi_set_vbus(struct usb_otg *otg, bool on)
|
||||
{
|
||||
struct usb_phy *phy = otg->phy;
|
||||
struct usb_phy *phy = otg->usb_phy;
|
||||
unsigned int flags = usb_phy_io_read(phy, ULPI_OTG_CTRL);
|
||||
|
||||
flags &= ~(ULPI_OTG_CTRL_DRVVBUS | ULPI_OTG_CTRL_DRVVBUS_EXT);
|
||||
@@ -276,7 +276,7 @@ otg_ulpi_create(struct usb_phy_io_ops *ops,
|
||||
phy->otg = otg;
|
||||
phy->init = ulpi_init;
|
||||
|
||||
otg->phy = phy;
|
||||
otg->usb_phy = phy;
|
||||
otg->set_host = ulpi_set_host;
|
||||
otg->set_vbus = ulpi_set_vbus;
|
||||
|
||||
|
Reference in New Issue
Block a user