kernel: update ssb and bcma to linux-next next-20110627
[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-2.6.39 / 240-ssb_no_sprom_on_pci.patch
1 --- a/drivers/ssb/driver_pcicore.c
2 +++ b/drivers/ssb/driver_pcicore.c
3 @@ -412,16 +412,6 @@ static int __devinit pcicore_is_in_hostm
4 * Workarounds.
5 **************************************************/
6
7 -static void __devinit ssb_pcicore_fix_sprom_core_index(struct ssb_pcicore *pc)
8 -{
9 - u16 tmp = pcicore_read16(pc, SSB_PCICORE_SPROM(0));
10 - if (((tmp & 0xF000) >> 12) != pc->dev->core_index) {
11 - tmp &= ~0xF000;
12 - tmp |= (pc->dev->core_index << 12);
13 - pcicore_write16(pc, SSB_PCICORE_SPROM(0), tmp);
14 - }
15 -}
16 -
17 static u8 ssb_pcicore_polarity_workaround(struct ssb_pcicore *pc)
18 {
19 return (ssb_pcie_read(pc, 0x204) & 0x10) ? 0xC0 : 0x80;
20 @@ -529,8 +519,6 @@ void __devinit ssb_pcicore_init(struct s
21 if (!ssb_device_is_enabled(dev))
22 ssb_device_enable(dev, 0);
23
24 - ssb_pcicore_fix_sprom_core_index(pc);
25 -
26 #ifdef CONFIG_SSB_PCICORE_HOSTMODE
27 pc->hostmode = pcicore_is_in_hostmode(pc);
28 if (pc->hostmode)