[#6038] musb + PM won't compile on Blackfin with 2.6.34
Submitted By: Ian Jeffray
Open Date
2010-05-22 10:54:31
Priority:
Medium Assignee:
Cliff Cai
Status:
Open Fixed In Release:
N/A
Found In Release:
snaps Release:
Trunk
Category:
Make Errors Board:
N/A
Processor:
ALL Silicon Revision:
Is this bug repeatable?:
Yes Resolution:
Fixed
Uboot version or rev.:
Toolchain version or rev.:
2009R1.5
App binary format:
N/A
Summary: musb + PM won't compile on Blackfin with 2.6.34
Details:
drivers/usb/musb/musb_core.c: In function ‘musb_save_context’:
drivers/usb/musb/musb_core.c:2231: error: void value not ignored as it ought to be
m
The line in question reads thus:
musb_context.index_regs[i].txhubport =
musb_read_txhubport(musb_base, i);
This is because Blackfin is specialcased in musb_regs.h, and has this:
static inline void musb_read_txhubport(void __iomem *mbase, u8 epnum)
{
}
This one function stands out as being different from all its friends in that it should return a u8 ... but has been declared void. Suggest changing to match other platform prototypes and return 0 ?
Follow-ups
--- Ian Jeffray 2010-05-22 10:56:43
Furthermore, once this is fixed, the link fails:
drivers/built-in.o: In function `musb_restore_context':
(.text+0x417c0): undefined reference to `musb_platform_restore_context'
drivers/built-in.o: In function `musb_save_context':
(.text+0x419be): undefined reference to `musb_platform_save_context'
This is because musb_platform_[save|restore]_context has only been written for
omap2430 and TUSB6010 it seems. Davinci and Blackfin have been left out.
Could/should just copy the TUSB6010 nops?
--- Ian Jeffray 2010-05-22 11:04:50
Attached patch which "works for me" but I'm not too familiar with this
area of the code to know if this is eaxctly the best fix.
--- Ian Jeffray 2010-05-22 11:07:45
Corrected patch (editor mangled things)
--- Mike Frysinger 2010-05-22 22:39:18
that looks fine to me, so ive committed it. unless Cliff has some correction
...
Files
Changes
Commits
Dependencies
Duplicates
Associations
Tags
File Name File Type File Size Posted By
musb-with-pm-blackfin.patch application/octet-stream 1298 Ian Jeffray
musb-with-pm-blackfin.patch application/octet-stream 1120 Ian Jeffray