* [PATCH] watchdog: at91rm9200: add DT support
@ 2013-02-14 22:02 ` Joachim Eastwood
0 siblings, 0 replies; 17+ messages in thread
From: Joachim Eastwood @ 2013-02-14 22:02 UTC (permalink / raw)
To: wim
Cc: linux-watchdog, devicetree-discuss, nicolas.ferre, plagnioj,
Joachim Eastwood
Signed-off-by: Joachim Eastwood <manabian@gmail.com>
---
.../devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt | 9 +++++++++
drivers/watchdog/Kconfig | 2 +-
drivers/watchdog/at91rm9200_wdt.c | 9 +++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
diff --git a/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
new file mode 100644
index 0000000..d4d86cf
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
@@ -0,0 +1,9 @@
+Atmel AT91RM9200 System Timer Watchdog
+
+Required properties:
+- compatible: must be "atmel,at91sam9260-wdt".
+
+Example:
+ watchdog@fffffd00 {
+ compatible = "atmel,at91rm9200-wdt";
+ };
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 7f809fd..82ebff9 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -116,7 +116,7 @@ config ARM_SP805_WATCHDOG
config AT91RM9200_WATCHDOG
tristate "AT91RM9200 watchdog"
- depends on ARCH_AT91RM9200
+ depends on ARCH_AT91
help
Watchdog timer embedded into AT91RM9200 chips. This will reboot your
system when the timeout is reached.
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 89831ed..1c75260 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -24,6 +24,8 @@
#include <linux/types.h>
#include <linux/watchdog.h>
#include <linux/uaccess.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
#include <mach/at91_st.h>
#define WDT_DEFAULT_TIME 5 /* seconds */
@@ -252,6 +254,12 @@ static int at91wdt_resume(struct platform_device *pdev)
#define at91wdt_resume NULL
#endif
+static const struct of_device_id at91_wdt_dt_ids[] = {
+ { .compatible = "atmel,at91rm9200-wdt" },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids);
+
static struct platform_driver at91wdt_driver = {
.probe = at91wdt_probe,
.remove = at91wdt_remove,
@@ -261,6 +269,7 @@ static struct platform_driver at91wdt_driver = {
.driver = {
.name = "at91_wdt",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(at91_wdt_dt_ids),
},
};
--
1.8.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH] watchdog: at91rm9200: add DT support
@ 2013-02-14 22:02 ` Joachim Eastwood
0 siblings, 0 replies; 17+ messages in thread
From: Joachim Eastwood @ 2013-02-14 22:02 UTC (permalink / raw)
To: wim-IQzOog9fTRqzQB+pC5nmwQ
Cc: Joachim Eastwood, devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA
Signed-off-by: Joachim Eastwood <manabian-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
.../devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt | 9 +++++++++
drivers/watchdog/Kconfig | 2 +-
drivers/watchdog/at91rm9200_wdt.c | 9 +++++++++
3 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
diff --git a/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
new file mode 100644
index 0000000..d4d86cf
--- /dev/null
+++ b/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
@@ -0,0 +1,9 @@
+Atmel AT91RM9200 System Timer Watchdog
+
+Required properties:
+- compatible: must be "atmel,at91sam9260-wdt".
+
+Example:
+ watchdog@fffffd00 {
+ compatible = "atmel,at91rm9200-wdt";
+ };
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 7f809fd..82ebff9 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -116,7 +116,7 @@ config ARM_SP805_WATCHDOG
config AT91RM9200_WATCHDOG
tristate "AT91RM9200 watchdog"
- depends on ARCH_AT91RM9200
+ depends on ARCH_AT91
help
Watchdog timer embedded into AT91RM9200 chips. This will reboot your
system when the timeout is reached.
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index 89831ed..1c75260 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -24,6 +24,8 @@
#include <linux/types.h>
#include <linux/watchdog.h>
#include <linux/uaccess.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
#include <mach/at91_st.h>
#define WDT_DEFAULT_TIME 5 /* seconds */
@@ -252,6 +254,12 @@ static int at91wdt_resume(struct platform_device *pdev)
#define at91wdt_resume NULL
#endif
+static const struct of_device_id at91_wdt_dt_ids[] = {
+ { .compatible = "atmel,at91rm9200-wdt" },
+ { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids);
+
static struct platform_driver at91wdt_driver = {
.probe = at91wdt_probe,
.remove = at91wdt_remove,
@@ -261,6 +269,7 @@ static struct platform_driver at91wdt_driver = {
.driver = {
.name = "at91_wdt",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(at91_wdt_dt_ids),
},
};
--
1.8.0
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH] watchdog: at91rm9200: add DT support
@ 2013-02-19 19:44 ` Wim Van Sebroeck
0 siblings, 0 replies; 17+ messages in thread
From: Wim Van Sebroeck @ 2013-02-19 19:44 UTC (permalink / raw)
To: Joachim Eastwood
Cc: linux-watchdog, devicetree-discuss, nicolas.ferre, plagnioj
Hi Joachim,
> Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Added to linux-watchdog-next.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] watchdog: at91rm9200: add DT support
@ 2013-04-09 14:04 ` Nicolas Ferre
0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Ferre @ 2013-04-09 14:04 UTC (permalink / raw)
To: Joachim Eastwood, wim, plagnioj; +Cc: linux-watchdog, devicetree-discuss
Hi Joachim,
On 02/14/2013 11:02 PM, Joachim Eastwood :
> Signed-off-by: Joachim Eastwood <manabian@gmail.com>
> ---
> .../devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt | 9 +++++++++
> drivers/watchdog/Kconfig | 2 +-
> drivers/watchdog/at91rm9200_wdt.c | 9 +++++++++
> 3 files changed, 19 insertions(+), 1 deletion(-)
> create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
>
> diff --git a/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
> new file mode 100644
> index 0000000..d4d86cf
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
> @@ -0,0 +1,9 @@
> +Atmel AT91RM9200 System Timer Watchdog
> +
> +Required properties:
> +- compatible: must be "atmel,at91sam9260-wdt".
> +
> +Example:
> + watchdog@fffffd00 {
> + compatible = "atmel,at91rm9200-wdt";
> + };
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 7f809fd..82ebff9 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -116,7 +116,7 @@ config ARM_SP805_WATCHDOG
>
> config AT91RM9200_WATCHDOG
> tristate "AT91RM9200 watchdog"
> - depends on ARCH_AT91RM9200
> + depends on ARCH_AT91
This seems to trigger errors when compiling without AT91RM9200 selected:
drivers/built-in.o: In function `at91_wdt_close':
at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91_wdt_write':
at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91wdt_shutdown':
at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91wdt_suspend':
at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91_wdt_open':
at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to `at91_st_base' follow
make[2]: *** [vmlinux] Error 1
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2
It seems thatthis driver is not written for non-rm9200-proof compilation...
So, it can be a good idea to revert this *line* for 3.9-final: Wim, what do you think?
Best regards,
> help
> Watchdog timer embedded into AT91RM9200 chips. This will reboot your
> system when the timeout is reached.
> diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
> index 89831ed..1c75260 100644
> --- a/drivers/watchdog/at91rm9200_wdt.c
> +++ b/drivers/watchdog/at91rm9200_wdt.c
> @@ -24,6 +24,8 @@
> #include <linux/types.h>
> #include <linux/watchdog.h>
> #include <linux/uaccess.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
> #include <mach/at91_st.h>
>
> #define WDT_DEFAULT_TIME 5 /* seconds */
> @@ -252,6 +254,12 @@ static int at91wdt_resume(struct platform_device *pdev)
> #define at91wdt_resume NULL
> #endif
>
> +static const struct of_device_id at91_wdt_dt_ids[] = {
> + { .compatible = "atmel,at91rm9200-wdt" },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids);
> +
> static struct platform_driver at91wdt_driver = {
> .probe = at91wdt_probe,
> .remove = at91wdt_remove,
> @@ -261,6 +269,7 @@ static struct platform_driver at91wdt_driver = {
> .driver = {
> .name = "at91_wdt",
> .owner = THIS_MODULE,
> + .of_match_table = of_match_ptr(at91_wdt_dt_ids),
> },
> };
>
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH] watchdog: at91rm9200: add DT support
@ 2013-04-09 14:04 ` Nicolas Ferre
0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Ferre @ 2013-04-09 14:04 UTC (permalink / raw)
To: Joachim Eastwood, wim-IQzOog9fTRqzQB+pC5nmwQ,
plagnioj-sclMFOaUSTBWk0Htik3J/w
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA
Hi Joachim,
On 02/14/2013 11:02 PM, Joachim Eastwood :
> Signed-off-by: Joachim Eastwood <manabian-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
> .../devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt | 9 +++++++++
> drivers/watchdog/Kconfig | 2 +-
> drivers/watchdog/at91rm9200_wdt.c | 9 +++++++++
> 3 files changed, 19 insertions(+), 1 deletion(-)
> create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
>
> diff --git a/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt b/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
> new file mode 100644
> index 0000000..d4d86cf
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
> @@ -0,0 +1,9 @@
> +Atmel AT91RM9200 System Timer Watchdog
> +
> +Required properties:
> +- compatible: must be "atmel,at91sam9260-wdt".
> +
> +Example:
> + watchdog@fffffd00 {
> + compatible = "atmel,at91rm9200-wdt";
> + };
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 7f809fd..82ebff9 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -116,7 +116,7 @@ config ARM_SP805_WATCHDOG
>
> config AT91RM9200_WATCHDOG
> tristate "AT91RM9200 watchdog"
> - depends on ARCH_AT91RM9200
> + depends on ARCH_AT91
This seems to trigger errors when compiling without AT91RM9200 selected:
drivers/built-in.o: In function `at91_wdt_close':
at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91_wdt_write':
at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91wdt_shutdown':
at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91wdt_suspend':
at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91_wdt_open':
at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to `at91_st_base' follow
make[2]: *** [vmlinux] Error 1
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2
It seems thatthis driver is not written for non-rm9200-proof compilation...
So, it can be a good idea to revert this *line* for 3.9-final: Wim, what do you think?
Best regards,
> help
> Watchdog timer embedded into AT91RM9200 chips. This will reboot your
> system when the timeout is reached.
> diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
> index 89831ed..1c75260 100644
> --- a/drivers/watchdog/at91rm9200_wdt.c
> +++ b/drivers/watchdog/at91rm9200_wdt.c
> @@ -24,6 +24,8 @@
> #include <linux/types.h>
> #include <linux/watchdog.h>
> #include <linux/uaccess.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
> #include <mach/at91_st.h>
>
> #define WDT_DEFAULT_TIME 5 /* seconds */
> @@ -252,6 +254,12 @@ static int at91wdt_resume(struct platform_device *pdev)
> #define at91wdt_resume NULL
> #endif
>
> +static const struct of_device_id at91_wdt_dt_ids[] = {
> + { .compatible = "atmel,at91rm9200-wdt" },
> + { /* sentinel */ }
> +};
> +MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids);
> +
> static struct platform_driver at91wdt_driver = {
> .probe = at91wdt_probe,
> .remove = at91wdt_remove,
> @@ -261,6 +269,7 @@ static struct platform_driver at91wdt_driver = {
> .driver = {
> .name = "at91_wdt",
> .owner = THIS_MODULE,
> + .of_match_table = of_match_ptr(at91_wdt_dt_ids),
> },
> };
>
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCH] watchdog: at91rm9200: add DT support
@ 2013-04-09 20:27 ` Wim Van Sebroeck
0 siblings, 0 replies; 17+ messages in thread
From: Wim Van Sebroeck @ 2013-04-09 20:27 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Joachim Eastwood, plagnioj, linux-watchdog, devicetree-discuss
Hi All,
> > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> > index 7f809fd..82ebff9 100644
> > --- a/drivers/watchdog/Kconfig
> > +++ b/drivers/watchdog/Kconfig
> > @@ -116,7 +116,7 @@ config ARM_SP805_WATCHDOG
> >
> > config AT91RM9200_WATCHDOG
> > tristate "AT91RM9200 watchdog"
> > - depends on ARCH_AT91RM9200
> > + depends on ARCH_AT91
>
> This seems to trigger errors when compiling without AT91RM9200 selected:
>
>
> drivers/built-in.o: In function `at91_wdt_close':
> at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91_wdt_write':
> at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91wdt_shutdown':
> at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91wdt_suspend':
> at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91_wdt_open':
> at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
> drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to `at91_st_base' follow
> make[2]: *** [vmlinux] Error 1
> make[1]: *** [sub-make] Error 2
> make: *** [all] Error 2
>
> It seems thatthis driver is not written for non-rm9200-proof compilation...
> So, it can be a good idea to revert this *line* for 3.9-final: Wim, what do you think?
If this triggers compile error, then this indeed needs to get fixed.
I'll do the necessary tomorrow.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] watchdog: at91rm9200: add DT support
@ 2013-04-09 20:27 ` Wim Van Sebroeck
0 siblings, 0 replies; 17+ messages in thread
From: Wim Van Sebroeck @ 2013-04-09 20:27 UTC (permalink / raw)
To: Nicolas Ferre
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ, Joachim Eastwood,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA
Hi All,
> > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> > index 7f809fd..82ebff9 100644
> > --- a/drivers/watchdog/Kconfig
> > +++ b/drivers/watchdog/Kconfig
> > @@ -116,7 +116,7 @@ config ARM_SP805_WATCHDOG
> >
> > config AT91RM9200_WATCHDOG
> > tristate "AT91RM9200 watchdog"
> > - depends on ARCH_AT91RM9200
> > + depends on ARCH_AT91
>
> This seems to trigger errors when compiling without AT91RM9200 selected:
>
>
> drivers/built-in.o: In function `at91_wdt_close':
> at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91_wdt_write':
> at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91wdt_shutdown':
> at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91wdt_suspend':
> at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91_wdt_open':
> at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
> drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to `at91_st_base' follow
> make[2]: *** [vmlinux] Error 1
> make[1]: *** [sub-make] Error 2
> make: *** [all] Error 2
>
> It seems thatthis driver is not written for non-rm9200-proof compilation...
> So, it can be a good idea to revert this *line* for 3.9-final: Wim, what do you think?
If this triggers compile error, then this indeed needs to get fixed.
I'll do the necessary tomorrow.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH] watchdog: Revert the AT91RM9200_WATCHDOG dependency
2013-04-09 20:27 ` Wim Van Sebroeck
(?)
@ 2013-04-10 12:36 ` Nicolas Ferre
-1 siblings, 0 replies; 17+ messages in thread
From: Nicolas Ferre @ 2013-04-10 12:36 UTC (permalink / raw)
To: wim, manabian
Cc: linux-watchdog, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, devicetree-discuss,
Nicolas Ferre
Compiling the at91rm9200_wdt.c driver without at91rm9200
support was leading to several errors:
drivers/built-in.o: In function `at91_wdt_close':
at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91_wdt_write':
at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91wdt_shutdown':
at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91wdt_suspend':
at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91_wdt_open':
at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to
`at91_st_base' follow
So, reverting the modification of the "depends" Kconfig line
introduced by patch a6a1bcd37 (watchdog: at91rm9200: add DT support)
seems to be the good solution.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
drivers/watchdog/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 9fcc70c..e89fc31 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -117,7 +117,7 @@ config ARM_SP805_WATCHDOG
config AT91RM9200_WATCHDOG
tristate "AT91RM9200 watchdog"
- depends on ARCH_AT91
+ depends on ARCH_AT91RM9200
help
Watchdog timer embedded into AT91RM9200 chips. This will reboot your
system when the timeout is reached.
--
1.8.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH] watchdog: Revert the AT91RM9200_WATCHDOG dependency
@ 2013-04-10 12:36 ` Nicolas Ferre
0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Ferre @ 2013-04-10 12:36 UTC (permalink / raw)
To: wim-IQzOog9fTRqzQB+pC5nmwQ, manabian-Re5JQEeQqe8AvxtiuMwx3w
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
Compiling the at91rm9200_wdt.c driver without at91rm9200
support was leading to several errors:
drivers/built-in.o: In function `at91_wdt_close':
at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91_wdt_write':
at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91wdt_shutdown':
at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91wdt_suspend':
at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91_wdt_open':
at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to
`at91_st_base' follow
So, reverting the modification of the "depends" Kconfig line
introduced by patch a6a1bcd37 (watchdog: at91rm9200: add DT support)
seems to be the good solution.
Signed-off-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
---
drivers/watchdog/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 9fcc70c..e89fc31 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -117,7 +117,7 @@ config ARM_SP805_WATCHDOG
config AT91RM9200_WATCHDOG
tristate "AT91RM9200 watchdog"
- depends on ARCH_AT91
+ depends on ARCH_AT91RM9200
help
Watchdog timer embedded into AT91RM9200 chips. This will reboot your
system when the timeout is reached.
--
1.8.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH] watchdog: Revert the AT91RM9200_WATCHDOG dependency
@ 2013-04-10 12:36 ` Nicolas Ferre
0 siblings, 0 replies; 17+ messages in thread
From: Nicolas Ferre @ 2013-04-10 12:36 UTC (permalink / raw)
To: linux-arm-kernel
Compiling the at91rm9200_wdt.c driver without at91rm9200
support was leading to several errors:
drivers/built-in.o: In function `at91_wdt_close':
at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91_wdt_write':
at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91wdt_shutdown':
at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91wdt_suspend':
at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
drivers/built-in.o: In function `at91_wdt_open':
at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to
`at91_st_base' follow
So, reverting the modification of the "depends" Kconfig line
introduced by patch a6a1bcd37 (watchdog: at91rm9200: add DT support)
seems to be the good solution.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
drivers/watchdog/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 9fcc70c..e89fc31 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -117,7 +117,7 @@ config ARM_SP805_WATCHDOG
config AT91RM9200_WATCHDOG
tristate "AT91RM9200 watchdog"
- depends on ARCH_AT91
+ depends on ARCH_AT91RM9200
help
Watchdog timer embedded into AT91RM9200 chips. This will reboot your
system when the timeout is reached.
--
1.8.0
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH] watchdog: Revert the AT91RM9200_WATCHDOG dependency
2013-04-10 12:36 ` Nicolas Ferre
(?)
@ 2013-04-10 13:33 ` Guenter Roeck
-1 siblings, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2013-04-10 13:33 UTC (permalink / raw)
To: Nicolas Ferre
Cc: wim, manabian, linux-watchdog, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, devicetree-discuss
On Wed, Apr 10, 2013 at 02:36:22PM +0200, Nicolas Ferre wrote:
> Compiling the at91rm9200_wdt.c driver without at91rm9200
> support was leading to several errors:
>
> drivers/built-in.o: In function `at91_wdt_close':
> at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91_wdt_write':
> at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91wdt_shutdown':
> at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91wdt_suspend':
> at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91_wdt_open':
> at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
> drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to
> `at91_st_base' follow
>
> So, reverting the modification of the "depends" Kconfig line
> introduced by patch a6a1bcd37 (watchdog: at91rm9200: add DT support)
> seems to be the good solution.
>
Really ? Why ? I mean, this was supposed to be for at91rm9200, wasn't it ?
And why would want try to compile a watchdog for at91rm9200 without at91rm9200
support ?
I understand there is a problem, I just don't see how removing that line would
solgve it.
Guenter
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> drivers/watchdog/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 9fcc70c..e89fc31 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -117,7 +117,7 @@ config ARM_SP805_WATCHDOG
>
> config AT91RM9200_WATCHDOG
> tristate "AT91RM9200 watchdog"
> - depends on ARCH_AT91
> + depends on ARCH_AT91RM9200
> help
> Watchdog timer embedded into AT91RM9200 chips. This will reboot your
> system when the timeout is reached.
> --
> 1.8.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] watchdog: Revert the AT91RM9200_WATCHDOG dependency
@ 2013-04-10 13:33 ` Guenter Roeck
0 siblings, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2013-04-10 13:33 UTC (permalink / raw)
To: Nicolas Ferre
Cc: linux-watchdog, devicetree-discuss, wim,
Jean-Christophe PLAGNIOL-VILLARD, manabian, linux-arm-kernel
On Wed, Apr 10, 2013 at 02:36:22PM +0200, Nicolas Ferre wrote:
> Compiling the at91rm9200_wdt.c driver without at91rm9200
> support was leading to several errors:
>
> drivers/built-in.o: In function `at91_wdt_close':
> at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91_wdt_write':
> at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91wdt_shutdown':
> at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91wdt_suspend':
> at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91_wdt_open':
> at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
> drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to
> `at91_st_base' follow
>
> So, reverting the modification of the "depends" Kconfig line
> introduced by patch a6a1bcd37 (watchdog: at91rm9200: add DT support)
> seems to be the good solution.
>
Really ? Why ? I mean, this was supposed to be for at91rm9200, wasn't it ?
And why would want try to compile a watchdog for at91rm9200 without at91rm9200
support ?
I understand there is a problem, I just don't see how removing that line would
solgve it.
Guenter
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> drivers/watchdog/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 9fcc70c..e89fc31 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -117,7 +117,7 @@ config ARM_SP805_WATCHDOG
>
> config AT91RM9200_WATCHDOG
> tristate "AT91RM9200 watchdog"
> - depends on ARCH_AT91
> + depends on ARCH_AT91RM9200
> help
> Watchdog timer embedded into AT91RM9200 chips. This will reboot your
> system when the timeout is reached.
> --
> 1.8.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH] watchdog: Revert the AT91RM9200_WATCHDOG dependency
@ 2013-04-10 13:33 ` Guenter Roeck
0 siblings, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2013-04-10 13:33 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Apr 10, 2013 at 02:36:22PM +0200, Nicolas Ferre wrote:
> Compiling the at91rm9200_wdt.c driver without at91rm9200
> support was leading to several errors:
>
> drivers/built-in.o: In function `at91_wdt_close':
> at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91_wdt_write':
> at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91wdt_shutdown':
> at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91wdt_suspend':
> at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
> drivers/built-in.o: In function `at91_wdt_open':
> at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
> drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to
> `at91_st_base' follow
>
> So, reverting the modification of the "depends" Kconfig line
> introduced by patch a6a1bcd37 (watchdog: at91rm9200: add DT support)
> seems to be the good solution.
>
Really ? Why ? I mean, this was supposed to be for at91rm9200, wasn't it ?
And why would want try to compile a watchdog for at91rm9200 without at91rm9200
support ?
I understand there is a problem, I just don't see how removing that line would
solgve it.
Guenter
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> drivers/watchdog/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 9fcc70c..e89fc31 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -117,7 +117,7 @@ config ARM_SP805_WATCHDOG
>
> config AT91RM9200_WATCHDOG
> tristate "AT91RM9200 watchdog"
> - depends on ARCH_AT91
> + depends on ARCH_AT91RM9200
> help
> Watchdog timer embedded into AT91RM9200 chips. This will reboot your
> system when the timeout is reached.
> --
> 1.8.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] watchdog: Revert the AT91RM9200_WATCHDOG dependency
2013-04-10 13:33 ` Guenter Roeck
(?)
@ 2013-04-10 13:41 ` Guenter Roeck
-1 siblings, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2013-04-10 13:41 UTC (permalink / raw)
To: Nicolas Ferre
Cc: wim, manabian, linux-watchdog, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, devicetree-discuss
On Wed, Apr 10, 2013 at 06:33:51AM -0700, Guenter Roeck wrote:
> On Wed, Apr 10, 2013 at 02:36:22PM +0200, Nicolas Ferre wrote:
> > Compiling the at91rm9200_wdt.c driver without at91rm9200
> > support was leading to several errors:
> >
> > drivers/built-in.o: In function `at91_wdt_close':
> > at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91_wdt_write':
> > at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91wdt_shutdown':
> > at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91wdt_suspend':
> > at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91_wdt_open':
> > at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
> > drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to
> > `at91_st_base' follow
> >
> > So, reverting the modification of the "depends" Kconfig line
> > introduced by patch a6a1bcd37 (watchdog: at91rm9200: add DT support)
> > seems to be the good solution.
> >
> Really ? Why ? I mean, this was supposed to be for at91rm9200, wasn't it ?
> And why would want try to compile a watchdog for at91rm9200 without at91rm9200
> support ?
>
> I understand there is a problem, I just don't see how removing that line would
> solve it.
>
Me confused, sorry. I somehow thought you were removing the ARCH_AT91RM9200
dependency, not adding it.
Acked-by: Guenter Roeck <linux@roeck-us.net>
Guenter
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] watchdog: Revert the AT91RM9200_WATCHDOG dependency
@ 2013-04-10 13:41 ` Guenter Roeck
0 siblings, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2013-04-10 13:41 UTC (permalink / raw)
To: Nicolas Ferre
Cc: linux-watchdog-u79uwXL29TY76Z2rM5mHXA,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ,
wim-IQzOog9fTRqzQB+pC5nmwQ, manabian-Re5JQEeQqe8AvxtiuMwx3w,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
On Wed, Apr 10, 2013 at 06:33:51AM -0700, Guenter Roeck wrote:
> On Wed, Apr 10, 2013 at 02:36:22PM +0200, Nicolas Ferre wrote:
> > Compiling the at91rm9200_wdt.c driver without at91rm9200
> > support was leading to several errors:
> >
> > drivers/built-in.o: In function `at91_wdt_close':
> > at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91_wdt_write':
> > at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91wdt_shutdown':
> > at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91wdt_suspend':
> > at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91_wdt_open':
> > at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
> > drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to
> > `at91_st_base' follow
> >
> > So, reverting the modification of the "depends" Kconfig line
> > introduced by patch a6a1bcd37 (watchdog: at91rm9200: add DT support)
> > seems to be the good solution.
> >
> Really ? Why ? I mean, this was supposed to be for at91rm9200, wasn't it ?
> And why would want try to compile a watchdog for at91rm9200 without at91rm9200
> support ?
>
> I understand there is a problem, I just don't see how removing that line would
> solve it.
>
Me confused, sorry. I somehow thought you were removing the ARCH_AT91RM9200
dependency, not adding it.
Acked-by: Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
Guenter
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH] watchdog: Revert the AT91RM9200_WATCHDOG dependency
@ 2013-04-10 13:41 ` Guenter Roeck
0 siblings, 0 replies; 17+ messages in thread
From: Guenter Roeck @ 2013-04-10 13:41 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Apr 10, 2013 at 06:33:51AM -0700, Guenter Roeck wrote:
> On Wed, Apr 10, 2013 at 02:36:22PM +0200, Nicolas Ferre wrote:
> > Compiling the at91rm9200_wdt.c driver without at91rm9200
> > support was leading to several errors:
> >
> > drivers/built-in.o: In function `at91_wdt_close':
> > at91_adc.c:(.text+0xc9fe4): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91_wdt_write':
> > at91_adc.c:(.text+0xca004): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91wdt_shutdown':
> > at91_adc.c:(.text+0xca01c): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91wdt_suspend':
> > at91_adc.c:(.text+0xca038): undefined reference to `at91_st_base'
> > drivers/built-in.o: In function `at91_wdt_open':
> > at91_adc.c:(.text+0xca0cc): undefined reference to `at91_st_base'
> > drivers/built-in.o:at91_adc.c:(.text+0xca2c8): more undefined references to
> > `at91_st_base' follow
> >
> > So, reverting the modification of the "depends" Kconfig line
> > introduced by patch a6a1bcd37 (watchdog: at91rm9200: add DT support)
> > seems to be the good solution.
> >
> Really ? Why ? I mean, this was supposed to be for at91rm9200, wasn't it ?
> And why would want try to compile a watchdog for at91rm9200 without at91rm9200
> support ?
>
> I understand there is a problem, I just don't see how removing that line would
> solve it.
>
Me confused, sorry. I somehow thought you were removing the ARCH_AT91RM9200
dependency, not adding it.
Acked-by: Guenter Roeck <linux@roeck-us.net>
Guenter
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2013-04-10 13:41 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-14 22:02 [PATCH] watchdog: at91rm9200: add DT support Joachim Eastwood
2013-02-14 22:02 ` Joachim Eastwood
2013-02-19 19:44 ` Wim Van Sebroeck
2013-02-19 19:44 ` Wim Van Sebroeck
2013-04-09 14:04 ` Nicolas Ferre
2013-04-09 14:04 ` Nicolas Ferre
2013-04-09 20:27 ` Wim Van Sebroeck
2013-04-09 20:27 ` Wim Van Sebroeck
2013-04-10 12:36 ` [PATCH] watchdog: Revert the AT91RM9200_WATCHDOG dependency Nicolas Ferre
2013-04-10 12:36 ` Nicolas Ferre
2013-04-10 12:36 ` Nicolas Ferre
2013-04-10 13:33 ` Guenter Roeck
2013-04-10 13:33 ` Guenter Roeck
2013-04-10 13:33 ` Guenter Roeck
2013-04-10 13:41 ` Guenter Roeck
2013-04-10 13:41 ` Guenter Roeck
2013-04-10 13:41 ` Guenter Roeck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.