summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorJack Pham <jackp@codeaurora.org>2016-01-26 18:41:13 -0800
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:06:04 -0700
commit1c3de1655ff020769828540b6acf9f28e6af3cc9 (patch)
treed49197860a297de15a9d20302785c5f34ff357d3 /drivers/usb
parenteb1ae4e2746bb7f802b217fecefe129ca7a5bb40 (diff)
usb: dwc3-msm: Remove pmic_id_irq
irq_read_line() is no longer supported. Signed-off-by: Jack Pham <jackp@codeaurora.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/dwc3/dwc3-msm.c43
1 files changed, 0 insertions, 43 deletions
diff --git a/drivers/usb/dwc3/dwc3-msm.c b/drivers/usb/dwc3/dwc3-msm.c
index 66fcb99e411e..99ced24d44b7 100644
--- a/drivers/usb/dwc3/dwc3-msm.c
+++ b/drivers/usb/dwc3/dwc3-msm.c
@@ -210,7 +210,6 @@ struct dwc3_msm {
bool charging_disabled;
enum usb_otg_state otg_state;
enum usb_chg_state chg_state;
- int pmic_id_irq;
u8 dcd_retries;
struct work_struct bus_vote_w;
unsigned int bus_vote;
@@ -2464,21 +2463,6 @@ static enum power_supply_property dwc3_msm_pm_power_props_usb[] = {
POWER_SUPPLY_PROP_USB_OTG,
};
-static irqreturn_t dwc3_pmic_id_irq(int irq, void *data)
-{
- struct dwc3_msm *mdwc = data;
- enum dwc3_id_state id;
-
- /* If we can't read ID line state for some reason, treat it as float */
- id = !!irq_read_line(irq);
- if (mdwc->id_state != id) {
- mdwc->id_state = id;
- schedule_work(&mdwc->resume_work.work);
- }
-
- return IRQ_HANDLED;
-}
-
static int dwc3_cpu_notifier_cb(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
@@ -2703,22 +2687,6 @@ static int dwc3_msm_probe(struct platform_device *pdev)
}
}
- mdwc->pmic_id_irq = platform_get_irq_byname(pdev, "pmic_id_irq");
- if (mdwc->pmic_id_irq > 0) {
- irq_set_status_flags(mdwc->pmic_id_irq, IRQ_NOAUTOEN);
- ret = devm_request_irq(&pdev->dev,
- mdwc->pmic_id_irq,
- dwc3_pmic_id_irq,
- IRQF_TRIGGER_RISING |
- IRQF_TRIGGER_FALLING,
- "dwc3_msm_pmic_id",
- mdwc);
- if (ret) {
- dev_err(&pdev->dev, "irqreq IDINT failed\n");
- goto err;
- }
- }
-
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "tcsr_base");
if (!res) {
dev_dbg(&pdev->dev, "missing TCSR memory resource\n");
@@ -2931,17 +2899,6 @@ static int dwc3_msm_probe(struct platform_device *pdev)
schedule_delayed_work(&mdwc->sm_work, 0);
- /* Update initial ID state */
- if (mdwc->pmic_id_irq) {
- enable_irq(mdwc->pmic_id_irq);
- local_irq_save(flags);
- mdwc->id_state = !!irq_read_line(mdwc->pmic_id_irq);
- if (mdwc->id_state == DWC3_ID_GROUND)
- dwc3_ext_event_notify(mdwc);
- local_irq_restore(flags);
- enable_irq_wake(mdwc->pmic_id_irq);
- }
-
if (!dwc->is_drd && host_mode) {
dev_dbg(&pdev->dev, "DWC3 in host only mode\n");
mdwc->id_state = DWC3_ID_GROUND;