aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2014-12-05 16:11:03 +0000
committerRafał Miłecki <zajec5@gmail.com>2014-12-05 16:11:03 +0000
commit8033ccc9757fa1aed5a286e1f8992a53611ccfa5 (patch)
treea968d6cbcfffc76684834828aa969b9ff74350f4 /target/linux/bcm53xx
parente0342d268400cf810c737d98f79dbc12144d53d9 (diff)
downloadupstream-8033ccc9757fa1aed5a286e1f8992a53611ccfa5.tar.gz
upstream-8033ccc9757fa1aed5a286e1f8992a53611ccfa5.tar.bz2
upstream-8033ccc9757fa1aed5a286e1f8992a53611ccfa5.zip
kernel: update bcma up to 2014-10-27
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43527
Diffstat (limited to 'target/linux/bcm53xx')
-rw-r--r--target/linux/bcm53xx/patches-3.14/122-bcma-fill-core-details-for-every-device.patch65
-rw-r--r--target/linux/bcm53xx/patches-3.18/050-bcma-fill-core-details-for-every-device.patch65
2 files changed, 0 insertions, 130 deletions
diff --git a/target/linux/bcm53xx/patches-3.14/122-bcma-fill-core-details-for-every-device.patch b/target/linux/bcm53xx/patches-3.14/122-bcma-fill-core-details-for-every-device.patch
deleted file mode 100644
index fadf03cbcd..0000000000
--- a/target/linux/bcm53xx/patches-3.14/122-bcma-fill-core-details-for-every-device.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 487b997353e2e3afe9c452b20ff5e4320d76e9c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Thu, 2 Oct 2014 12:28:54 +0200
-Subject: [PATCH][RFC] bcma: fill core details for every device
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We were setting things like dma_dev, IRQ, etc. during core registration
-only. We need such info for cores handled internally (e.g. ChipCommon)
-as well.
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
- drivers/bcma/bcma_private.h | 1 +
- drivers/bcma/main.c | 9 ++++++---
- drivers/bcma/scan.c | 1 +
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
---- a/drivers/bcma/bcma_private.h
-+++ b/drivers/bcma/bcma_private.h
-@@ -24,6 +24,7 @@ struct bcma_bus;
- /* main.c */
- bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
- int timeout);
-+void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core);
- int bcma_bus_register(struct bcma_bus *bus);
- void bcma_bus_unregister(struct bcma_bus *bus);
- int __init bcma_bus_early_register(struct bcma_bus *bus,
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -172,10 +172,8 @@ static void bcma_of_fill_device(struct p
- }
- #endif /* CONFIG_OF */
-
--static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
-+void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)
- {
-- int err;
--
- core->dev.release = bcma_release_core_dev;
- core->dev.bus = &bcma_bus_type;
- dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
-@@ -199,6 +197,11 @@ static void bcma_register_core(struct bc
- case BCMA_HOSTTYPE_SDIO:
- break;
- }
-+}
-+
-+static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
-+{
-+ int err;
-
- err = device_register(&core->dev);
- if (err) {
---- a/drivers/bcma/scan.c
-+++ b/drivers/bcma/scan.c
-@@ -505,6 +505,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
- bus->nr_cores++;
- other_core = bcma_find_core_reverse(bus, core->id.id);
- core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;
-+ bcma_prepare_core(bus, core);
-
- bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
- core->core_index, bcma_device_name(&core->id),
diff --git a/target/linux/bcm53xx/patches-3.18/050-bcma-fill-core-details-for-every-device.patch b/target/linux/bcm53xx/patches-3.18/050-bcma-fill-core-details-for-every-device.patch
deleted file mode 100644
index 17b5b10b08..0000000000
--- a/target/linux/bcm53xx/patches-3.18/050-bcma-fill-core-details-for-every-device.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 487b997353e2e3afe9c452b20ff5e4320d76e9c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-Date: Thu, 2 Oct 2014 12:28:54 +0200
-Subject: [PATCH][RFC] bcma: fill core details for every device
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We were setting things like dma_dev, IRQ, etc. during core registration
-only. We need such info for cores handled internally (e.g. ChipCommon)
-as well.
-
-Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
----
- drivers/bcma/bcma_private.h | 1 +
- drivers/bcma/main.c | 9 ++++++---
- drivers/bcma/scan.c | 1 +
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
---- a/drivers/bcma/bcma_private.h
-+++ b/drivers/bcma/bcma_private.h
-@@ -24,6 +24,7 @@ struct bcma_bus;
- /* main.c */
- bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value,
- int timeout);
-+void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core);
- int bcma_bus_register(struct bcma_bus *bus);
- void bcma_bus_unregister(struct bcma_bus *bus);
- int __init bcma_bus_early_register(struct bcma_bus *bus,
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -169,10 +169,8 @@ static void bcma_of_fill_device(struct p
- }
- #endif /* CONFIG_OF */
-
--static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
-+void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core)
- {
-- int err;
--
- core->dev.release = bcma_release_core_dev;
- core->dev.bus = &bcma_bus_type;
- dev_set_name(&core->dev, "bcma%d:%d", bus->num, core->core_index);
-@@ -196,6 +194,11 @@ static void bcma_register_core(struct bc
- case BCMA_HOSTTYPE_SDIO:
- break;
- }
-+}
-+
-+static void bcma_register_core(struct bcma_bus *bus, struct bcma_device *core)
-+{
-+ int err;
-
- err = device_register(&core->dev);
- if (err) {
---- a/drivers/bcma/scan.c
-+++ b/drivers/bcma/scan.c
-@@ -505,6 +505,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
- bus->nr_cores++;
- other_core = bcma_find_core_reverse(bus, core->id.id);
- core->core_unit = (other_core == NULL) ? 0 : other_core->core_unit + 1;
-+ bcma_prepare_core(bus, core);
-
- bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
- core->core_index, bcma_device_name(&core->id),