From 2af4f6f634492487a02685e2ad4184b98d574572 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 28 Jun 2011 19:33:50 +0000 Subject: kernel: update ssb and bcma to linux-next next-20110628 SVN-Revision: 27299 --- .../linux/generic/patches-3.0/020-ssb_update.patch | 23 ++++++++++++++++++++++ .../generic/patches-3.0/025-bcma_backport.patch | 14 ++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) (limited to 'target/linux/generic/patches-3.0') 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 3282ff0d7a..a310d90f92 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; diff --git a/target/linux/generic/patches-3.0/025-bcma_backport.patch b/target/linux/generic/patches-3.0/025-bcma_backport.patch index 8f02d9e80b..1e61794701 100644 --- a/target/linux/generic/patches-3.0/025-bcma_backport.patch +++ b/target/linux/generic/patches-3.0/025-bcma_backport.patch @@ -200,7 +200,15 @@ }; --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -89,6 +89,8 @@ static int bcma_register_cores(struct bc +@@ -7,6 +7,7 @@ + + #include "bcma_private.h" + #include ++#include + + MODULE_DESCRIPTION("Broadcom's specific AMBA driver"); + MODULE_LICENSE("GPL"); +@@ -89,6 +90,8 @@ static int bcma_register_cores(struct bc switch (bus->hosttype) { case BCMA_HOSTTYPE_PCI: core->dev.parent = &bus->host_pci->dev; @@ -209,7 +217,7 @@ break; case BCMA_HOSTTYPE_NONE: case BCMA_HOSTTYPE_SDIO: -@@ -144,6 +146,13 @@ int bcma_bus_register(struct bcma_bus *b +@@ -144,6 +147,13 @@ int bcma_bus_register(struct bcma_bus *b bcma_core_pci_init(&bus->drv_pci); } @@ -223,7 +231,7 @@ /* Register found cores */ bcma_register_cores(bus); -@@ -151,13 +160,11 @@ int bcma_bus_register(struct bcma_bus *b +@@ -151,13 +161,11 @@ int bcma_bus_register(struct bcma_bus *b return 0; } -- cgit v1.2.3