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:
@@ -31,7 +31,7 @@
|
||||
}
|
||||
--- a/drivers/ssb/main.c
|
||||
+++ b/drivers/ssb/main.c
|
||||
@@ -1073,6 +1073,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
|
||||
@@ -1103,6 +1103,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
|
||||
@@ -383,6 +383,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,
|
||||
@@ -392,6 +421,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 */
|
||||
@@ -454,5 +456,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
|
||||
@@ -408,6 +408,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