| Message ID | 1425478897-27322-4-git-send-email-alexandre.belloni@free-electrons.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 03/04/2015 06:21 AM, Alexandre Belloni wrote: > Use a syscon regmap to access the systemr timer registers. > s/systemr/system/ > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- ... > > static const struct of_device_id at91_wdt_dt_ids[] = { > + { .compatible = "atmel,at91rm9200-st" }, > { .compatible = "atmel,at91rm9200-wdt" }, > { /* sentinel */ } > }; > @@ -267,7 +276,7 @@ static struct platform_driver at91wdt_driver = { > .suspend = at91wdt_suspend, > .resume = at91wdt_resume, > .driver = { > - .name = "at91_wdt", > + .name = "atmel_st_watchdog", If you change the driver name you also need to change the MODULE_ALIAS a few lines down. But why change it in the first place ? Maybe that was discussed somewhere, but not here where it belongs, and not in patch 0/9 either. Guenter -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/03/2015 at 06:51:51 -0800, Guenter Roeck wrote : > >@@ -267,7 +276,7 @@ static struct platform_driver at91wdt_driver = { > > .suspend = at91wdt_suspend, > > .resume = at91wdt_resume, > > .driver = { > >- .name = "at91_wdt", > >+ .name = "atmel_st_watchdog", > > If you change the driver name you also need to change the MODULE_ALIAS > a few lines down. > > But why change it in the first place ? Maybe that was discussed somewhere, > but not here where it belongs, and not in patch 0/9 either. > That's because it conflicts with drivers/watchdog/at91sam9_wdt.c I'm not sure that is relevant anymore as they will only be probed using DT now.
On Wed, Mar 04, 2015 at 04:08:15PM +0100, Alexandre Belloni wrote: > On 04/03/2015 at 06:51:51 -0800, Guenter Roeck wrote : > > >@@ -267,7 +276,7 @@ static struct platform_driver at91wdt_driver = { > > > .suspend = at91wdt_suspend, > > > .resume = at91wdt_resume, > > > .driver = { > > >- .name = "at91_wdt", > > >+ .name = "atmel_st_watchdog", > > > > If you change the driver name you also need to change the MODULE_ALIAS > > a few lines down. > > > > But why change it in the first place ? Maybe that was discussed somewhere, > > but not here where it belongs, and not in patch 0/9 either. > > > > That's because it conflicts with drivers/watchdog/at91sam9_wdt.c > You still have to update MODULE_ALIAS (or drop it if it is not needed anymore). Guenter > I'm not sure that is relevant anymore as they will only be probed using > DT now. > > > -- > Alexandre Belloni, Free Electrons > Embedded Linux, Kernel and Android engineering > http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 16f202350997..ce4f3a7f95fd 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -154,7 +154,7 @@ config ARM_SP805_WATCHDOG config AT91RM9200_WATCHDOG tristate "AT91RM9200 watchdog" - depends on SOC_AT91RM9200 + depends on SOC_AT91RM9200 && MFD_SYSCON 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 d244112d5b6f..34dd5eec79d8 100644 --- a/drivers/watchdog/at91rm9200_wdt.c +++ b/drivers/watchdog/at91rm9200_wdt.c @@ -17,22 +17,25 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/kernel.h> +#include <linux/mfd/syscon.h> +#include <linux/mfd/syscon/atmel-st.h> #include <linux/miscdevice.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/platform_device.h> +#include <linux/regmap.h> #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 */ #define WDT_MAX_TIME 256 /* seconds */ static int wdt_time = WDT_DEFAULT_TIME; static bool nowayout = WATCHDOG_NOWAYOUT; +static struct regmap *regmap_st; module_param(wdt_time, int, 0); MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default=" @@ -55,7 +58,7 @@ static unsigned long at91wdt_busy; */ static inline void at91_wdt_stop(void) { - at91_st_write(AT91_ST_WDMR, AT91_ST_EXTEN); + regmap_write(regmap_st, AT91_ST_WDMR, AT91_ST_EXTEN); } /* @@ -63,9 +66,9 @@ static inline void at91_wdt_stop(void) */ static inline void at91_wdt_start(void) { - at91_st_write(AT91_ST_WDMR, AT91_ST_EXTEN | AT91_ST_RSTEN | + regmap_write(regmap_st, AT91_ST_WDMR, AT91_ST_EXTEN | AT91_ST_RSTEN | (((65536 * wdt_time) >> 8) & AT91_ST_WDV)); - at91_st_write(AT91_ST_CR, AT91_ST_WDRST); + regmap_write(regmap_st, AT91_ST_CR, AT91_ST_WDRST); } /* @@ -73,7 +76,7 @@ static inline void at91_wdt_start(void) */ static inline void at91_wdt_reload(void) { - at91_st_write(AT91_ST_CR, AT91_ST_WDRST); + regmap_write(regmap_st, AT91_ST_CR, AT91_ST_WDRST); } /* ......................................................................... */ @@ -203,12 +206,17 @@ static struct miscdevice at91wdt_miscdev = { static int at91wdt_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; int res; if (at91wdt_miscdev.parent) return -EBUSY; at91wdt_miscdev.parent = &pdev->dev; + regmap_st = syscon_node_to_regmap(np); + if (!regmap_st) + return -ENODEV; + res = misc_register(&at91wdt_miscdev); if (res) return res; @@ -255,6 +263,7 @@ static int at91wdt_resume(struct platform_device *pdev) #endif static const struct of_device_id at91_wdt_dt_ids[] = { + { .compatible = "atmel,at91rm9200-st" }, { .compatible = "atmel,at91rm9200-wdt" }, { /* sentinel */ } }; @@ -267,7 +276,7 @@ static struct platform_driver at91wdt_driver = { .suspend = at91wdt_suspend, .resume = at91wdt_resume, .driver = { - .name = "at91_wdt", + .name = "atmel_st_watchdog", .of_match_table = at91_wdt_dt_ids, }, };
Use a syscon regmap to access the systemr timer registers. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> --- drivers/watchdog/Kconfig | 2 +- drivers/watchdog/at91rm9200_wdt.c | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-)