final fix for BCM5354 USB cores, hopefully
SVN-Revision: 12499
This commit is contained in:
parent
059e7be269
commit
88041e0f1b
1 changed files with 13 additions and 3 deletions
|
@ -292,6 +292,7 @@ pcibios_enable_device(struct pci_dev *dev, int mask)
|
|||
* after calling pcibios_enable_device().
|
||||
*/
|
||||
if (sb_coreid(sbh) == SB_USB) {
|
||||
printk(KERN_INFO "SB USB 1.1 init\n");
|
||||
sb_core_disable(sbh, sb_coreflags(sbh, 0, 0));
|
||||
sb_core_reset(sbh, 1 << 29, 0);
|
||||
}
|
||||
|
@ -306,13 +307,22 @@ pcibios_enable_device(struct pci_dev *dev, int mask)
|
|||
* phy components out of reset.
|
||||
*/
|
||||
else if (sb_coreid(sbh) == SB_USB20H) {
|
||||
|
||||
uint corerev = sb_corerev(sbh);
|
||||
|
||||
printk(KERN_INFO "SB USB20H init\n");
|
||||
printk(KERN_INFO "SB COREREV: %d\n", corerev);
|
||||
|
||||
if (!sb_iscoreup(sbh)) {
|
||||
|
||||
printk(KERN_INFO "SB USB20H resetting\n");
|
||||
|
||||
sb_core_reset(sbh, 0, 0);
|
||||
writel(0x7FF, (ulong)regs + 0x200);
|
||||
udelay(1);
|
||||
}
|
||||
/* PRxxxx: War for 5354 failures. */
|
||||
if (sb_corerev(sbh) == 1) {
|
||||
if (corerev == 1 || corerev == 2) {
|
||||
uint32 tmp;
|
||||
|
||||
/* Change Flush control reg */
|
||||
|
@ -320,14 +330,14 @@ pcibios_enable_device(struct pci_dev *dev, int mask)
|
|||
tmp &= ~8;
|
||||
writel(tmp, (uintptr)regs + 0x400);
|
||||
tmp = readl((uintptr)regs + 0x400);
|
||||
printk("USB20H fcr: 0x%x\n", tmp);
|
||||
printk(KERN_INFO "USB20H fcr: 0x%x\n", tmp);
|
||||
|
||||
/* Change Shim control reg */
|
||||
tmp = readl((uintptr)regs + 0x304);
|
||||
tmp &= ~0x100;
|
||||
writel(tmp, (uintptr)regs + 0x304);
|
||||
tmp = readl((uintptr)regs + 0x304);
|
||||
printk("USB20H shim cr: 0x%x\n", tmp);
|
||||
printk(KERN_INFO "USB20H shim cr: 0x%x\n", tmp);
|
||||
}
|
||||
|
||||
} else
|
||||
|
|
Loading…
Reference in a new issue