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-2.6.39 | |
| 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-2.6.39')
| -rw-r--r-- | target/linux/generic/patches-2.6.39/020-ssb_update.patch | 18 | ||||
| -rw-r--r-- | target/linux/generic/patches-2.6.39/025-bcma_backport.patch | 3 |
2 files changed, 17 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.39/020-ssb_update.patch b/target/linux/generic/patches-2.6.39/020-ssb_update.patch index 1ee3ad9..8e4ac19 100644 --- a/target/linux/generic/patches-2.6.39/020-ssb_update.patch +++ b/target/linux/generic/patches-2.6.39/020-ssb_update.patch @@ -587,6 +587,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 */ @@ -1117,23 +1118,22 @@ static u32 ssb_tmslow_reject_bitmask(str { u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV; @@ -749,15 +760,16 @@ return 1; } #endif /* CONFIG_SSB_PCIHOST */ -@@ -307,7 +310,7 @@ int ssb_bus_scan(struct ssb_bus *bus, +@@ -307,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_word(bus->host_pci, PCI_REVISION_ID, -+ pci_read_config_byte(bus->host_pci, PCI_REVISION_ID, - &bus->chip_rev); +- &bus->chip_rev); ++ bus->chip_rev = bus->host_pci->revision; bus->chip_package = 0; } else { + bus->chip_id = 0x4710; --- a/drivers/ssb/sprom.c +++ b/drivers/ssb/sprom.c @@ -17,7 +17,7 @@ diff --git a/target/linux/generic/patches-2.6.39/025-bcma_backport.patch b/target/linux/generic/patches-2.6.39/025-bcma_backport.patch index 333a3b5..07b278e 100644 --- a/target/linux/generic/patches-2.6.39/025-bcma_backport.patch +++ b/target/linux/generic/patches-2.6.39/025-bcma_backport.patch @@ -916,7 +916,7 @@ +} --- /dev/null +++ b/drivers/bcma/main.c -@@ -0,0 +1,254 @@ +@@ -0,0 +1,255 @@ +/* + * Broadcom specific AMBA + * Bus subsystem @@ -926,6 +926,7 @@ + +#include "bcma_private.h" +#include <linux/bcma/bcma.h> ++#include <linux/slab.h> + +MODULE_DESCRIPTION("Broadcom's specific AMBA driver"); +MODULE_LICENSE("GPL"); |