Hello.
On 13-11-2010 0:51, Gabor Juhos wrote:
All supported SoCs have a built-in hardware watchdog driver. This patch
registers a platform_device for that to make it usable.
Signed-off-by: Gabor Juhos<juhosg@xxxxxxxxxxx>
Signed-off-by: Imre Kaloz<kaloz@xxxxxxxxxxx>
[...]
diff --git a/arch/mips/ath79/Kconfig b/arch/mips/ath79/Kconfig
index 2bd35ef..79bb528 100644
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
@@ -28,4 +28,7 @@ config ATH79_DEV_LEDS_GPIO
config ATH79_DEV_UART
def_bool y
+config ATH79_DEV_WDT
+ def_bool y
What's the point of introducing this?
diff --git a/arch/mips/ath79/dev-wdt.c b/arch/mips/ath79/dev-wdt.c
new file mode 100644
index 0000000..ba6b8bd
--- /dev/null
+++ b/arch/mips/ath79/dev-wdt.c
@@ -0,0 +1,30 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X watchdog device
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos<juhosg@xxxxxxxxxxx>
+ * Copyright (C) 2008 Imre Kaloz<kaloz@xxxxxxxxxxx>
+ *
+ * Parts of this file are based on Atheros' 2.6.15 BSP
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include<linux/kernel.h>
+#include<linux/init.h>
+#include<linux/platform_device.h>
+
+#include<asm/mach-ath79/ar71xx_regs.h>
+#include "common.h"
+#include "dev-wdt.h"
+
+static struct platform_device ath79_wdt_device = {
+ .name = "ath79-wdt",
+ .id = -1,
+};
+
+void __init ath79_register_wdt(void)
+{
+ platform_device_register(&ath79_wdt_device);
+}
I'm not sure creating a separate file for the WDT platfrom device is
really worth it...
diff --git a/arch/mips/ath79/dev-wdt.h b/arch/mips/ath79/dev-wdt.h
new file mode 100644
index 0000000..2546415
--- /dev/null
+++ b/arch/mips/ath79/dev-wdt.h
@@ -0,0 +1,17 @@
+/*
+ * Atheros AR71XX/AR724X/AR913X watchdog device
+ *
+ * Copyright (C) 2008-2010 Gabor Juhos<juhosg@xxxxxxxxxxx>
+ * Copyright (C) 2008 Imre Kaloz<kaloz@xxxxxxxxxxx>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#ifndef _ATH_DEV_WDT_H
+#define _ATH_DEV_WDT_H
+
+void ath79_register_wdt(void) __init;
+
+#endif
I think this should better be put into some more common header...
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index b36f9f2..693a9e6 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -24,6 +24,7 @@
#include<asm/mach-ath79/ar71xx_regs.h>
#include "common.h"
#include "dev-uart.h"
+#include "dev-wdt.h"
#include "machtypes.h"
#define ATH79_SYS_TYPE_LEN 64
@@ -259,6 +260,7 @@ static int __init ath79_setup(void)
{
ath79_gpio_init();
ath79_register_uart();
+ ath79_register_wdt();
Now what if CONFIG_ATH79_DEV_WDT is not enabled? You'll siply get a linker
error. I think you should define an empty inline ath79_register_wdt() in that
case.
WBR, Sergei
