From: Sylvain Rochet <sylvain.rochet@finsecur.com> To: Guenter Roeck <linux@roeck-us.net>, Boris BREZILLON <boris.brezillon@free-electrons.com>, linux-kernel@vger.kernel.org, Nicolas Ferre <nicolas.ferre@atmel.com>, Ludovic Desroches <ludovic.desroches@atmel.com>, linux-arm-kernel@lists.infradead.org, Alexandre Belloni <alexandre.belloni@free-electrons.com>, Wenyou Yang <wenyou.yang@atmel.com>, Wim Van Sebroeck <wim@iguana.be> Cc: Sylvain Rochet <sylvain.rochet@finsecur.com> Subject: [PATCH 5/6] watchdog: at91sam9: remove unused pdata support Date: Thu, 8 Oct 2015 23:34:33 +0200 [thread overview] Message-ID: <1444340074-15437-6-git-send-email-sylvain.rochet@finsecur.com> (raw) In-Reply-To: <1444340074-15437-1-git-send-email-sylvain.rochet@finsecur.com> All SoC using this driver were converted to device tree. Remove pdata support and initialization steps which are only used for pdata. Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com> --- drivers/watchdog/at91sam9_wdt.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 8629f48..5d3e8c0 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -62,9 +62,6 @@ /* Watchdog max delta/value in secs */ #define WDT_COUNTER_MAX_SECS ticks_to_secs(WDT_COUNTER_MAX_TICKS) -/* Hardware timeout in seconds */ -#define WDT_HW_TIMEOUT 16 - /* User land default timeout */ #define WDT_DEFAULT_TIMEOUT 15 @@ -261,7 +258,6 @@ static const struct watchdog_ops at91_wdt_ops = { .set_timeout = at91_wdt_set_timeout, }; -#if defined(CONFIG_OF) static int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt) { u32 min = 0; @@ -317,12 +313,6 @@ static int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt) return 0; } -#else -static inline int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt) -{ - return 0; -} -#endif static int __init at91wdt_probe(struct platform_device *pdev) { @@ -334,9 +324,6 @@ static int __init at91wdt_probe(struct platform_device *pdev) if (!wdt) return -ENOMEM; - wdt->mr = (WDT_HW_TIMEOUT * 256) | AT91_WDT_WDRSTEN | AT91_WDT_WDD | - AT91_WDT_WDDBGHLT; - wdt->mr_mask = 0x3FFFFFFF; wdt->wdd.parent = &pdev->dev; wdt->wdd.info = &at91_wdt_info; wdt->wdd.ops = &at91_wdt_ops; @@ -396,14 +383,12 @@ static int __exit at91wdt_remove(struct platform_device *pdev) return 0; } -#if defined(CONFIG_OF) static const struct of_device_id at91_wdt_dt_ids[] = { { .compatible = "atmel,at91sam9260-wdt" }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); -#endif static struct platform_driver at91wdt_driver = { .remove = __exit_p(at91wdt_remove), -- 2.5.1
WARNING: multiple messages have this Message-ID (diff)
From: sylvain.rochet@finsecur.com (Sylvain Rochet) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/6] watchdog: at91sam9: remove unused pdata support Date: Thu, 8 Oct 2015 23:34:33 +0200 [thread overview] Message-ID: <1444340074-15437-6-git-send-email-sylvain.rochet@finsecur.com> (raw) In-Reply-To: <1444340074-15437-1-git-send-email-sylvain.rochet@finsecur.com> All SoC using this driver were converted to device tree. Remove pdata support and initialization steps which are only used for pdata. Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com> --- drivers/watchdog/at91sam9_wdt.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index 8629f48..5d3e8c0 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c @@ -62,9 +62,6 @@ /* Watchdog max delta/value in secs */ #define WDT_COUNTER_MAX_SECS ticks_to_secs(WDT_COUNTER_MAX_TICKS) -/* Hardware timeout in seconds */ -#define WDT_HW_TIMEOUT 16 - /* User land default timeout */ #define WDT_DEFAULT_TIMEOUT 15 @@ -261,7 +258,6 @@ static const struct watchdog_ops at91_wdt_ops = { .set_timeout = at91_wdt_set_timeout, }; -#if defined(CONFIG_OF) static int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt) { u32 min = 0; @@ -317,12 +313,6 @@ static int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt) return 0; } -#else -static inline int of_at91wdt_init(struct device_node *np, struct at91wdt *wdt) -{ - return 0; -} -#endif static int __init at91wdt_probe(struct platform_device *pdev) { @@ -334,9 +324,6 @@ static int __init at91wdt_probe(struct platform_device *pdev) if (!wdt) return -ENOMEM; - wdt->mr = (WDT_HW_TIMEOUT * 256) | AT91_WDT_WDRSTEN | AT91_WDT_WDD | - AT91_WDT_WDDBGHLT; - wdt->mr_mask = 0x3FFFFFFF; wdt->wdd.parent = &pdev->dev; wdt->wdd.info = &at91_wdt_info; wdt->wdd.ops = &at91_wdt_ops; @@ -396,14 +383,12 @@ static int __exit at91wdt_remove(struct platform_device *pdev) return 0; } -#if defined(CONFIG_OF) static const struct of_device_id at91_wdt_dt_ids[] = { { .compatible = "atmel,at91sam9260-wdt" }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, at91_wdt_dt_ids); -#endif static struct platform_driver at91wdt_driver = { .remove = __exit_p(at91wdt_remove), -- 2.5.1
next prev parent reply other threads:[~2015-10-08 21:35 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-10-08 21:34 [PATCH 0/6] watchdog: sama5d4 and at91sam9: trivial rework Sylvain Rochet 2015-10-08 21:34 ` Sylvain Rochet 2015-10-08 21:34 ` [PATCH 1/6] watchdog: at91sam9: use devm_request_irq instead of request_irq Sylvain Rochet 2015-10-08 21:34 ` Sylvain Rochet 2015-10-08 21:34 ` [PATCH 2/6] watchdog: at91sam9: use watchdog_get_drvdata instead of container_of Sylvain Rochet 2015-10-08 21:34 ` Sylvain Rochet 2015-10-08 21:34 ` [PATCH 3/6] watchdog: at91sam9: rename heartbeats into timeout where necessary Sylvain Rochet 2015-10-08 21:34 ` Sylvain Rochet 2015-10-12 10:07 ` Sylvain Rochet 2015-10-12 10:07 ` Sylvain Rochet 2015-10-08 21:34 ` [PATCH 4/6] watchdog: at91sam9: remove nowayout useless copy Sylvain Rochet 2015-10-08 21:34 ` Sylvain Rochet 2015-10-08 21:34 ` Sylvain Rochet [this message] 2015-10-08 21:34 ` [PATCH 5/6] watchdog: at91sam9: remove unused pdata support Sylvain Rochet 2015-10-08 21:34 ` [PATCH 6/6] watchdog: sama5d4: try to set timeout from device tree first Sylvain Rochet 2015-10-08 21:34 ` Sylvain Rochet 2015-10-12 7:50 ` Alexandre Belloni 2015-10-12 7:50 ` Alexandre Belloni 2015-10-12 8:12 ` Yang, Wenyou 2015-10-12 8:12 ` Yang, Wenyou 2015-10-12 13:56 ` Sylvain Rochet 2015-10-12 13:56 ` Sylvain Rochet 2015-10-12 9:09 ` Sylvain Rochet 2015-10-12 9:09 ` Sylvain Rochet
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1444340074-15437-6-git-send-email-sylvain.rochet@finsecur.com \ --to=sylvain.rochet@finsecur.com \ --cc=alexandre.belloni@free-electrons.com \ --cc=boris.brezillon@free-electrons.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=ludovic.desroches@atmel.com \ --cc=nicolas.ferre@atmel.com \ --cc=wenyou.yang@atmel.com \ --cc=wim@iguana.be \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.