From: Greg Ungerer <gerg@uclinux.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <linus.walleij@linaro.org>,
arm@kernel.org, Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org
Subject: Re: [PATCH 1/6] ARM: ks8695: watchdog: stop using mach/*.h
Date: Sat, 20 Apr 2019 12:36:37 +1000 [thread overview]
Message-ID: <f74bf54d-1e5b-5947-9a47-022a39b4d51f@uclinux.org> (raw)
In-Reply-To: <20190415202501.941196-1-arnd@arndb.de>
Hi Arnd,
On 16/4/19 6:24 am, Arnd Bergmann wrote:
> drivers should not rely on machine specific headers but
> get their information from the platform device.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
I like the whole series, thanks for doing this.
I haven't looked at the KS8695 in a long time now. I am not sure
that I have any working hardware - but I will have a look around my lab
and see if I can find something.
I'll get back to you with acks and tested bys soon.
Regards
Greg
> ---
> arch/arm/mach-ks8695/devices.c | 13 ++++++++++++-
> drivers/watchdog/Kconfig | 2 +-
> drivers/watchdog/ks8695_wdt.c | 30 +++++++++++++++++-------------
> 3 files changed, 30 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm/mach-ks8695/devices.c b/arch/arm/mach-ks8695/devices.c
> index 61cf20beb45f..57766817d86f 100644
> --- a/arch/arm/mach-ks8695/devices.c
> +++ b/arch/arm/mach-ks8695/devices.c
> @@ -169,11 +169,22 @@ void __init ks8696_add_device_hpna(void)
> /* --------------------------------------------------------------------
> * Watchdog
> * -------------------------------------------------------------------- */
> +#define KS8695_TMR_OFFSET (0xF0000 + 0xE400)
> +#define KS8695_TMR_PA (KS8695_IO_PA + KS8695_TMR_OFFSET)
> +static struct resource ks8695_wdt_resources[] = {
> + [0] = {
> + .name = "tmr",
> + .start = KS8695_TMR_PA,
> + .end = KS8695_TMR_PA + 0xf,
> + .flags = IORESOURCE_MEM,
> + },
> +};
>
> static struct platform_device ks8695_wdt_device = {
> .name = "ks8695_wdt",
> .id = -1,
> - .num_resources = 0,
> + .resource = ks8695_wdt_resources,
> + .num_resources = ARRAY_SIZE(ks8695_wdt_resources),
> };
>
> static void __init ks8695_add_device_watchdog(void)
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 242eea859637..046e01daef57 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -397,7 +397,7 @@ config IXP4XX_WATCHDOG
>
> config KS8695_WATCHDOG
> tristate "KS8695 watchdog"
> - depends on ARCH_KS8695
> + depends on ARCH_KS8695 || COMPILE_TEST
> help
> Watchdog timer embedded into KS8695 processor. This will reboot your
> system when the timeout is reached.
> diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
> index 1e41818a44bc..87c542c2f912 100644
> --- a/drivers/watchdog/ks8695_wdt.c
> +++ b/drivers/watchdog/ks8695_wdt.c
> @@ -23,10 +23,8 @@
> #include <linux/watchdog.h>
> #include <linux/io.h>
> #include <linux/uaccess.h>
> -#include <mach/hardware.h>
>
> -#define KS8695_TMR_OFFSET (0xF0000 + 0xE400)
> -#define KS8695_TMR_VA (KS8695_IO_VA + KS8695_TMR_OFFSET)
> +#define KS8695_CLOCK_RATE 25000000
>
> /*
> * Timer registers
> @@ -57,6 +55,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
>
> static unsigned long ks8695wdt_busy;
> static DEFINE_SPINLOCK(ks8695_lock);
> +static void __iomem *tmr_reg;
>
> /* ......................................................................... */
>
> @@ -69,8 +68,8 @@ static inline void ks8695_wdt_stop(void)
>
> spin_lock(&ks8695_lock);
> /* disable timer0 */
> - tmcon = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);
> - __raw_writel(tmcon & ~TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);
> + tmcon = __raw_readl(tmr_reg + KS8695_TMCON);
> + __raw_writel(tmcon & ~TMCON_T0EN, tmr_reg + KS8695_TMCON);
> spin_unlock(&ks8695_lock);
> }
>
> @@ -84,15 +83,15 @@ static inline void ks8695_wdt_start(void)
>
> spin_lock(&ks8695_lock);
> /* disable timer0 */
> - tmcon = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);
> - __raw_writel(tmcon & ~TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);
> + tmcon = __raw_readl(tmr_reg + KS8695_TMCON);
> + __raw_writel(tmcon & ~TMCON_T0EN, tmr_reg + KS8695_TMCON);
>
> /* program timer0 */
> - __raw_writel(tval | T0TC_WATCHDOG, KS8695_TMR_VA + KS8695_T0TC);
> + __raw_writel(tval | T0TC_WATCHDOG, tmr_reg + KS8695_T0TC);
>
> /* re-enable timer0 */
> - tmcon = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);
> - __raw_writel(tmcon | TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);
> + tmcon = __raw_readl(tmr_reg + KS8695_TMCON);
> + __raw_writel(tmcon | TMCON_T0EN, tmr_reg + KS8695_TMCON);
> spin_unlock(&ks8695_lock);
> }
>
> @@ -105,9 +104,9 @@ static inline void ks8695_wdt_reload(void)
>
> spin_lock(&ks8695_lock);
> /* disable, then re-enable timer0 */
> - tmcon = __raw_readl(KS8695_TMR_VA + KS8695_TMCON);
> - __raw_writel(tmcon & ~TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);
> - __raw_writel(tmcon | TMCON_T0EN, KS8695_TMR_VA + KS8695_TMCON);
> + tmcon = __raw_readl(tmr_reg + KS8695_TMCON);
> + __raw_writel(tmcon & ~TMCON_T0EN, tmr_reg + KS8695_TMCON);
> + __raw_writel(tmcon | TMCON_T0EN, tmr_reg + KS8695_TMCON);
> spin_unlock(&ks8695_lock);
> }
>
> @@ -238,6 +237,11 @@ static struct miscdevice ks8695wdt_miscdev = {
> static int ks8695wdt_probe(struct platform_device *pdev)
> {
> int res;
> + struct resource *resource = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> +
> + tmr_reg = devm_ioremap_resource(&pdev->dev, resource);
> + if (!tmr_reg)
> + return -ENXIO;
>
> if (ks8695wdt_miscdev.parent)
> return -EBUSY;
>
next prev parent reply other threads:[~2019-04-20 2:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-15 20:24 [PATCH 1/6] ARM: ks8695: watchdog: stop using mach/*.h Arnd Bergmann
2019-04-15 20:54 ` Guenter Roeck
2019-04-15 20:58 ` Arnd Bergmann
2019-04-16 13:21 ` [PATCH 1/6 v2] " Arnd Bergmann
2019-04-16 18:09 ` Guenter Roeck
2019-04-20 2:36 ` Greg Ungerer [this message]
2019-05-03 7:02 ` [PATCH 1/6] " Greg Ungerer
2019-05-03 7:16 ` Linus Walleij
2019-05-03 17:06 ` Guenter Roeck
2019-05-04 14:26 ` Greg Ungerer
2019-07-22 14:44 ` Arnd Bergmann
2019-07-22 20:13 ` Olof Johansson
2019-07-29 12:53 ` Greg Ungerer
2019-07-29 15:45 ` Arnd Bergmann
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=f74bf54d-1e5b-5947-9a47-022a39b4d51f@uclinux.org \
--to=gerg@uclinux.org \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@linux-watchdog.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).