qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-02 19:54:04 +02:00
Code

[kernel] ssb: remove reference to missing SDIO function from last 2.6.31 ssb update

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18033 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2009-10-11 14:51:40 +00:00
parent b06dc645db
commit 824494106b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/linux/generic-2.6/patches-2.6.31/941-ssb_update.patch
View File

@ -237,17 +237,16 @@
} }
--- a/drivers/ssb/scan.c --- a/drivers/ssb/scan.c
+++ b/drivers/ssb/scan.c +++ b/drivers/ssb/scan.c
@@ -175,6 +175,9 @@ static u32 scan_read32(struct ssb_bus *b @@ -175,6 +175,8 @@ static u32 scan_read32(struct ssb_bus *b
} else } else
ssb_pcmcia_switch_segment(bus, 0); ssb_pcmcia_switch_segment(bus, 0);
break; break;
+ case SSB_BUSTYPE_SDIO: + case SSB_BUSTYPE_SDIO:
+ offset += current_coreidx * SSB_CORE_SIZE; + break;
+ return ssb_sdio_scan_read32(bus, offset);
} }
return readl(bus->mmio + offset); return readl(bus->mmio + offset);
} }
@@ -188,6 +191,8 @@ static int scan_switchcore(struct ssb_bu @@ -188,6 +190,8 @@ static int scan_switchcore(struct ssb_bu
return ssb_pci_switch_coreidx(bus, coreidx); return ssb_pci_switch_coreidx(bus, coreidx);
case SSB_BUSTYPE_PCMCIA: case SSB_BUSTYPE_PCMCIA:
return ssb_pcmcia_switch_coreidx(bus, coreidx); return ssb_pcmcia_switch_coreidx(bus, coreidx);
@ -256,7 +255,7 @@
} }
return 0; return 0;
} }
@@ -206,6 +211,8 @@ void ssb_iounmap(struct ssb_bus *bus) @@ -206,6 +210,8 @@ void ssb_iounmap(struct ssb_bus *bus)
SSB_BUG_ON(1); /* Can't reach this code. */ SSB_BUG_ON(1); /* Can't reach this code. */
#endif #endif
break; break;
@ -265,7 +264,7 @@
} }
bus->mmio = NULL; bus->mmio = NULL;
bus->mapped_device = NULL; bus->mapped_device = NULL;
@@ -230,6 +237,8 @@ static void __iomem *ssb_ioremap(struct @@ -230,6 +236,8 @@ static void __iomem *ssb_ioremap(struct
SSB_BUG_ON(1); /* Can't reach this code. */ SSB_BUG_ON(1); /* Can't reach this code. */
#endif #endif
break; break;