| Date: | 2013-12-17 09:56:10 (9 years 9 months ago) |
|---|---|
| Author: | Lars C. |
| Commit: | 8187ff71326489faec0f04786170207ec4197f01 |
| Message: | usb: musb-jz4740: Move jz4740 specific fifo config to the jz4740 glue No need to clutter the core with jz4740 specific details. Move the FIFO config to the jz4740 glue code. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> |
| Files: |
drivers/usb/musb/jz4740.c (2 diffs) drivers/usb/musb/musb_core.c (3 diffs) |
Change Details
| drivers/usb/musb/jz4740.c | ||
|---|---|---|
| 85 | 85 | return retval; |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | static struct musb_fifo_cfg jz4740_musb_fifo_cfg[] = { | |
| 89 | { .hw_ep_num = 1, .style = FIFO_TX, .maxpacket = 512, }, | |
| 90 | { .hw_ep_num = 1, .style = FIFO_RX, .maxpacket = 512, }, | |
| 91 | { .hw_ep_num = 2, .style = FIFO_TX, .maxpacket = 64, }, | |
| 92 | }; | |
| 88 | 93 | static struct musb_hdrc_config jz4740_musb_config = { |
| 89 | 94 | /* Silicon does not implement USB OTG. */ |
| 90 | 95 | .multipoint = 0, |
| ... | ... | |
| 92 | 97 | .num_eps = 4, |
| 93 | 98 | /* RAMbits needed to configure EPs from table */ |
| 94 | 99 | .ram_bits = 9, |
| 100 | .fifo_cfg = jz4740_musb_fifo_cfg, | |
| 101 | .fifo_cfg_size = ARRAY_SIZE(jz4740_musb_fifo_cfg), | |
| 95 | 102 | }; |
| 96 | 103 | |
| 97 | 104 | static struct musb_hdrc_platform_data jz4740_musb_platform_data = { |
| drivers/usb/musb/musb_core.c | ||
|---|---|---|
| 1038 | 1038 | #elif defined(CONFIG_USB_MUSB_UX500) \ |
| 1039 | 1039 | || defined(CONFIG_USB_MUSB_UX500_MODULE) |
| 1040 | 1040 | static ushort fifo_mode = 5; |
| 1041 | #elif defined(CONFIG_USB_MUSB_JZ4740) \ | |
| 1042 | || defined(CONFIG_USB_MUSB_JZ4740_MODULE) | |
| 1043 | static ushort fifo_mode = 6; | |
| 1044 | 1041 | #else |
| 1045 | 1042 | static ushort fifo_mode = 2; |
| 1046 | 1043 | #endif |
| ... | ... | |
| 1154 | 1151 | { .hw_ep_num = 15, .style = FIFO_RXTX, .maxpacket = 1024, }, |
| 1155 | 1152 | }; |
| 1156 | 1153 | |
| 1157 | /* mode 6 - fits in 2KB */ | |
| 1158 | static struct musb_fifo_cfg mode_6_cfg[] = { | |
| 1159 | { .hw_ep_num = 1, .style = FIFO_TX, .maxpacket = 512, }, | |
| 1160 | { .hw_ep_num = 1, .style = FIFO_RX, .maxpacket = 512, }, | |
| 1161 | { .hw_ep_num = 2, .style = FIFO_TX, .maxpacket = 64, }, | |
| 1162 | }; | |
| 1163 | ||
| 1164 | 1154 | /* |
| 1165 | 1155 | * configure a fifo; for non-shared endpoints, this may be called |
| 1166 | 1156 | * once for a tx fifo and once for an rx fifo. |
| ... | ... | |
| 1283 | 1273 | cfg = mode_5_cfg; |
| 1284 | 1274 | n = ARRAY_SIZE(mode_5_cfg); |
| 1285 | 1275 | break; |
| 1286 | case 6: | |
| 1287 | cfg = mode_6_cfg; | |
| 1288 | n = ARRAY_SIZE(mode_6_cfg); | |
| 1289 | break; | |
| 1290 | 1276 | } |
| 1291 | 1277 | |
| 1292 | 1278 | printk(KERN_DEBUG "%s: setup fifo_mode %d\n", |
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
