From patchwork Wed Jul 4 14:36:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Th=C3=A9baudeau?= X-Patchwork-Id: 1156471 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 67CC23FC36 for ; Wed, 4 Jul 2012 14:43:33 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmQhh-0002Sp-Df; Wed, 04 Jul 2012 14:37:17 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SmQcK-0001LL-Id for linux-arm-kernel@merlin.infradead.org; Wed, 04 Jul 2012 14:31:44 +0000 Received: from zose-mta12.web4all.fr ([178.33.204.89]) by casper.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmQcA-0002xf-Td for linux-arm-kernel@lists.infradead.org; Wed, 04 Jul 2012 14:31:36 +0000 Received: from localhost (localhost [127.0.0.1]) by zose-mta12.web4all.fr (Postfix) with ESMTP id 0B27E90886; Wed, 4 Jul 2012 16:35:58 +0200 (CEST) X-Virus-Scanned: amavisd-new at zose1.web4all.fr Received: from zose-mta12.web4all.fr ([127.0.0.1]) by localhost (zose-mta12.web4all.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X6XFy84CpYcO; Wed, 4 Jul 2012 16:35:57 +0200 (CEST) Received: from zose-store12.web4all.fr (zose-store-12.w4a.fr [178.33.204.48]) by zose-mta12.web4all.fr (Postfix) with ESMTP id BA8F4904EF; Wed, 4 Jul 2012 16:35:57 +0200 (CEST) Date: Wed, 4 Jul 2012 16:36:11 +0200 (CEST) From: =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?= To: Sascha Hauer Message-ID: <744510504.702918.1341412571534.JavaMail.root@advansee.com> Subject: [PATCH 2 of 3] ARM: imx: enable support for mx35 rtc MIME-Version: 1.0 X-Originating-IP: [88.188.188.98] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Win)/7.2.0_GA_2669) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20120704_153135_072623_855C09A8 X-CRM114-Status: UNSURE ( 8.28 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on casper.infradead.org summary: Content analysis details: (-1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The i.MX35 has an RTC compatible with the i.MX31's, so enable its support even if it's not very useful because it's not battery backed. Cc: Sascha Hauer Cc: Signed-off-by: Benoît Thébaudeau --- .../arch/arm/mach-imx/devices-imx35.h | 4 ++++ .../arch/arm/plat-mxc/devices/platform-mxc_rtc.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git linux-next-HEAD-f9637ba.orig/arch/arm/mach-imx/devices-imx35.h linux-next-HEAD-f9637ba/arch/arm/mach-imx/devices-imx35.h index e745bc8..c3e9f20 100644 --- linux-next-HEAD-f9637ba.orig/arch/arm/mach-imx/devices-imx35.h +++ linux-next-HEAD-f9637ba/arch/arm/mach-imx/devices-imx35.h @@ -68,6 +68,10 @@ extern const struct imx_mxc_nand_data imx35_mxc_nand_data; #define imx35_add_mxc_nand(pdata) \ imx_add_mxc_nand(&imx35_mxc_nand_data, pdata) +extern const struct imx_mxc_rtc_data imx35_mxc_rtc_data; +#define imx35_add_mxc_rtc() \ + imx_add_mxc_rtc(&imx35_mxc_rtc_data) + extern const struct imx_mxc_w1_data imx35_mxc_w1_data; #define imx35_add_mxc_w1() \ imx_add_mxc_w1(&imx35_mxc_w1_data) diff --git linux-next-HEAD-f9637ba.orig/arch/arm/plat-mxc/devices/platform-mxc_rtc.c linux-next-HEAD-f9637ba/arch/arm/plat-mxc/devices/platform-mxc_rtc.c index 16d0ec4..a5c9ad5 100644 --- linux-next-HEAD-f9637ba.orig/arch/arm/plat-mxc/devices/platform-mxc_rtc.c +++ linux-next-HEAD-f9637ba/arch/arm/plat-mxc/devices/platform-mxc_rtc.c @@ -20,6 +20,11 @@ const struct imx_mxc_rtc_data imx31_mxc_rtc_data __initconst = imx_mxc_rtc_data_entry_single(MX31); #endif /* ifdef CONFIG_SOC_IMX31 */ +#ifdef CONFIG_SOC_IMX35 +const struct imx_mxc_rtc_data imx35_mxc_rtc_data __initconst = + imx_mxc_rtc_data_entry_single(MX35); +#endif /* ifdef CONFIG_SOC_IMX35 */ + struct platform_device *__init imx_add_mxc_rtc( const struct imx_mxc_rtc_data *data) {