From patchwork Fri Dec 13 02:27:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Yanovich X-Patchwork-Id: 3337721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6E1BAC0D4A for ; Fri, 13 Dec 2013 04:48:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 788BB207EF for ; Fri, 13 Dec 2013 04:48:11 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E140207E4 for ; Fri, 13 Dec 2013 04:48:10 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrIXh-0003RB-3R; Fri, 13 Dec 2013 02:31:54 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrIXB-0000Up-V9; Fri, 13 Dec 2013 02:31:21 +0000 Received: from mail-la0-x234.google.com ([2a00:1450:4010:c03::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VrIVh-0000F0-B5 for linux-arm-kernel@lists.infradead.org; Fri, 13 Dec 2013 02:29:51 +0000 Received: by mail-la0-f52.google.com with SMTP id y1so901217lam.25 for ; Thu, 12 Dec 2013 18:29:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4glGvGpfN8CM38YiK8ejmzyADYxm3ENv7V2XKAWKVDU=; b=G6AZ7nHxBQAgpIKxgjir4ia6KbCKLL/Jfikuc7QmKAsCOkcn2GbOaVZ5PtrqHIKJzq 5P0EEfeeYOjYZWqNAPO5KbEvy32+a5JKXTrqLYdlYtic7e0Eh0iIUlpL/uM7xoi/nD0L t38aStWpPdrYdeWmBRaCD6jFN+4oBqxk0NgwuCt1EhMvs77F5P8BxxnCO8LpOEjoVr+r QKaFDXYBnyDyA5E6nD0n43jmlfO3ydi4ZCCj5mNvRtFCfvxOFi6sFyHo35TCHjXrq5uk 8dSC428Tz11rD2zjP3Q1rZ6gxIAe7dCLVwLGblQ4drJbWE8KVDAPnpxjiyEbha9w9FK5 P6WQ== X-Received: by 10.152.9.9 with SMTP id v9mr18090laa.41.1386901767689; Thu, 12 Dec 2013 18:29:27 -0800 (PST) Received: from host5.omatika.ru (0893675324.static.corbina.ru. [95.31.1.192]) by mx.google.com with ESMTPSA id e10sm809634laa.6.2013.12.12.18.29.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2013 18:29:26 -0800 (PST) From: Sergei Ianovich To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 07/16] rtc: support DS1302 RTC on ICP DAS LP-8x4x Date: Fri, 13 Dec 2013 06:27:16 +0400 Message-Id: <1386901645-28895-8-git-send-email-ynvich@gmail.com> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1386901645-28895-1-git-send-email-ynvich@gmail.com> References: <1386543229-1542-1-git-send-email-ynvich@gmail.com> <1386901645-28895-1-git-send-email-ynvich@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131212_212949_743825_F348D62F X-CRM114-Status: GOOD ( 19.80 ) X-Spam-Score: -1.9 (-) Cc: Mark Rutland , Alessandro Zummo , Russell King , rtc-linux@googlegroups.com, Pawel Moll , Ian Campbell , Stephen Warren , "open list:DOCUMENTATION" , Rob Herring , Sergei Ianovich , "open list:OPEN FIRMWARE AND..." , Rob Landley , Grant Likely X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SBL, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Sergei Ianovich --- v0..v2 * use device tree * use devm helpers where possible .../devicetree/bindings/rtc/rtc-ds1302.txt | 14 +++ arch/arm/boot/dts/pxa27x-lp8x4x.dts | 6 ++ arch/arm/configs/lp8x4x_defconfig | 1 + drivers/rtc/Kconfig | 2 +- drivers/rtc/rtc-ds1302.c | 111 ++++++++++++++++++++- 5 files changed, 131 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/rtc/rtc-ds1302.txt diff --git a/Documentation/devicetree/bindings/rtc/rtc-ds1302.txt b/Documentation/devicetree/bindings/rtc/rtc-ds1302.txt new file mode 100644 index 0000000..876297c --- /dev/null +++ b/Documentation/devicetree/bindings/rtc/rtc-ds1302.txt @@ -0,0 +1,14 @@ +* Dallas Semiconductor DS-1302 RTC + +Simple device which could be used to store date/time between reboots. + +Required properties: +- compatible : Should be "ds,rtc-ds1302" +- reg : Should be address and size of IO memory region + +Examples: + +rtc@40900000 { + compatible = "ds,rtc-ds1302"; + reg = <0x1700901c 0x1>; +}; diff --git a/arch/arm/boot/dts/pxa27x-lp8x4x.dts b/arch/arm/boot/dts/pxa27x-lp8x4x.dts index a2a9183..574e853 100644 --- a/arch/arm/boot/dts/pxa27x-lp8x4x.dts +++ b/arch/arm/boot/dts/pxa27x-lp8x4x.dts @@ -107,5 +107,11 @@ interrupts = <82 IRQ_TYPE_EDGE_RISING>; status = "okay"; }; + + rtc@1700901c { + compatible = "ds,rtc-ds1302"; + reg = <0x1700901c 0x1>; + status = "okay"; + }; }; }; diff --git a/arch/arm/configs/lp8x4x_defconfig b/arch/arm/configs/lp8x4x_defconfig index 4421c03..57f2830 100644 --- a/arch/arm/configs/lp8x4x_defconfig +++ b/arch/arm/configs/lp8x4x_defconfig @@ -133,6 +133,7 @@ CONFIG_USB_SERIAL=m CONFIG_MMC=y CONFIG_MMC_PXA=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_DS1302=y CONFIG_RTC_DRV_PXA=m # CONFIG_IOMMU_SUPPORT is not set CONFIG_EXT2_FS=m diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 0077302..501055f 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -676,7 +676,7 @@ config RTC_DRV_DS1286 config RTC_DRV_DS1302 tristate "Dallas DS1302" - depends on SH_SECUREEDGE5410 + depends on SH_SECUREEDGE5410 || (ARCH_PXA && HIGH_RES_TIMERS) help If you say yes here you get support for the Dallas DS1302 RTC chips. diff --git a/drivers/rtc/rtc-ds1302.c b/drivers/rtc/rtc-ds1302.c index 07e8d79..d88749c 100644 --- a/drivers/rtc/rtc-ds1302.c +++ b/drivers/rtc/rtc-ds1302.c @@ -50,7 +50,7 @@ #define ds1302_set_tx() #define ds1302_set_rx() -static inline int ds1302_hw_init(void) +static inline int ds1302_hw_init(struct platform_device *pdev) { return 0; } @@ -86,6 +86,112 @@ static inline int ds1302_rxbit(void) return !!(get_dp() & RTC_IODATA); } +#elif defined(CONFIG_ARCH_PXA) && defined(CONFIG_HIGH_RES_TIMERS) + +#include +#include +#include + +#define RTC_CE 0x01 +#define RTC_CLK 0x02 +#define RTC_nWE 0x04 +#define RTC_IODATA 0x08 + +static unsigned long ds1302_state; + +static void *mem; + +void nsleep(unsigned long nanosec) +{ + ktime_t t = ns_to_ktime(nanosec); + long state = current->state; + + __set_current_state(TASK_UNINTERRUPTIBLE); + schedule_hrtimeout(&t, HRTIMER_MODE_REL); + __set_current_state(state); +} + +static inline int ds1302_hw_init(struct platform_device *pdev) +{ + struct resource *r; + + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!r) + return -ENODEV; + + mem = devm_ioremap_resource(&pdev->dev, r); + if (!mem) + return -EFAULT; + + return 0; +} + +static inline void ds1302_reset(void) +{ + ds1302_state = 0; + iowrite8(ds1302_state, mem); + nsleep(4000); +} + +static inline void ds1302_clock(void) +{ + nsleep(1000); + ds1302_state |= RTC_CLK; + iowrite8(ds1302_state, mem); + nsleep(1000); + ds1302_state &= ~RTC_CLK; + iowrite8(ds1302_state, mem); +} + +static inline void ds1302_start(void) +{ + ds1302_state &= ~RTC_CLK; + ds1302_state |= RTC_CE; + iowrite8(ds1302_state, mem); + nsleep(3000); +} + +static inline void ds1302_stop(void) +{ + ds1302_state &= ~RTC_CE; + iowrite8(ds1302_state, mem); +} + +static inline void ds1302_set_tx(void) +{ + ds1302_state &= ~RTC_nWE; + iowrite8(ds1302_state, mem); +} + +static inline void ds1302_set_rx(void) +{ + ds1302_state |= RTC_nWE; + iowrite8(ds1302_state, mem); +} + +static inline void ds1302_txbit(int bit) +{ + if (bit) + ds1302_state |= RTC_IODATA; + else + ds1302_state &= ~RTC_IODATA; + iowrite8(ds1302_state, mem); +} + +static inline int ds1302_rxbit(void) +{ + return ioread8(mem) & 0x1; +} + +#ifdef CONFIG_OF +static const struct of_device_id ds1302_dt_ids[] = { + { .compatible = "ds,rtc-ds1302" }, + { } +}; + +MODULE_DEVICE_TABLE(of, ds1302_dt_ids); +#endif + #else #error "Add support for your platform" #endif @@ -216,7 +322,7 @@ static int __init ds1302_rtc_probe(struct platform_device *pdev) { struct rtc_device *rtc; - if (ds1302_hw_init()) { + if (ds1302_hw_init(pdev)) { dev_err(&pdev->dev, "Failed to init communication channel"); return -EINVAL; } @@ -245,6 +351,7 @@ static struct platform_driver ds1302_platform_driver = { .driver = { .name = DRV_NAME, .owner = THIS_MODULE, + .of_match_table = of_match_ptr(ds1302_dt_ids), }, };