| Date: | 2013-12-17 12:14:39 (9 years 9 months ago) |
|---|---|
| Author: | Lars C. |
| Commit: | af3548b2d53c17288a16d4c1e2f9bad1f65e122e |
| Message: | usb: musb-jz4740: Remove set_vbus callback The jz4740 is gadget mode only, so there is no vbus signal to control. Set musb core handles the case where no callback is supplied just fine. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> |
| Files: |
drivers/usb/musb/jz4740.c (2 diffs) |
Change Details
| drivers/usb/musb/jz4740.c | ||
|---|---|---|
| 28 | 28 | struct clk *clk; |
| 29 | 29 | }; |
| 30 | 30 | |
| 31 | static void jz4740_musb_set_vbus(struct musb *musb, int is_on) | |
| 32 | { | |
| 33 | u8 devctl = musb_readb(musb->mregs, MUSB_DEVCTL); | |
| 34 | ||
| 35 | /* HDRC controls CPEN, but beware current surges during device | |
| 36 | * connect. They can trigger transient overcurrent conditions | |
| 37 | * that must be ignored. | |
| 38 | */ | |
| 39 | ||
| 40 | if (is_on) { | |
| 41 | musb->is_active = 1; | |
| 42 | musb->xceiv->otg->default_a = 1; | |
| 43 | musb->xceiv->state = OTG_STATE_A_WAIT_VRISE; | |
| 44 | devctl |= MUSB_DEVCTL_SESSION; | |
| 45 | ||
| 46 | MUSB_HST_MODE(musb); | |
| 47 | } else { | |
| 48 | musb->is_active = 0; | |
| 49 | ||
| 50 | /* NOTE: we're skipping A_WAIT_VFALL -> A_IDLE and | |
| 51 | * jumping right to B_IDLE... | |
| 52 | */ | |
| 53 | ||
| 54 | musb->xceiv->otg->default_a = 0; | |
| 55 | musb->xceiv->state = OTG_STATE_B_IDLE; | |
| 56 | devctl &= ~MUSB_DEVCTL_SESSION; | |
| 57 | ||
| 58 | MUSB_DEV_MODE(musb); | |
| 59 | } | |
| 60 | musb_writeb(musb->mregs, MUSB_DEVCTL, devctl); | |
| 61 | ||
| 62 | dev_dbg(musb->xceiv->dev, "VBUS %s, devctl %02x " | |
| 63 | /* otg %3x conf %08x prcm %08x */ "\n", | |
| 64 | usb_otg_state_string(musb->xceiv->state), | |
| 65 | musb_readb(musb->mregs, MUSB_DEVCTL)); | |
| 66 | } | |
| 67 | ||
| 68 | 31 | static irqreturn_t jz4740_musb_interrupt(int irq, void *__hci) |
| 69 | 32 | { |
| 70 | 33 | unsigned long flags; |
| ... | ... | |
| 142 | 105 | static const struct musb_platform_ops jz4740_musb_ops = { |
| 143 | 106 | .init = jz4740_musb_init, |
| 144 | 107 | .exit = jz4740_musb_exit, |
| 145 | ||
| 146 | .set_vbus = jz4740_musb_set_vbus, | |
| 147 | 108 | }; |
| 148 | 109 | |
| 149 | 110 | static int jz4740_probe(struct platform_device *pdev) |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9
