From patchwork Mon Jan 23 19:33:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 137459 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-we0-f184.google.com (mail-we0-f184.google.com [74.125.82.184]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id BB2211007D5 for ; Tue, 24 Jan 2012 06:35:29 +1100 (EST) Received: by werb14 with SMTP id b14sf5070816wer.11 for ; Mon, 23 Jan 2012 11:35:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:x-sa-exim-connect-ip :x-sa-exim-mail-from:x-sa-exim-scanned:x-ptx-original-recipient :x-original-sender:x-original-authentication-results:reply-to :precedence:mailing-list:list-id:x-google-group-id:list-post :list-help:list-archive:sender:list-subscribe:list-unsubscribe :content-type; bh=SXOWXyJNd3AbGuW1ffaK3jkc8YEnX7SA14KZUrClFvI=; b=5L4o5C9BDv+bEB9rly/PO6w+td8/hvbke3q10MyBsSSuDYC93Akd9akxJ1krpGQulj hRAejalKh94ZMAM9Ts3M7tY9hTMFz9rzFdZ3w04p8hxDECVbST+qFlWr9pwPLP9mf6dr 9hqZgjEllMw8E0sPwNkgYM6Gq169kKdGh2kA4= Received: by 10.216.136.91 with SMTP id v69mr496597wei.4.1327347325072; Mon, 23 Jan 2012 11:35:25 -0800 (PST) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.14.14.97 with SMTP id c73ls510241eec.2.gmail; Mon, 23 Jan 2012 11:35:24 -0800 (PST) Received: by 10.213.2.206 with SMTP id 14mr275249ebk.10.1327347323897; Mon, 23 Jan 2012 11:35:23 -0800 (PST) Received: by 10.213.2.206 with SMTP id 14mr275246ebk.10.1327347323862; Mon, 23 Jan 2012 11:35:23 -0800 (PST) Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de. [92.198.50.35]) by gmr-mx.google.com with ESMTPS id g43si9692055eea.0.2012.01.23.11.35.23 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Jan 2012 11:35:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of w.sang@pengutronix.de designates 92.198.50.35 as permitted sender) client-ip=92.198.50.35; Received: from gallifrey.ext.pengutronix.de ([2001:6f8:1178:4:5054:ff:fe8d:eefb] helo=localhost) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1RpPfn-0003pi-5C; Mon, 23 Jan 2012 20:35:23 +0100 From: Wolfram Sang To: linux-watchdog@vger.kernel.org Cc: rtc-linux@googlegroups.com, Wim Van Sebroeck , Andrew Morton , Wolfram Sang , Alessandro Zummo Subject: [rtc-linux] [PATCH 1/3] rtc: stmp3xxx: add wdt-accessor function Date: Mon, 23 Jan 2012 20:33:03 +0100 Message-Id: <1327347185-620-2-git-send-email-w.sang@pengutronix.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1327347185-620-1-git-send-email-w.sang@pengutronix.de> References: <1327347185-620-1-git-send-email-w.sang@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:4:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: w.sang@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: rtc-linux@googlegroups.com X-Original-Sender: w.sang@pengutronix.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of w.sang@pengutronix.de designates 92.198.50.35 as permitted sender) smtp.mail=w.sang@pengutronix.de Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , This RTC also includes a watchdog timer. Provide an accessor function for it to be picked up by a watchdog driver. Also register the platform_device here to get the boot-time dependencies right. Signed-off-by: Wolfram Sang Cc: Alessandro Zummo Cc: Andrew Morton --- drivers/rtc/rtc-stmp3xxx.c | 64 ++++++++++++++++++++++++++++++++++++++ include/linux/stmp3xxx_rtc_wdt.h | 15 +++++++++ 2 files changed, 79 insertions(+), 0 deletions(-) create mode 100644 include/linux/stmp3xxx_rtc_wdt.h diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c index 1028786..2cf8858 100644 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xxx.c @@ -25,8 +25,10 @@ #include #include #include +#include #include +#include #define STMP3XXX_RTC_CTRL 0x0 #define STMP3XXX_RTC_CTRL_SET 0x4 @@ -34,6 +36,7 @@ #define STMP3XXX_RTC_CTRL_ALARM_IRQ_EN 0x00000001 #define STMP3XXX_RTC_CTRL_ONEMSEC_IRQ_EN 0x00000002 #define STMP3XXX_RTC_CTRL_ALARM_IRQ 0x00000004 +#define STMP3XXX_RTC_CTRL_WATCHDOGEN 0x00000010 #define STMP3XXX_RTC_STAT 0x10 #define STMP3XXX_RTC_STAT_STALE_SHIFT 16 @@ -43,6 +46,8 @@ #define STMP3XXX_RTC_ALARM 0x40 +#define STMP3XXX_RTC_WATCHDOG 0x50 + #define STMP3XXX_RTC_PERSISTENT0 0x60 #define STMP3XXX_RTC_PERSISTENT0_SET 0x64 #define STMP3XXX_RTC_PERSISTENT0_CLR 0x68 @@ -50,12 +55,70 @@ #define STMP3XXX_RTC_PERSISTENT0_ALARM_EN 0x00000004 #define STMP3XXX_RTC_PERSISTENT0_ALARM_WAKE 0x00000080 +#define STMP3XXX_RTC_PERSISTENT1 0x70 +/* missing bitmask in headers */ +#define STMP3XXX_RTC_PERSISTENT1_FORCE_UPDATER 0x80000000 + struct stmp3xxx_rtc_data { struct rtc_device *rtc; void __iomem *io; int irq_alarm; }; +#if defined(CONFIG_STMP3XXX_RTC_WATCHDOG) || defined(CONFIG_STMP3XXX_RTC_WATCHDOG_MODULE) +/** + * stmp3xxx_wdt_set_timeout - configure the watchdog inside the STMP3xxx RTC + * @dev: the parent device of the watchdog (= the RTC) + * @timeout: the desired value for the timeout register of the watchdog. + * 0 disables the watchdog + * + * The watchdog needs one register and two bits which are in the RTC domain. + * To handle the resource conflict, the RTC driver will create another + * platform_device for the watchdog driver as a child of the RTC device. + * The watchdog driver is passed the below accessor function via platform_data + * to configure the watchdog. Locking is not needed because accessing SET/CLR + * registers is atomic. + */ + +void stmp3xxx_wdt_set_timeout(struct device *dev, u32 timeout) +{ + struct stmp3xxx_rtc_data *rtc_data = dev_get_drvdata(dev); + void __iomem *base; + + if (timeout) { + writel(timeout, rtc_data->io + STMP3XXX_RTC_WATCHDOG); + base = rtc_data->io + MXS_SET_ADDR; + } else { + base = rtc_data->io + MXS_CLR_ADDR; + } + writel(STMP3XXX_RTC_CTRL_WATCHDOGEN, base + STMP3XXX_RTC_CTRL); + writel(STMP3XXX_RTC_PERSISTENT1_FORCE_UPDATER, + base + STMP3XXX_RTC_PERSISTENT1); +} + +static struct stmp3xxx_wdt_pdata wdt_pdata = { + .wdt_set_timeout = stmp3xxx_wdt_set_timeout, +}; + +static struct platform_device stmp3xxx_wdt_pdev = { + .name = "stmp3xxx_rtc_wdt", + .dev = { + .platform_data = &wdt_pdata, + }, +}; + +static void stmp3xxx_wdt_register(struct platform_device *rtc_pdev) +{ + stmp3xxx_wdt_pdev.dev.parent = &rtc_pdev->dev; + stmp3xxx_wdt_pdev.id = rtc_pdev->id; + platform_device_register(&stmp3xxx_wdt_pdev); +} +#else +static void stmp3xxx_wdt_register(struct device *dev) +{ +} +#endif /* CONFIG_STMP3XXX_RTC_WATCHDOG */ + static void stmp3xxx_wait_time(struct stmp3xxx_rtc_data *rtc_data) { /* @@ -231,6 +294,7 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev) goto out_irq_alarm; } + stmp3xxx_wdt_register(pdev); return 0; out_irq_alarm: diff --git a/include/linux/stmp3xxx_rtc_wdt.h b/include/linux/stmp3xxx_rtc_wdt.h new file mode 100644 index 0000000..1dd12c9 --- /dev/null +++ b/include/linux/stmp3xxx_rtc_wdt.h @@ -0,0 +1,15 @@ +/* + * stmp3xxx_rtc_wdt.h + * + * Copyright (C) 2011 Wolfram Sang, Pengutronix e.K. + * + * This file is released under the GPLv2. + */ +#ifndef __LINUX_STMP3XXX_RTC_WDT_H +#define __LINUX_STMP3XXX_RTC_WDT_H + +struct stmp3xxx_wdt_pdata { + void (*wdt_set_timeout)(struct device *dev, u32 timeout); +}; + +#endif /* __LINUX_STMP3XXX_RTC_WDT_H */