From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754094AbbAEO2z (ORCPT ); Mon, 5 Jan 2015 09:28:55 -0500 Received: from eusmtp01.atmel.com ([212.144.249.242]:59435 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753305AbbAEO2x (ORCPT ); Mon, 5 Jan 2015 09:28:53 -0500 Message-ID: <54AA9FB1.1090603@atmel.com> Date: Mon, 5 Jan 2015 15:29:05 +0100 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Alexandre Belloni CC: Boris Brezillon , "Jean-Christophe Plagniol-Villard" , Daniel Lezcano , Thomas Gleixner , "Samuel Ortiz" , Lee Jones , "Wim Van Sebroeck" , , , Subject: Re: [PATCH 3/8] watchdog: at91rm9200: use the regmap from mfd References: <1420459605-24561-1-git-send-email-alexandre.belloni@free-electrons.com> <1420459605-24561-4-git-send-email-alexandre.belloni@free-electrons.com> In-Reply-To: <1420459605-24561-4-git-send-email-alexandre.belloni@free-electrons.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 05/01/2015 13:06, Alexandre Belloni a écrit : > The system timer MFD driver is providing a regmap. Use it to access the > registers. > > Signed-off-by: Alexandre Belloni > --- > drivers/watchdog/Kconfig | 2 +- > drivers/watchdog/at91rm9200_wdt.c | 22 +++++++++------------- > 2 files changed, 10 insertions(+), 14 deletions(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 08f41add1461..18c73bc159fc 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_ATMEL_ST > 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..6d6f36652112 100644 > --- a/drivers/watchdog/at91rm9200_wdt.c > +++ b/drivers/watchdog/at91rm9200_wdt.c > @@ -17,22 +17,24 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > +#include > #include > #include > #include > #include > #include > -#include > > #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 +57,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 +65,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 +75,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); > } > > /* ......................................................................... */ > @@ -204,6 +206,7 @@ static struct miscdevice at91wdt_miscdev = { > static int at91wdt_probe(struct platform_device *pdev) > { > int res; > + regmap_st = dev_get_drvdata(pdev->dev.parent); > > if (at91wdt_miscdev.parent) > return -EBUSY; > @@ -254,12 +257,6 @@ 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, > @@ -267,8 +264,7 @@ static struct platform_driver at91wdt_driver = { > .suspend = at91wdt_suspend, > .resume = at91wdt_resume, > .driver = { > - .name = "at91_wdt", > - .of_match_table = at91_wdt_dt_ids, As we remove all the DT specific bits in this driver, don't we have the opportunity to remove some #include directives? > + .name = "atmel_st_watchdog", > }, > }; > > -- Nicolas Ferre