mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
ssb: update ssb to version from linux-next-20110311
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26127 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke
@@ -1,51 +0,0 @@
|
||||
From 99dfec6e793651963ede3c2721b9ff3c81e3aeac Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Sat, 27 Nov 2010 14:04:36 +0100
|
||||
Subject: [PATCH 6/6] sb: fix nvram_get on bcm47xx platform
|
||||
|
||||
The nvram_get function was never in the mainline kernel, it only
|
||||
existed in an external OpenWrt patch. Use nvram_getenv function, which
|
||||
is in mainline and use an include instead of an extra function
|
||||
declaration.
|
||||
et0macaddr contains the mac address in text from like
|
||||
00:11:22:33:44:55. We have to parse it before adding it into macaddr.
|
||||
|
||||
nvram_parse_macaddr will be merged into asm/mach-bcm47xx/nvram.h though
|
||||
the MIPS git tree and will be available soon. It will not build now
|
||||
without nvram_parse_macaddr, but it haven't done before.
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
include/linux/ssb/ssb_driver_gige.h | 17 +++++++++++------
|
||||
1 files changed, 11 insertions(+), 6 deletions(-)
|
||||
|
||||
--- a/include/linux/ssb/ssb_driver_gige.h
|
||||
+++ b/include/linux/ssb/ssb_driver_gige.h
|
||||
@@ -96,16 +96,21 @@ static inline bool ssb_gige_must_flush_p
|
||||
return 0;
|
||||
}
|
||||
|
||||
-extern char * nvram_get(const char *name);
|
||||
+#ifdef CONFIG_BCM47XX
|
||||
+#include <asm/mach-bcm47xx/nvram.h>
|
||||
/* Get the device MAC address */
|
||||
static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
|
||||
{
|
||||
-#ifdef CONFIG_BCM47XX
|
||||
- char *res = nvram_get("et0macaddr");
|
||||
- if (res)
|
||||
- memcpy(macaddr, res, 6);
|
||||
-#endif
|
||||
+ char buf[20];
|
||||
+ if (nvram_getenv("et0macaddr", buf, sizeof(buf)) < 0)
|
||||
+ return;
|
||||
+ nvram_parse_macaddr(buf, macaddr);
|
||||
}
|
||||
+#else
|
||||
+static inline void ssb_gige_get_macaddr(struct pci_dev *pdev, u8 *macaddr)
|
||||
+{
|
||||
+}
|
||||
+#endif
|
||||
|
||||
extern int ssb_gige_pcibios_plat_dev_init(struct ssb_device *sdev,
|
||||
struct pci_dev *pdev);
|
||||
@@ -31,7 +31,7 @@
|
||||
}
|
||||
--- a/drivers/ssb/main.c
|
||||
+++ b/drivers/ssb/main.c
|
||||
@@ -1074,6 +1074,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
|
||||
@@ -1104,6 +1104,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
|
||||
|
||||
if (bus->chip_id == 0x5365) {
|
||||
rate = 100000000;
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
From 3cfa0a9d4b4cc30ec735c5c9535ff493bae24d08 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Sat, 27 Nov 2010 18:14:23 +0100
|
||||
Subject: [PATCH] ssb: Add sysfs attributes to ssb devices
|
||||
|
||||
Make it possible to read out the attributes, till now only show on
|
||||
dmesg, through sysfs.
|
||||
|
||||
This patch was some time in OpenWrt.
|
||||
|
||||
Signed-off-by: Bernhard Loos <bernhardloos@googlemail.com>
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
drivers/ssb/main.c | 30 ++++++++++++++++++++++++++++++
|
||||
1 files changed, 30 insertions(+), 0 deletions(-)
|
||||
|
||||
--- a/drivers/ssb/main.c
|
||||
+++ b/drivers/ssb/main.c
|
||||
@@ -384,6 +384,35 @@ static int ssb_device_uevent(struct devi
|
||||
ssb_dev->id.revision);
|
||||
}
|
||||
|
||||
+#define ssb_config_attr(attrib, field, format_string) \
|
||||
+static ssize_t \
|
||||
+attrib##_show(struct device *dev, struct device_attribute *attr, char *buf) \
|
||||
+{ \
|
||||
+ return sprintf(buf, format_string, dev_to_ssb_dev(dev)->field); \
|
||||
+}
|
||||
+
|
||||
+ssb_config_attr(core_num, core_index, "%u\n")
|
||||
+ssb_config_attr(coreid, id.coreid, "0x%04x\n")
|
||||
+ssb_config_attr(vendor, id.vendor, "0x%04x\n")
|
||||
+ssb_config_attr(revision, id.revision, "%u\n")
|
||||
+ssb_config_attr(irq, irq, "%u\n")
|
||||
+static ssize_t
|
||||
+name_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
+{
|
||||
+ return sprintf(buf, "%s\n",
|
||||
+ ssb_core_name(dev_to_ssb_dev(dev)->id.coreid));
|
||||
+}
|
||||
+
|
||||
+static struct device_attribute ssb_device_attrs[] = {
|
||||
+ __ATTR_RO(name),
|
||||
+ __ATTR_RO(core_num),
|
||||
+ __ATTR_RO(coreid),
|
||||
+ __ATTR_RO(vendor),
|
||||
+ __ATTR_RO(revision),
|
||||
+ __ATTR_RO(irq),
|
||||
+ __ATTR_NULL,
|
||||
+};
|
||||
+
|
||||
static struct bus_type ssb_bustype = {
|
||||
.name = "ssb",
|
||||
.match = ssb_bus_match,
|
||||
@@ -393,6 +422,7 @@ static struct bus_type ssb_bustype = {
|
||||
.suspend = ssb_device_suspend,
|
||||
.resume = ssb_device_resume,
|
||||
.uevent = ssb_device_uevent,
|
||||
+ .dev_attrs = ssb_device_attrs,
|
||||
};
|
||||
|
||||
static void ssb_buses_lock(void)
|
||||
@@ -25,7 +25,7 @@
|
||||
ssb_printk(KERN_ERR PFX
|
||||
--- a/include/linux/ssb/ssb.h
|
||||
+++ b/include/linux/ssb/ssb.h
|
||||
@@ -151,9 +151,16 @@ struct ssb_bus_ops {
|
||||
@@ -155,9 +155,16 @@ struct ssb_bus_ops {
|
||||
#define SSB_DEV_MINI_MACPHY 0x823
|
||||
#define SSB_DEV_ARM_1176 0x824
|
||||
#define SSB_DEV_ARM_7TDMI 0x825
|
||||
@@ -60,7 +60,7 @@
|
||||
|
||||
/* Enumeration space constants */
|
||||
#define SSB_CORE_SIZE 0x1000 /* Size of a core MMIO area */
|
||||
@@ -453,5 +455,41 @@ enum {
|
||||
@@ -499,5 +501,41 @@ enum {
|
||||
#define SSB_ADM_BASE2 0xFFFF0000 /* Type2 base address for the core */
|
||||
#define SSB_ADM_BASE2_SHIFT 16
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
bool ssb_is_sprom_available(struct ssb_bus *bus)
|
||||
--- a/include/linux/ssb/ssb.h
|
||||
+++ b/include/linux/ssb/ssb.h
|
||||
@@ -401,6 +401,7 @@ extern bool ssb_is_sprom_available(struc
|
||||
@@ -412,6 +412,7 @@ extern bool ssb_is_sprom_available(struc
|
||||
/* Set a fallback SPROM.
|
||||
* See kdoc at the function definition for complete documentation. */
|
||||
extern int ssb_arch_set_fallback_sprom(const struct ssb_sprom *sprom);
|
||||
|
||||
Reference in New Issue
Block a user