Patchwork powerpc/fsl_soc: remove mpc83xx_wdt code

login
register
mail settings
Submitter Anton Vorontsov
Date Sept. 29, 2008, 1:56 p.m.
Message ID <20080929135603.GA27252@oksana.dev.rtsoft.ru>
Download mbox | patch
Permalink /patch/1893/
State Accepted, archived
Commit 20d38e01d48019c578ab0ec1464454c03003b300
Headers show

Comments

Anton Vorontsov - Sept. 29, 2008, 1:56 p.m.
mpc83xx_wdt is the OF driver now, so we don't need fsl_soc constructor.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---

Just resending the following patch:

http://ozlabs.org/pipermail/linuxppc-dev/2008-May/056253.html

 arch/powerpc/sysdev/fsl_soc.c |   47 -----------------------------------------
 1 files changed, 0 insertions(+), 47 deletions(-)
Kumar Gala - Sept. 29, 2008, 2:23 p.m.
On Sep 29, 2008, at 8:56 AM, Anton Vorontsov wrote:

> mpc83xx_wdt is the OF driver now, so we don't need fsl_soc  
> constructor.
>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> ---
>
> Just resending the following patch:
>
> http://ozlabs.org/pipermail/linuxppc-dev/2008-May/056253.html
>
> arch/powerpc/sysdev/fsl_soc.c |   47  
> -----------------------------------------
> 1 files changed, 0 insertions(+), 47 deletions(-)

applied.

- k

Patch

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 214388e..eeb0700 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -412,53 +412,6 @@  err:
 
 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)