summaryrefslogtreecommitdiffstats
path: root/drivers/usb/chipidea/otg_fsm.c
diff options
context:
space:
mode:
authorAntoine Tenart <antoine.tenart@free-electrons.com>2014-10-30 18:41:19 +0100
committerFelipe Balbi <balbi@ti.com>2014-11-03 10:03:30 -0600
commit1e5e2d3d055436c114e2f16145b83339aed024ff (patch)
tree821eaf3301ecdd322abe8b50e32bad7825c18c73 /drivers/usb/chipidea/otg_fsm.c
parentef44cb4226d132146e44f8ea562a16b27ff61126 (diff)
downloadblackbird-op-linux-1e5e2d3d055436c114e2f16145b83339aed024ff.tar.gz
blackbird-op-linux-1e5e2d3d055436c114e2f16145b83339aed024ff.zip
usb: chipidea: add support to the generic PHY framework
This patch adds support of the PHY framework for ChipIdea drivers. Changes are done in both the ChipIdea common code and in the drivers accessing the PHY. This is done by adding a new PHY member in ChipIdea's structures and by taking care of it in the code. Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com> Acked-by: Peter Chen <peter.chen@freescale.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/chipidea/otg_fsm.c')
-rw-r--r--drivers/usb/chipidea/otg_fsm.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c
index 862d7cb01b92..3c2ab1ae00fc 100644
--- a/drivers/usb/chipidea/otg_fsm.c
+++ b/drivers/usb/chipidea/otg_fsm.c
@@ -779,7 +779,11 @@ int ci_hdrc_otg_fsm_init(struct ci_hdrc *ci)
{
int retval = 0;
- ci->otg.usb_phy = ci->usb_phy;
+ if (ci->phy)
+ ci->otg.phy = ci->phy;
+ else
+ ci->otg.usb_phy = ci->usb_phy;
+
ci->otg.gadget = &ci->gadget;
ci->fsm.otg = &ci->otg;
ci->fsm.power_up = 1;
OpenPOWER on IntegriCloud