diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-09-29 09:56:03 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-09-29 10:22:45 -0400 |
commit | 20d38e01d48019c578ab0ec1464454c03003b300 (patch) | |
tree | f679357bc43494bc10c22ee3275e762a10339f98 /arch/powerpc/sysdev | |
parent | 8d1fb8cbaa74938d8c4379adb693d1d5f5c9e130 (diff) |
powerpc/fsl_soc: remove mpc83xx_wdt code
mpc83xx_wdt is the OF driver now, so we don't need fsl_soc constructor.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/sysdev')
-rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 214388e11807..eeb07007c753 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
@@ -412,53 +412,6 @@ err: | |||
412 | 412 | ||
413 | arch_initcall(gfar_of_init); | 413 | arch_initcall(gfar_of_init); |
414 | 414 | ||
415 | |||
416 | #ifdef CONFIG_PPC_83xx | ||
417 | static int __init mpc83xx_wdt_init(void) | ||
418 | { | ||
419 | struct resource r; | ||
420 | struct device_node *np; | ||
421 | struct platform_device *dev; | ||
422 | u32 freq = fsl_get_sys_freq(); | ||
423 | int ret; | ||
424 | |||
425 | np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt"); | ||
426 | |||
427 | if (!np) { | ||
428 | ret = -ENODEV; | ||
429 | goto nodev; | ||
430 | } | ||
431 | |||
432 | memset(&r, 0, sizeof(r)); | ||
433 | |||
434 | ret = of_address_to_resource(np, 0, &r); | ||
435 | if (ret) | ||
436 | goto err; | ||
437 | |||
438 | dev = platform_device_register_simple("mpc83xx_wdt", 0, &r, 1); | ||
439 | if (IS_ERR(dev)) { | ||
440 | ret = PTR_ERR(dev); | ||
441 | goto err; | ||
442 | } | ||
443 | |||
444 | ret = platform_device_add_data(dev, &freq, sizeof(freq)); | ||
445 | if (ret) | ||
446 | goto unreg; | ||
447 | |||
448 | of_node_put(np); | ||
449 | return 0; | ||
450 | |||
451 | unreg: | ||
452 | platform_device_unregister(dev); | ||
453 | err: | ||
454 | of_node_put(np); | ||
455 | nodev: | ||
456 | return ret; | ||
457 | } | ||
458 | |||
459 | arch_initcall(mpc83xx_wdt_init); | ||
460 | #endif | ||
461 | |||
462 | static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type) | 415 | static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type) |
463 | { | 416 | { |
464 | if (!phy_type) | 417 | if (!phy_type) |