diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2007-05-04 02:38:03 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-08 01:09:26 -0400 |
commit | 197686dfe0038fd190326d118b743ff65ad20c0e (patch) | |
tree | 1da1220830a2658cb043519bdc2ecb6822622ce6 /arch | |
parent | d9b55a03611ff2e2e54fb4e1ad2648d5eb870fa3 (diff) |
[POWERPC] Abolish powerpc_flash_init()
powerpc_flash_init() implements a broken way of probing for flash
devices supported by the physmap_of driver. It finds all nodes in the
device tree with device_type=="rom" and instantiates of_platform
devices for them. This is fundamentally incompatible with the normal
and correct way of probing for of_platform_bus_probe(). Platforms
which relied on powerpc_flash_init()s behaviour (none are in-tree)
will have to update their platform probing code to correctly probe
busses containing flash devices.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/sysdev/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/sysdev/rom.c | 32 |
2 files changed, 0 insertions, 33 deletions
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index d16167977ff0..9ce775c38ab7 100644 --- a/arch/powerpc/sysdev/Makefile +++ b/arch/powerpc/sysdev/Makefile | |||
@@ -28,7 +28,6 @@ endif | |||
28 | 28 | ||
29 | # Temporary hack until we have migrated to asm-powerpc | 29 | # Temporary hack until we have migrated to asm-powerpc |
30 | ifeq ($(ARCH),powerpc) | 30 | ifeq ($(ARCH),powerpc) |
31 | obj-$(CONFIG_MTD) += rom.o | ||
32 | obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o | 31 | obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o |
33 | obj-$(CONFIG_8xx) += mpc8xx_pic.o commproc.o | 32 | obj-$(CONFIG_8xx) += mpc8xx_pic.o commproc.o |
34 | obj-$(CONFIG_UCODE_PATCH) += micropatch.o | 33 | obj-$(CONFIG_UCODE_PATCH) += micropatch.o |
diff --git a/arch/powerpc/sysdev/rom.c b/arch/powerpc/sysdev/rom.c deleted file mode 100644 index c855a3b298a3..000000000000 --- a/arch/powerpc/sysdev/rom.c +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | /* | ||
2 | * ROM device registration | ||
3 | * | ||
4 | * (C) 2006 MontaVista Software, Inc. This file is licensed under | ||
5 | * the terms of the GNU General Public License version 2. This program | ||
6 | * is licensed "as is" without any warranty of any kind, whether express | ||
7 | * or implied. | ||
8 | */ | ||
9 | |||
10 | #include <linux/kernel.h> | ||
11 | #include <asm/of_device.h> | ||
12 | #include <asm/of_platform.h> | ||
13 | |||
14 | static int __init powerpc_flash_init(void) | ||
15 | { | ||
16 | struct device_node *node = NULL; | ||
17 | |||
18 | /* | ||
19 | * Register all the devices which type is "rom" | ||
20 | */ | ||
21 | while ((node = of_find_node_by_type(node, "rom")) != NULL) { | ||
22 | if (node->name == NULL) { | ||
23 | printk(KERN_WARNING "powerpc_flash_init: found 'rom' " | ||
24 | "device, but with no name, skipping...\n"); | ||
25 | continue; | ||
26 | } | ||
27 | of_platform_device_create(node, node->name, NULL); | ||
28 | } | ||
29 | return 0; | ||
30 | } | ||
31 | |||
32 | arch_initcall(powerpc_flash_init); | ||