Skip to content

Commit

Permalink
powerpc/fsl_soc: remove mpc83xx_wdt code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Anton Vorontsov authored and Kumar Gala committed Sep 29, 2008
1 parent 8d1fb8c commit 20d38e0
Showing 1 changed file with 0 additions and 47 deletions.
47 changes: 0 additions & 47 deletions arch/powerpc/sysdev/fsl_soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,53 +412,6 @@ static int __init gfar_of_init(void)

arch_initcall(gfar_of_init);


#ifdef CONFIG_PPC_83xx
static int __init mpc83xx_wdt_init(void)
{
struct resource r;
struct device_node *np;
struct platform_device *dev;
u32 freq = fsl_get_sys_freq();
int ret;

np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");

if (!np) {
ret = -ENODEV;
goto nodev;
}

memset(&r, 0, sizeof(r));

ret = of_address_to_resource(np, 0, &r);
if (ret)
goto err;

dev = platform_device_register_simple("mpc83xx_wdt", 0, &r, 1);
if (IS_ERR(dev)) {
ret = PTR_ERR(dev);
goto err;
}

ret = platform_device_add_data(dev, &freq, sizeof(freq));
if (ret)
goto unreg;

of_node_put(np);
return 0;

unreg:
platform_device_unregister(dev);
err:
of_node_put(np);
nodev:
return ret;
}

arch_initcall(mpc83xx_wdt_init);
#endif

static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type)
{
if (!phy_type)
Expand Down

0 comments on commit 20d38e0

Please sign in to comment.