diff options
| author | Li Jun <jun.li@freescale.com> | 2015-06-18 14:52:11 +0800 |
|---|---|---|
| committer | Li Jun <jun.li@freescale.com> | 2015-07-22 10:22:12 +0800 |
| commit | 4c07b7b00871a897ede211b22d90bfafc49affa7 (patch) | |
| tree | bd5865b947b8c9893de826991ebedab4d876e0c8 | |
| parent | db8a64421637d9089f380ea1eb01728bc5da3d40 (diff) | |
MLK-11123-16 usb: chipidea: otg: remove adp_support from ci_hdrc_platform_data
Since we introduce usb_otg_caps in ci_hdrc_platform_data to cover all otg
related features, remove adp_support from ci_hdrc_platform_data.
Signed-off-by: Li Jun <jun.li@freescale.com>
(cherry picked from commit 9eb98ab92fda810838427addfd9a5c3c60ba272e)
| -rw-r--r-- | drivers/usb/chipidea/otg_fsm.c | 11 | ||||
| -rw-r--r-- | include/linux/usb/chipidea.h | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c index d85844370064..f9c685bd462a 100644 --- a/drivers/usb/chipidea/otg_fsm.c +++ b/drivers/usb/chipidea/otg_fsm.c @@ -744,7 +744,7 @@ static void ci_otg_start_adp_prb(struct otg_fsm *fsm) { struct ci_hdrc *ci = container_of(fsm, struct ci_hdrc, fsm); - if (!ci->platdata->adp_support || !ci->hnp_enable) + if (!ci->platdata->ci_otg_caps.adp_support || !ci->hnp_enable) return; if (ci->platdata->notify_event) @@ -757,7 +757,8 @@ static void ci_otg_start_adp_sns(struct otg_fsm *fsm) { struct ci_hdrc *ci = container_of(fsm, struct ci_hdrc, fsm); - if (!ci->platdata->adp_support || !ci->hnp_enable || !ci->driver) + if (!ci->platdata->ci_otg_caps.adp_support || + !ci->hnp_enable || !ci->driver) return; /* TODO If power_up and vbus is off, do one ADP probe before SRP */ @@ -795,7 +796,8 @@ static int ci_otg_fsm_adp_work(struct ci_hdrc *ci) { struct otg_fsm *fsm = &ci->fsm; - if (!ci->platdata->notify_event || !ci->platdata->adp_support) + if (!ci->platdata->notify_event || + !ci->platdata->ci_otg_caps.adp_support) return -ENOTSUPP; if (ci->adp_probe_event) { @@ -999,7 +1001,8 @@ static irqreturn_t ci_otg_fsm_adp_int(struct ci_hdrc *ci) irqreturn_t retval = IRQ_NONE; bool adp_int = false; - if (!ci->platdata->notify_event || !ci->platdata->adp_support) + if (!ci->platdata->notify_event || + !ci->platdata->ci_otg_caps.adp_support) return retval; adp_int = ci->platdata->notify_event(ci, diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h index fbb1b0f4bdf4..e3ea5b5a2cad 100644 --- a/include/linux/usb/chipidea.h +++ b/include/linux/usb/chipidea.h @@ -55,7 +55,6 @@ struct ci_hdrc_platform_data { struct regulator *reg_vbus; struct usb_otg_caps ci_otg_caps; bool tpl_support; - bool adp_support; u32 ahbburst_config; u32 burst_length; u32 phy_clkgate_delay_us; |