aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-03-22 20:23:17 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-03-22 20:23:17 +0000
commit5f6ec177ce55467d47f21af355d717b7b3ac0734 (patch)
treedb2aac023a7b76326377483a1c05b3e08848986f /target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci
parentb921092d91a151db10e6e4c0f87de8e617d30574 (diff)
downloadmaster-187ad058-5f6ec177ce55467d47f21af355d717b7b3ac0734.tar.gz
master-187ad058-5f6ec177ce55467d47f21af355d717b7b3ac0734.tar.bz2
master-187ad058-5f6ec177ce55467d47f21af355d717b7b3ac0734.zip
add brcm47xx-2.6 fixes from #1496
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6639 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci')
-rw-r--r--target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci/pcicore.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci/pcicore.c b/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci/pcicore.c
index 9800ce66e2..e025834950 100644
--- a/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci/pcicore.c
+++ b/target/linux/brcm47xx-2.6/files/drivers/ssb/driver_pci/pcicore.c
@@ -303,6 +303,8 @@ static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
udelay(150);
val |= SSB_PCICORE_CTL_RST; /* Deassert RST# */
pcicore_write32(pc, SSB_PCICORE_CTL, val);
+ val = SSB_PCICORE_ARBCTL_INTERN;
+ pcicore_write32(pc, SSB_PCICORE_ARBCTL, val);
udelay(1);
//TODO cardbus mode
@@ -329,6 +331,7 @@ static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
* The following needs change, if we want to port hostmode
* to non-MIPS platform. */
set_io_port_base((unsigned long)ioremap_nocache(SSB_PCI_MEM, 0x04000000));
+ mdelay(300);
register_pci_controller(&ssb_pcicore_controller);
}