projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-florian' of git://gitorious.org/linux-omap-dss2/linux into fbdev...
[platform/kernel/linux-starfive.git]
/
drivers
/
ssb
/
driver_pcicore.c
diff --git
a/drivers/ssb/driver_pcicore.c
b/drivers/ssb/driver_pcicore.c
index
84c934c
..
520e828
100644
(file)
--- a/
drivers/ssb/driver_pcicore.c
+++ b/
drivers/ssb/driver_pcicore.c
@@
-517,10
+517,14
@@
static void ssb_pcicore_pcie_setup_workarounds(struct ssb_pcicore *pc)
static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
{
static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
{
- ssb_pcicore_fix_sprom_core_index(pc);
+ struct ssb_device *pdev = pc->dev;
+ struct ssb_bus *bus = pdev->bus;
+
+ if (bus->bustype == SSB_BUSTYPE_PCI)
+ ssb_pcicore_fix_sprom_core_index(pc);
/* Disable PCI interrupts. */
/* Disable PCI interrupts. */
- ssb_write32(p
c->
dev, SSB_INTVEC, 0);
+ ssb_write32(pdev, SSB_INTVEC, 0);
/* Additional PCIe always once-executed workarounds */
if (pc->dev->id.coreid == SSB_DEV_PCIE) {
/* Additional PCIe always once-executed workarounds */
if (pc->dev->id.coreid == SSB_DEV_PCIE) {