diff options
author | Peter Chen <peter.chen@freescale.com> | 2014-11-26 00:44:31 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 12:28:12 -0500 |
commit | 947c88592f17bd299ff677049c3cda36cc6f93dd (patch) | |
tree | 8b0fdf5b086ceabe03f0798614bd162595b8640a | |
parent | 2558c1f53bbbb5848fd5910918b97b03249d3885 (diff) |
usb: chipidea: remove flag CI_HDRC_REQUIRE_TRANSCEIVER
Now, USB PHY is mandatory for chipidea core, the flag
CI_HDRC_REQUIRE_TRANSCEIVER is useless.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/chipidea/ci_hdrc_imx.c | 3 | ||||
-rw-r--r-- | drivers/usb/chipidea/ci_hdrc_msm.c | 1 | ||||
-rw-r--r-- | include/linux/usb/chipidea.h | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c index 75421c2187f5..450a168974d5 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.c +++ b/drivers/usb/chipidea/ci_hdrc_imx.c | |||
@@ -106,8 +106,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) | |||
106 | struct ci_hdrc_platform_data pdata = { | 106 | struct ci_hdrc_platform_data pdata = { |
107 | .name = dev_name(&pdev->dev), | 107 | .name = dev_name(&pdev->dev), |
108 | .capoffset = DEF_CAPOFFSET, | 108 | .capoffset = DEF_CAPOFFSET, |
109 | .flags = CI_HDRC_REQUIRE_TRANSCEIVER | | 109 | .flags = CI_HDRC_DISABLE_STREAMING, |
110 | CI_HDRC_DISABLE_STREAMING, | ||
111 | }; | 110 | }; |
112 | int ret; | 111 | int ret; |
113 | const struct of_device_id *of_id = | 112 | const struct of_device_id *of_id = |
diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 3edf969ed797..d79ecc08a1be 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c | |||
@@ -46,7 +46,6 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = { | |||
46 | .name = "ci_hdrc_msm", | 46 | .name = "ci_hdrc_msm", |
47 | .capoffset = DEF_CAPOFFSET, | 47 | .capoffset = DEF_CAPOFFSET, |
48 | .flags = CI_HDRC_REGS_SHARED | | 48 | .flags = CI_HDRC_REGS_SHARED | |
49 | CI_HDRC_REQUIRE_TRANSCEIVER | | ||
50 | CI_HDRC_DISABLE_STREAMING, | 49 | CI_HDRC_DISABLE_STREAMING, |
51 | 50 | ||
52 | .notify_event = ci_hdrc_msm_notify_event, | 51 | .notify_event = ci_hdrc_msm_notify_event, |
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h index c01bf4ea27b9..535997a6681b 100644 --- a/include/linux/usb/chipidea.h +++ b/include/linux/usb/chipidea.h | |||
@@ -19,7 +19,6 @@ struct ci_hdrc_platform_data { | |||
19 | enum usb_phy_interface phy_mode; | 19 | enum usb_phy_interface phy_mode; |
20 | unsigned long flags; | 20 | unsigned long flags; |
21 | #define CI_HDRC_REGS_SHARED BIT(0) | 21 | #define CI_HDRC_REGS_SHARED BIT(0) |
22 | #define CI_HDRC_REQUIRE_TRANSCEIVER BIT(1) | ||
23 | #define CI_HDRC_DISABLE_STREAMING BIT(3) | 22 | #define CI_HDRC_DISABLE_STREAMING BIT(3) |
24 | /* | 23 | /* |
25 | * Only set it when DCCPARAMS.DC==1 and DCCPARAMS.HC==1, | 24 | * Only set it when DCCPARAMS.DC==1 and DCCPARAMS.HC==1, |