* add md5sum for kernel * add some missing config symbols * add some ssb patches to make compat-wireless compile Thank you Peter Wagner for the patch SVN-Revision: 27009master
parent
8137e35a5d
commit
c69f2d8788
@ -0,0 +1,77 @@ |
||||
--- a/drivers/ssb/driver_pcicore.c
|
||||
+++ b/drivers/ssb/driver_pcicore.c
|
||||
@@ -476,30 +476,6 @@ static void ssb_pcie_mdio_write(struct s
|
||||
pcicore_write32(pc, mdio_control, 0);
|
||||
}
|
||||
|
||||
-static void ssb_broadcast_value(struct ssb_device *dev,
|
||||
- u32 address, u32 data)
|
||||
-{
|
||||
- /* This is used for both, PCI and ChipCommon core, so be careful. */
|
||||
- BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
|
||||
- BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
|
||||
-
|
||||
- ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
|
||||
- ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
|
||||
- ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
|
||||
- ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
|
||||
-}
|
||||
-
|
||||
-static void ssb_commit_settings(struct ssb_bus *bus)
|
||||
-{
|
||||
- struct ssb_device *dev;
|
||||
-
|
||||
- dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
|
||||
- if (WARN_ON(!dev))
|
||||
- return;
|
||||
- /* This forces an update of the cached registers. */
|
||||
- ssb_broadcast_value(dev, 0xFD8, 0);
|
||||
-}
|
||||
-
|
||||
int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
|
||||
struct ssb_device *dev)
|
||||
{
|
||||
--- a/drivers/ssb/main.c
|
||||
+++ b/drivers/ssb/main.c
|
||||
@@ -1330,6 +1330,31 @@ error:
|
||||
}
|
||||
EXPORT_SYMBOL(ssb_bus_powerup);
|
||||
|
||||
+static void ssb_broadcast_value(struct ssb_device *dev,
|
||||
+ u32 address, u32 data)
|
||||
+{
|
||||
+ /* This is used for both, PCI and ChipCommon core, so be careful. */
|
||||
+ BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
|
||||
+ BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
|
||||
+
|
||||
+ ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
|
||||
+ ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
|
||||
+ ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
|
||||
+ ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
|
||||
+}
|
||||
+
|
||||
+void ssb_commit_settings(struct ssb_bus *bus)
|
||||
+{
|
||||
+ struct ssb_device *dev;
|
||||
+
|
||||
+ dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
|
||||
+ if (WARN_ON(!dev))
|
||||
+ return;
|
||||
+ /* This forces an update of the cached registers. */
|
||||
+ ssb_broadcast_value(dev, 0xFD8, 0);
|
||||
+}
|
||||
+EXPORT_SYMBOL(ssb_commit_settings);
|
||||
+
|
||||
u32 ssb_admatch_base(u32 adm)
|
||||
{
|
||||
u32 base = 0;
|
||||
--- a/include/linux/ssb/ssb.h
|
||||
+++ b/include/linux/ssb/ssb.h
|
||||
@@ -518,6 +518,7 @@ extern int ssb_bus_may_powerdown(struct
|
||||
* Otherwise static always-on powercontrol will be used. */
|
||||
extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl);
|
||||
|
||||
+extern void ssb_commit_settings(struct ssb_bus *bus);
|
||||
|
||||
/* Various helper functions */
|
||||
extern u32 ssb_admatch_base(u32 adm);
|
@ -0,0 +1,49 @@ |
||||
From 1159024d4c0aafecaa0c6635c55153b4b39cc1c8 Mon Sep 17 00:00:00 2001
|
||||
From: "John W. Linville" <linville@tuxdriver.com>
|
||||
Date: Fri, 13 May 2011 09:23:47 -0400
|
||||
Subject: [PATCH] ssb: fix pcicore build breakage
|
||||
|
||||
drivers/ssb/main.c:1336: error: 'SSB_PCICORE_BCAST_ADDR' undeclared (first use in this function)
|
||||
drivers/ssb/main.c:1337: error: 'SSB_PCICORE_BCAST_DATA' undeclared (first use in this function)
|
||||
drivers/ssb/main.c:1349: error: 'struct ssb_pcicore' has no member named 'dev'
|
||||
|
||||
Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
|
||||
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
||||
---
|
||||
drivers/ssb/main.c | 14 ++++++++++----
|
||||
1 files changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/drivers/ssb/main.c
|
||||
+++ b/drivers/ssb/main.c
|
||||
@@ -1333,21 +1333,27 @@ EXPORT_SYMBOL(ssb_bus_powerup);
|
||||
static void ssb_broadcast_value(struct ssb_device *dev,
|
||||
u32 address, u32 data)
|
||||
{
|
||||
+#ifdef CONFIG_SSB_DRIVER_PCICORE
|
||||
/* This is used for both, PCI and ChipCommon core, so be careful. */
|
||||
BUILD_BUG_ON(SSB_PCICORE_BCAST_ADDR != SSB_CHIPCO_BCAST_ADDR);
|
||||
BUILD_BUG_ON(SSB_PCICORE_BCAST_DATA != SSB_CHIPCO_BCAST_DATA);
|
||||
+#endif
|
||||
|
||||
- ssb_write32(dev, SSB_PCICORE_BCAST_ADDR, address);
|
||||
- ssb_read32(dev, SSB_PCICORE_BCAST_ADDR); /* flush */
|
||||
- ssb_write32(dev, SSB_PCICORE_BCAST_DATA, data);
|
||||
- ssb_read32(dev, SSB_PCICORE_BCAST_DATA); /* flush */
|
||||
+ ssb_write32(dev, SSB_CHIPCO_BCAST_ADDR, address);
|
||||
+ ssb_read32(dev, SSB_CHIPCO_BCAST_ADDR); /* flush */
|
||||
+ ssb_write32(dev, SSB_CHIPCO_BCAST_DATA, data);
|
||||
+ ssb_read32(dev, SSB_CHIPCO_BCAST_DATA); /* flush */
|
||||
}
|
||||
|
||||
void ssb_commit_settings(struct ssb_bus *bus)
|
||||
{
|
||||
struct ssb_device *dev;
|
||||
|
||||
+#ifdef CONFIG_SSB_DRIVER_PCICORE
|
||||
dev = bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev;
|
||||
+#else
|
||||
+ dev = bus->chipco.dev;
|
||||
+#endif
|
||||
if (WARN_ON(!dev))
|
||||
return;
|
||||
/* This forces an update of the cached registers. */
|
Loading…
Reference in new issue