diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-28 19:33:50 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-28 19:33:50 +0000 |
| commit | 2af4f6f634492487a02685e2ad4184b98d574572 (patch) | |
| tree | e05afc7c9c7ad33cb4b5a12700eda8cdcbb4b198 /target/linux/generic/patches-3.0/020-ssb_update.patch | |
| parent | c5821c1a3a94060be1c38315bfdf122aee5567c1 (diff) | |
| download | mtk-20170518-2af4f6f634492487a02685e2ad4184b98d574572.zip mtk-20170518-2af4f6f634492487a02685e2ad4184b98d574572.tar.gz mtk-20170518-2af4f6f634492487a02685e2ad4184b98d574572.tar.bz2 | |
kernel: update ssb and bcma to linux-next next-20110628
SVN-Revision: 27299
Diffstat (limited to 'target/linux/generic/patches-3.0/020-ssb_update.patch')
| -rw-r--r-- | target/linux/generic/patches-3.0/020-ssb_update.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.0/020-ssb_update.patch b/target/linux/generic/patches-3.0/020-ssb_update.patch index 3282ff0..a310d90 100644 --- a/target/linux/generic/patches-3.0/020-ssb_update.patch +++ b/target/linux/generic/patches-3.0/020-ssb_update.patch @@ -166,6 +166,17 @@ { int err; +@@ -1001,8 +1002,8 @@ u32 ssb_calc_clock_rate(u32 plltype, u32 + switch (plltype) { + case SSB_PLLTYPE_6: /* 100/200 or 120/240 only */ + if (m & SSB_CHIPCO_CLK_T6_MMASK) +- return SSB_CHIPCO_CLK_T6_M0; +- return SSB_CHIPCO_CLK_T6_M1; ++ return SSB_CHIPCO_CLK_T6_M1; ++ return SSB_CHIPCO_CLK_T6_M0; + case SSB_PLLTYPE_1: /* 48Mhz base, 3 dividers */ + case SSB_PLLTYPE_3: /* 25Mhz, 2 dividers */ + case SSB_PLLTYPE_4: /* 48Mhz, 4 dividers */ --- a/drivers/ssb/pcihost_wrapper.c +++ b/drivers/ssb/pcihost_wrapper.c @@ -53,8 +53,8 @@ static int ssb_pcihost_resume(struct pci @@ -188,3 +199,15 @@ { driver->probe = ssb_pcihost_probe; driver->remove = ssb_pcihost_remove; +--- a/drivers/ssb/scan.c ++++ b/drivers/ssb/scan.c +@@ -310,8 +310,7 @@ int ssb_bus_scan(struct ssb_bus *bus, + } else { + if (bus->bustype == SSB_BUSTYPE_PCI) { + bus->chip_id = pcidev_to_chipid(bus->host_pci); +- pci_read_config_byte(bus->host_pci, PCI_REVISION_ID, +- &bus->chip_rev); ++ bus->chip_rev = bus->host_pci->revision; + bus->chip_package = 0; + } else { + bus->chip_id = 0x4710; |