diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-02-04 15:23:08 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-02-04 15:23:08 +0000 |
commit | c41002971aeecd78e93ce553028f7cc01c4de777 (patch) | |
tree | aa18d6a89012476e264a618387ecef653a3c0a7d /target/linux/leon/patches-2.6.36/005-avoid_openprom_duplicates.patch | |
parent | 539e0b5b8418cac13b7f0b68254ebc2f8e1b40f7 (diff) | |
download | upstream-c41002971aeecd78e93ce553028f7cc01c4de777.tar.gz upstream-c41002971aeecd78e93ce553028f7cc01c4de777.tar.bz2 upstream-c41002971aeecd78e93ce553028f7cc01c4de777.zip |
leon: R.I.P.
It is broken since ~9 months and nobody takes care of that.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35488
Diffstat (limited to 'target/linux/leon/patches-2.6.36/005-avoid_openprom_duplicates.patch')
-rw-r--r-- | target/linux/leon/patches-2.6.36/005-avoid_openprom_duplicates.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/target/linux/leon/patches-2.6.36/005-avoid_openprom_duplicates.patch b/target/linux/leon/patches-2.6.36/005-avoid_openprom_duplicates.patch deleted file mode 100644 index 54bfd2726b..0000000000 --- a/target/linux/leon/patches-2.6.36/005-avoid_openprom_duplicates.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 486a578298b7ab45c3edfdce8d4feaef93c3229b Mon Sep 17 00:00:00 2001 -From: Daniel Hellstrom <daniel@gaisler.com> -Date: Thu, 16 Sep 2010 11:15:37 +0200 -Subject: [PATCH] SPARC/LEON: to avoid name duplicates in openprom fs when REG is not available the NAME now includes NODE ID when REG not present - -Signed-off-by: Daniel Hellstrom <daniel@gaisler.com> ---- - arch/sparc/kernel/prom_32.c | 27 +++++++++++++++++++-------- - 1 files changed, 19 insertions(+), 8 deletions(-) - ---- a/arch/sparc/kernel/prom_32.c -+++ b/arch/sparc/kernel/prom_32.c -@@ -136,18 +136,29 @@ static void __init ebus_path_component(s - /* "name:vendor:device@irq,addrlo" */ - static void __init ambapp_path_component(struct device_node *dp, char *tmp_buf) - { -- struct amba_prom_registers *regs; unsigned int *intr; -- unsigned int *device, *vendor; -+ struct amba_prom_registers *regs; -+ unsigned int *intr, *device, *vendor, reg0; - struct property *prop; -+ int interrupt = 0; - -+ /* In order to get a unique ID in the device tree (multiple AMBA devices -+ * may have the same name) the node number is printed -+ */ - prop = of_find_property(dp, "reg", NULL); -- if (!prop) -- return; -- regs = prop->value; -+ if (!prop) { -+ reg0 = (unsigned int)dp->phandle; -+ } else { -+ regs = prop->value; -+ reg0 = regs->phys_addr; -+ } -+ -+ /* Not all cores have Interrupt */ - prop = of_find_property(dp, "interrupts", NULL); - if (!prop) -- return; -- intr = prop->value; -+ intr = &interrupt; /* IRQ0 does not exist */ -+ else -+ intr = prop->value; -+ - prop = of_find_property(dp, "vendor", NULL); - if (!prop) - return; -@@ -159,7 +170,7 @@ static void __init ambapp_path_component - - sprintf(tmp_buf, "%s:%d:%d@%x,%x", - dp->name, *vendor, *device, -- *intr, regs->phys_addr); -+ *intr, reg0); - } - - static void __init __build_path_component(struct device_node *dp, char *tmp_buf) |