← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-omap/trusty

« back to all changes in this revision

Viewing changes to drivers/usb/musb/musb_virthub.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-57i0gl3v99b3lkfg
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/musb/musb_virthub.c
74
74
                                break;
75
75
                }
76
76
 
77
 
                DBG(3, "Root port suspended, power %02x\n", power);
 
77
                dev_dbg(musb->controller, "Root port suspended, power %02x\n", power);
78
78
 
79
79
                musb->port1_status |= USB_PORT_STAT_SUSPEND;
80
80
                switch (musb->xceiv->state) {
97
97
                        break;
98
98
#endif
99
99
                default:
100
 
                        DBG(1, "bogus rh suspend? %s\n",
 
100
                        dev_dbg(musb->controller, "bogus rh suspend? %s\n",
101
101
                                otg_state_string(musb->xceiv->state));
102
102
                }
103
103
        } else if (power & MUSB_POWER_SUSPENDM) {
105
105
                power |= MUSB_POWER_RESUME;
106
106
                musb_writeb(mbase, MUSB_POWER, power);
107
107
 
108
 
                DBG(3, "Root port resuming, power %02x\n", power);
 
108
                dev_dbg(musb->controller, "Root port resuming, power %02x\n", power);
109
109
 
110
110
                /* later, GetPortStatus will stop RESUME signaling */
111
111
                musb->port1_status |= MUSB_PORT_STAT_RESUME;
120
120
 
121
121
#ifdef CONFIG_USB_MUSB_OTG
122
122
        if (musb->xceiv->state == OTG_STATE_B_IDLE) {
123
 
                DBG(2, "HNP: Returning from HNP; no hub reset from b_idle\n");
 
123
                dev_dbg(musb->controller, "HNP: Returning from HNP; no hub reset from b_idle\n");
124
124
                musb->port1_status &= ~USB_PORT_STAT_RESET;
125
125
                return;
126
126
        }
159
159
                musb->port1_status &= ~USB_PORT_STAT_ENABLE;
160
160
                musb->rh_timer = jiffies + msecs_to_jiffies(50);
161
161
        } else {
162
 
                DBG(4, "root port reset stopped\n");
 
162
                dev_dbg(musb->controller, "root port reset stopped\n");
163
163
                musb_writeb(mbase, MUSB_POWER,
164
164
                                power & ~MUSB_POWER_RESET);
165
165
 
167
167
 
168
168
                power = musb_readb(mbase, MUSB_POWER);
169
169
                if (power & MUSB_POWER_HSMODE) {
170
 
                        DBG(4, "high-speed device connected\n");
 
170
                        dev_dbg(musb->controller, "high-speed device connected\n");
171
171
                        musb->port1_status |= USB_PORT_STAT_HIGH_SPEED;
172
172
                }
173
173
 
208
208
                musb->xceiv->state = OTG_STATE_B_IDLE;
209
209
                break;
210
210
        default:
211
 
                DBG(1, "host disconnect (%s)\n",
 
211
                dev_dbg(musb->controller, "host disconnect (%s)\n",
212
212
                        otg_state_string(musb->xceiv->state));
213
213
        }
214
214
}
288
288
                default:
289
289
                        goto error;
290
290
                }
291
 
                DBG(5, "clear feature %d\n", wValue);
 
291
                dev_dbg(musb->controller, "clear feature %d\n", wValue);
292
292
                musb->port1_status &= ~(1 << wValue);
293
293
                break;
294
294
        case GetHubDescriptor:
330
330
 
331
331
                        power = musb_readb(musb->mregs, MUSB_POWER);
332
332
                        power &= ~MUSB_POWER_RESUME;
333
 
                        DBG(4, "root port resume stopped, power %02x\n",
 
333
                        dev_dbg(musb->controller, "root port resume stopped, power %02x\n",
334
334
                                        power);
335
335
                        musb_writeb(musb->mregs, MUSB_POWER, power);
336
336
 
353
353
                                (__le32 *) buf);
354
354
 
355
355
                /* port change status is more interesting */
356
 
                DBG(get_unaligned((u16 *)(buf+2)) ? 2 : 5, "port status %08x\n",
 
356
                dev_dbg(musb->controller, "port status %08x\n",
357
357
                                musb->port1_status);
358
358
                break;
359
359
        case SetPortFeature:
424
424
                default:
425
425
                        goto error;
426
426
                }
427
 
                DBG(5, "set feature %d\n", wValue);
 
427
                dev_dbg(musb->controller, "set feature %d\n", wValue);
428
428
                musb->port1_status |= 1 << wValue;
429
429
                break;
430
430