diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-05-23 07:50:50 +0900 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-05-23 08:28:02 +0900 |
| commit | ba52464a629fab2493925007b00f2ca65d02ed4e (patch) | |
| tree | 89e9308cbdd7002a32bf7f3a42b8442bf0ba54d9 /drivers/of | |
| parent | 07e461cd7e73a84f0e3757932b93cc80976fd749 (diff) | |
| download | op-kernel-dev-ba52464a629fab2493925007b00f2ca65d02ed4e.zip op-kernel-dev-ba52464a629fab2493925007b00f2ca65d02ed4e.tar.gz | |
of: Stop naming platform_device using dcr address
There is now a way to ensure all platform devices get a unique name when
populated from the device tree, and the DCR_NATIVE code path is broken
anyway. PowerPC Cell (PS3) is the only platform that actually uses this
path. Most likely nobody will notice if it is killed. Remove the code
and associated ugly #ifdef.
The user-visible impact of this patch is that any DCR device on Cell
will get a new name in the /sys/devices hierarchy.
Signed-off-by: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/platform.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 95c133a..52780a7 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -51,10 +51,6 @@ struct platform_device *of_find_device_by_node(struct device_node *np) } EXPORT_SYMBOL(of_find_device_by_node); -#if defined(CONFIG_PPC_DCR) -#include <asm/dcr.h> -#endif - #ifdef CONFIG_OF_ADDRESS /* * The following routines scan a subtree and registers a device for @@ -78,26 +74,6 @@ void of_device_make_bus_id(struct device *dev) const __be32 *reg; u64 addr; -#ifdef CONFIG_PPC_DCR - /* - * If it's a DCR based device, use 'd' for native DCRs - * and 'D' for MMIO DCRs. - */ - reg = of_get_property(node, "dcr-reg", NULL); - if (reg) { -#ifdef CONFIG_PPC_DCR_NATIVE - dev_set_name(dev, "d%x.%s", *reg, node->name); -#else /* CONFIG_PPC_DCR_NATIVE */ - u64 addr = of_translate_dcr_address(node, *reg, NULL); - if (addr != OF_BAD_ADDR) { - dev_set_name(dev, "D%llx.%s", - (unsigned long long)addr, node->name); - return; - } -#endif /* !CONFIG_PPC_DCR_NATIVE */ - } -#endif /* CONFIG_PPC_DCR */ - /* Construct the name, using parent nodes if necessary to ensure uniqueness */ while (node->parent) { /* |
