On Thu, Aug 09, 2018 at 11:43:59PM +0200, Paul Cercueil wrote:
> Since we broke the ABI by changing the clock, the driver was also
> updated to use the regmap provided by the TCU driver.
>
> Signed-off-by: Paul Cercueil <paul@xxxxxxxxxxxxxxx>
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
> ---
> drivers/watchdog/jz4740_wdt.c | 30 ++++++++++++++----------------
> 1 file changed, 14 insertions(+), 16 deletions(-)
>
> v6: New patch
>
> diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
> index 1d504ecf45e1..0f54306aee25 100644
> --- a/drivers/watchdog/jz4740_wdt.c
> +++ b/drivers/watchdog/jz4740_wdt.c
> @@ -13,6 +13,7 @@
> *
> */
>
> +#include <linux/mfd/ingenic-tcu.h>
> #include <linux/module.h>
> #include <linux/moduleparam.h>
> #include <linux/types.h>
> @@ -25,10 +26,7 @@
> #include <linux/slab.h>
> #include <linux/err.h>
> #include <linux/of.h>
> -
> -#define JZ_REG_WDT_TIMER_DATA 0x0
> -#define JZ_REG_WDT_COUNTER_ENABLE 0x4
> -#define JZ_REG_WDT_TIMER_COUNTER 0x8
> +#include <linux/regmap.h>
>
> #define DEFAULT_HEARTBEAT 5
> #define MAX_HEARTBEAT 2048
> @@ -48,7 +46,7 @@ MODULE_PARM_DESC(heartbeat,
>
> struct jz4740_wdt_drvdata {
> struct watchdog_device wdt;
> - void __iomem *base;
> + struct regmap *map;
> struct clk *clk;
> unsigned long clk_rate;
> };
> @@ -57,7 +55,7 @@ static int jz4740_wdt_ping(struct watchdog_device *wdt_dev)
> {
> struct jz4740_wdt_drvdata *drvdata = watchdog_get_drvdata(wdt_dev);
>
> - writew(0x0, drvdata->base + JZ_REG_WDT_TIMER_COUNTER);
> + regmap_write(drvdata->map, TCU_REG_WDT_TCNT, 0);
> return 0;
> }
>
> @@ -67,12 +65,12 @@ static int jz4740_wdt_set_timeout(struct watchdog_device *wdt_dev,
> struct jz4740_wdt_drvdata *drvdata = watchdog_get_drvdata(wdt_dev);
> u16 timeout_value = (u16)(drvdata->clk_rate * new_timeout);
>
> - writeb(0x0, drvdata->base + JZ_REG_WDT_COUNTER_ENABLE);
> + regmap_write(drvdata->map, TCU_REG_WDT_TCER, 0);
>
> - writew((u16)timeout_value, drvdata->base + JZ_REG_WDT_TIMER_DATA);
> - writew(0x0, drvdata->base + JZ_REG_WDT_TIMER_COUNTER);
> + regmap_write(drvdata->map, TCU_REG_WDT_TDR, timeout_value);
> + regmap_write(drvdata->map, TCU_REG_WDT_TCNT, 0);
>
> - writeb(0x1, drvdata->base + JZ_REG_WDT_COUNTER_ENABLE);
> + regmap_write(drvdata->map, TCU_REG_WDT_TCER, TCU_WDT_TCER_TCEN);
>
> wdt_dev->timeout = new_timeout;
> return 0;
> @@ -96,7 +94,7 @@ static int jz4740_wdt_stop(struct watchdog_device *wdt_dev)
> {
> struct jz4740_wdt_drvdata *drvdata = watchdog_get_drvdata(wdt_dev);
>
> - writeb(0x0, drvdata->base + JZ_REG_WDT_COUNTER_ENABLE);
> + regmap_write(drvdata->map, TCU_REG_WDT_TCER, 0);
> clk_disable_unprepare(drvdata->clk);
>
> return 0;
> @@ -138,7 +136,6 @@ static int jz4740_wdt_probe(struct platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct jz4740_wdt_drvdata *drvdata;
> struct watchdog_device *jz4740_wdt;
> - struct resource *res;
> long rate;
> int ret;
>
> @@ -174,10 +171,11 @@ static int jz4740_wdt_probe(struct platform_device *pdev)
> watchdog_set_nowayout(jz4740_wdt, nowayout);
> watchdog_set_drvdata(jz4740_wdt, drvdata);
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - drvdata->base = devm_ioremap_resource(&pdev->dev, res);
> - if (IS_ERR(drvdata->base))
> - return PTR_ERR(drvdata->base);
> + drvdata->map = dev_get_regmap(dev->parent, NULL);
> + if (!drvdata->map) {
> + dev_err(dev, "regmap not found\n");
> + return -EINVAL;
> + }
>
> ret = devm_watchdog_register_device(&pdev->dev, &drvdata->wdt);
> if (ret < 0)
> --
> 2.11.0
>
