KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

final fix for BCM5354 USB cores, hopefully

Browse source 
SVN-Revision: 12499
This commit is contained in:
Imre Kaloz 2008-09-02 11:28:57 +00:00
parent 059e7be269
commit 88041e0f1b
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
target/linux/brcm-2.4/files/arch/mips/bcm947xx/pcibios.c
View file

@ -292,6 +292,7 @@ pcibios_enable_device(struct pci_dev *dev, int mask)
* after calling pcibios_enable_device(). * after calling pcibios_enable_device().
*/ */
if (sb_coreid(sbh) == SB_USB) { 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_disable(sbh, sb_coreflags(sbh, 0, 0));
sb_core_reset(sbh, 1 << 29, 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. * phy components out of reset.
*/ */
else if (sb_coreid(sbh) == SB_USB20H) { 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)) { if (!sb_iscoreup(sbh)) {
printk(KERN_INFO "SB USB20H resetting\n");
sb_core_reset(sbh, 0, 0); sb_core_reset(sbh, 0, 0);
writel(0x7FF, (ulong)regs + 0x200); writel(0x7FF, (ulong)regs + 0x200);
udelay(1); udelay(1);
} }
/* PRxxxx: War for 5354 failures. */ /* PRxxxx: War for 5354 failures. */
if (sb_corerev(sbh) == 1) { if (corerev == 1 || corerev == 2) {
uint32 tmp; uint32 tmp;
/* Change Flush control reg */ /* Change Flush control reg */
@ -320,14 +330,14 @@ pcibios_enable_device(struct pci_dev *dev, int mask)
tmp &= ~8; tmp &= ~8;
writel(tmp, (uintptr)regs + 0x400); writel(tmp, (uintptr)regs + 0x400);
tmp = readl((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 */ /* Change Shim control reg */
tmp = readl((uintptr)regs + 0x304); tmp = readl((uintptr)regs + 0x304);
tmp &= ~0x100; tmp &= ~0x100;
writel(tmp, (uintptr)regs + 0x304); writel(tmp, (uintptr)regs + 0x304);
tmp = readl((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 } else