From patchwork Wed Sep 9 22:13:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mark A. Greer" X-Patchwork-Id: 46699 Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8AN274G021956 for ; Thu, 10 Sep 2009 23:02:07 GMT Received: from dlep36.itg.ti.com ([157.170.170.91]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id n89ME0a1031711; Wed, 9 Sep 2009 17:14:05 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id n89MDxhX005026; Wed, 9 Sep 2009 17:14:00 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 9F39E80627; Wed, 9 Sep 2009 17:13:58 -0500 (CDT) X-Original-To: Davinci-linux-open-source@linux.davincidsp.com Delivered-To: Davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id D004980626 for ; Wed, 9 Sep 2009 17:13:56 -0500 (CDT) Received: from white.ext.ti.com (localhost [127.0.0.1]) by dflp52.itg.ti.com (8.13.7/8.13.7) with ESMTP id n89MDuc4004884 for ; Wed, 9 Sep 2009 17:13:56 -0500 (CDT) Received: from mail117-va3-R.bigfish.com (mail-va3.bigfish.com [216.32.180.113]) by white.ext.ti.com (8.13.7/8.13.7) with ESMTP id n89MDpMD006465 for ; Wed, 9 Sep 2009 17:13:56 -0500 Received: from mail117-va3 (localhost.localdomain [127.0.0.1]) by mail117-va3-R.bigfish.com (Postfix) with ESMTP id 15B0C34031C for ; Wed, 9 Sep 2009 22:13:51 +0000 (UTC) X-SpamScore: 10 X-BigFish: vps10(zcb8kza4b1ozz1202hzzz2dh6bh64h) X-Spam-TCS-SCL: 3:0 X-FB-SS: 5, X-MS-Exchange-Organization-Antispam-Report: OrigIP: 63.81.120.158; Service: EHS Received: by mail117-va3 (MessageSwitch) id 125253442967314_27751; Wed, 9 Sep 2009 22:13:49 +0000 (UCT) Received: from gateway-1237.mvista.com (gateway-1237.mvista.com [63.81.120.158]) by mail117-va3.bigfish.com (Postfix) with ESMTP id CBCFD1C80056 for ; Wed, 9 Sep 2009 22:13:48 +0000 (UTC) Received: from mag.az.mvista.com (mag.az.mvista.com [10.50.1.99]) by hermes.mvista.com (Postfix) with ESMTP id EFC041B824 for ; Wed, 9 Sep 2009 15:13:47 -0700 (PDT) Received: from mgreer by mag.az.mvista.com with local (Exim 4.69) (envelope-from ) id 1MlVQB-0008Ui-Rq for Davinci-linux-open-source@linux.davincidsp.com; Wed, 09 Sep 2009 15:13:47 -0700 Date: Wed, 9 Sep 2009 15:13:47 -0700 From: "Mark A. Greer" To: Davinci List Message-ID: <20090909221347.GA32626@mag.az.mvista.com> References: <20090904181404.GA24892@mag.az.mvista.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090904181404.GA24892@mag.az.mvista.com> User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Cc: Subject: [PATCH 4/3] davinci: Add RTC support for DA8xx/OMAP-L13x SoC's X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.4 Precedence: list List-Id: davinci-linux-open-source.linux.davincidsp.com List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com From: Mark A. Greer Add RTC support for the da830/omap-l137 and da850/omap-l138 SoC's by leveraging existing the rtc-omap driver. Signed-off-by: Mark A. Greer --- May as well add this one to the list. The rtc won't actually work until http://groups.google.com/group/rtc-linux/browse_thread/thread/e3f5de9551453d92 is accepted but there should be no harm in adding this patch now. arch/arm/mach-davinci/board-da830-evm.c | 4 +++ arch/arm/mach-davinci/board-da850-evm.c | 4 +++ arch/arm/mach-davinci/devices-da8xx.c | 35 ++++++++++++++++++++++++++++ arch/arm/mach-davinci/include/mach/da8xx.h | 1 + drivers/rtc/Kconfig | 7 +++-- 5 files changed, 48 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index df84f3a..11edfce 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -209,6 +209,10 @@ static __init void da830_evm_init(void) if (ret) pr_warning("da830_evm_init: lcd setup failed: %d\n", ret); #endif + + ret = da8xx_register_rtc(); + if (ret) + pr_warning("da830_evm_init: rtc setup failed: %d\n", ret); } #ifdef CONFIG_SERIAL_8250_CONSOLE diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 83d2f82..6b42cba 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -381,6 +381,10 @@ static __init void da850_evm_init(void) if (ret) pr_warning("da850_evm_init: lcdc registration failed: %d\n", ret); + + ret = da8xx_register_rtc(); + if (ret) + pr_warning("da850_evm_init: rtc setup failed: %d\n", ret); } #ifdef CONFIG_SERIAL_8250_CONSOLE diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index bc91455..cf7f15c 100644 --- a/arch/arm/mach-davinci/devices-da8xx.c +++ b/arch/arm/mach-davinci/devices-da8xx.c @@ -29,6 +29,7 @@ #define DA8XX_TPTC1_BASE 0x01c08400 #define DA8XX_WDOG_BASE 0x01c21000 /* DA8XX_TIMER64P1_BASE */ #define DA8XX_I2C0_BASE 0x01c22000 +#define DA8XX_RTC_BASE 0x01C23000 #define DA8XX_EMAC_CPPI_PORT_BASE 0x01e20000 #define DA8XX_EMAC_CPGMACSS_BASE 0x01e22000 #define DA8XX_EMAC_CPGMAC_BASE 0x01e23000 @@ -451,3 +452,37 @@ int __init da8xx_register_mmcsd0(struct davinci_mmc_config *config) da8xx_mmcsd0_device.dev.platform_data = config; return platform_device_register(&da8xx_mmcsd0_device); } + +static struct resource da8xx_rtc_resources[] = { + { + .start = DA8XX_RTC_BASE, + .end = DA8XX_RTC_BASE + SZ_4K - 1, + .flags = IORESOURCE_MEM, + }, + { /* timer irq */ + .start = IRQ_DA8XX_RTC, + .end = IRQ_DA8XX_RTC, + .flags = IORESOURCE_IRQ, + }, + { /* alarm irq */ + .start = IRQ_DA8XX_RTC, + .end = IRQ_DA8XX_RTC, + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device da8xx_rtc_device = { + .name = "omap_rtc", + .id = -1, + .num_resources = ARRAY_SIZE(da8xx_rtc_resources), + .resource = da8xx_rtc_resources, +}; + +int da8xx_register_rtc(void) +{ + /* Unlock the rtc's registers */ + __raw_writel(0x83e70b13, IO_ADDRESS(DA8XX_RTC_BASE + 0x6c)); + __raw_writel(0x95a4f1e0, IO_ADDRESS(DA8XX_RTC_BASE + 0x70)); + + return platform_device_register(&da8xx_rtc_device); +} diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index 76beca5..08a8f16 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h @@ -77,6 +77,7 @@ int da8xx_register_emac(void); int da8xx_register_lcdc(struct da8xx_lcdc_platform_data *pdata); int da8xx_register_mmcsd0(struct davinci_mmc_config *config); void __init da8xx_init_mcasp(int id, struct snd_platform_data *pdata); +int da8xx_register_rtc(void); extern struct platform_device da8xx_serial_device; extern struct emac_platform_data da8xx_emac_pdata; diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index e104be3..b79320d 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -548,10 +548,11 @@ comment "on-CPU RTC drivers" config RTC_DRV_OMAP tristate "TI OMAP1" - depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 + depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX help - Say "yes" here to support the real time clock on TI OMAP1 chips. - This driver can also be built as a module called rtc-omap. + Say "yes" here to support the real time clock on TI OMAP1 and + DA8xx/OMAP-L13x chips. This driver can also be built as a + module called rtc-omap. config RTC_DRV_S3C tristate "Samsung S3C series SoC RTC"