From patchwork Mon Apr 15 20:24:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10901489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6ABDD13B5 for ; Mon, 15 Apr 2019 20:25:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D5F7287FF for ; Mon, 15 Apr 2019 20:25:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 417DC288DD; Mon, 15 Apr 2019 20:25:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 44BAB2883F for ; Mon, 15 Apr 2019 20:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=tdzB4+41JaWMhUW5iTZkhDMpzQ1zpGz6X+TD+E1pbXM=; b=pOY+w5nGx14gWk 27/t4Y8c7yrF8AyTVsqZ80UhDD9WdOV+wtAa05ECvYR0vmhKy6nkBPvD84Z+2ldje8JV7q69ke/6w LVcKIhkru2LGwPDQ/VvU9tQe+rRrA1k32R2pf6/6DUfyipzPDvsGzFFh0E8MyPabf+TFLT0Za6AMw yTwQDT+ib1elHvZjPvwjz6OYr4ey2vbRtapWOBxOySDp3Try7MJwMxn9W+DjbAooxwq2dxgl0Wk4H /7D1GDzyXBZCEP0YzIdFj/0fJByNoDk6fLzrh58IZ/ttmOu2m9J2dgYqFXXoO+AmPXWoaA9heKfIL 36pWM75z1+TaD/26NLBg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hG8AW-0006pO-NU; Mon, 15 Apr 2019 20:25:32 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hG8AU-0006p2-1q for linux-arm-kernel@lists.infradead.org; Mon, 15 Apr 2019 20:25:31 +0000 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1Macf4-1gjXR22qiY-00cDX5; Mon, 15 Apr 2019 22:25:06 +0200 From: Arnd Bergmann To: Greg Ungerer Subject: [PATCH 1/6] ARM: ks8695: watchdog: stop using mach/*.h Date: Mon, 15 Apr 2019 22:24:13 +0200 Message-Id: <20190415202501.941196-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:3f0N7e03dpDdEs2wFtzwS0wRc0tVAs7W6slwO/9ZNkRveBQIjcS bm4Kk2zlsXHtNp6ivUcyOVN3NHYArHErq8bNj2eKnYJh+VMwm8BYplE1+TMUj3wuEl3UMHu xuwifGzbWpilUzrkx6snzAfW3nWp+Dc8SiAvqtdCc2D0kGJqB/uRVm8Kc3k47bgPHivbyAB LsM+6YV4gTQAJ79yOsakA== X-UI-Out-Filterresults: notjunk:1;V03:K0:lishDkrJYUI=:Rg/rjkvrXx+dapNCpggbg8 KL2QAoY8mgIU7lQn3xtTlbSJdjVKysqV3KoJmb0RPKVoUF0MKptbJwmi1uqNex14l5fLkAjk1 mOWjJ+OYHFITg7GCwGMtPZZPlMeTWbzlix7c46jz7dHBxhLAtF7dcc07EeMTRzYZ6WNc6jlb0 MEm/Cvr5OuzVTiN4LRfYkiDZ6lgNrb3Jt7/N+ePrJ0sYGxgDV8xHDWJnFkNYAd//PMpCteYfa YH0dIUZGkNq826yDHCevz8KpnnWjruM/9eeQV89/mFpUDlfeThRcv+tGksw0/7v0c+K5HmDFV urSd9qS0ZH7eNid8C+1c+VVWdiV3YXg/ecRYAzijeYqKqleX+k2QHjaOQpADXVkHu8CeSfXcW UKWY1MKoqbfREaBoJyjctjhtRxSyeBb/NPWMjMUb5jglLDbs96ESZ30e7RArj57HPoPHPa9kr r65YOGI6y9G1oSXtdUb+SeTk8o7+zrrlUfI7P4Czu3gdxy80xcaHC3J9qOPqN0RPgVQ0JlnGM y3+/SzwuscWKgiamxQhqxZaakA+DDn/z+BPWX7q5wua9uSX+jD+iJ0GQpOkKKFfxya84at/Um K0M+c+/LKxAHh1JwW/myDO+QXyUmMr45bBJwUfK3U5dUSsGba6GlpjmE9fYfMvOjD+z29qQ2J Mw/m/RAMoAGWIAf2er7eNVgDiCBYL4TToWKlCZFYotTilexwYkNEmH6XL1NRkwPgSPQ0SIM5N s9REX+/W0ovB8/Ft48Lz2xDe/MOni9MGKesk7A== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190415_132530_396093_4C68E6D6 X-CRM114-Status: GOOD ( 15.73 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-watchdog@vger.kernel.org, Arnd Bergmann , Linus Walleij , linux-kernel@vger.kernel.org, arm@kernel.org, Guenter Roeck , Wim Van Sebroeck , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP drivers should not rely on machine specific headers but get their information from the platform device. Signed-off-by: Arnd Bergmann Acked-by: Greg Ungerer --- 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 #include #include -#include -#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;