diff options
Diffstat (limited to 'target/linux/leon/patches/005-avoid_openprom_duplicates.patch')
| -rw-r--r-- | target/linux/leon/patches/005-avoid_openprom_duplicates.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/leon/patches/005-avoid_openprom_duplicates.patch b/target/linux/leon/patches/005-avoid_openprom_duplicates.patch new file mode 100644 index 000000000..54bfd2726 --- /dev/null +++ b/target/linux/leon/patches/005-avoid_openprom_duplicates.patch @@ -0,0 +1,58 @@ +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) |