From patchwork Tue Apr 16 08:30:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 236860 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-da0-x238.google.com (mail-da0-x238.google.com [IPv6:2607:f8b0:400e:c00::238]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 7BB532C0106 for ; Tue, 16 Apr 2013 18:30:20 +1000 (EST) Received: by mail-da0-f56.google.com with SMTP id i23sf110797dad.21 for ; Tue, 16 Apr 2013 01:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=x-received:x-beenthere:x-received:received-spf:from:to:cc:subject :date:message-id:x-mailer:mime-version: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=pKevbBplI8Kz/7WQGLaHJPtCHcCgk1hdT60gw02bKYs=; b=qNOceB0NbcF8jmh1ExSlww8VFrtHbtPbF65hovHcLbz0hJVNSmBB8iWtX63bXj4vSp Aq7ONU3AGbxh/a3Ty7jrBvLa4Zy36q8KSkujbzGgYjKKHmSUXfYUA+7QUsZfafTIzuLn /BnaVnYnfPnfZvCy5O7pUozzoRj9mLH5OfbjQeD3FzRwYv6P0l1CwRMCI3uMy6tSkaoF TUA7j4CNWDWpB8CtdJavt3VbcFjPliqocIA/cDDtPSG44B3v3liizyUS2AJ77xcqdHyR 55/Pn4DKKdSITbJ/C/DPgjZ5gorYpwaUg7FiEQS7mNMPif+IEQA+h6NHcd+rH/9T1ScQ 6fsQ== X-Received: by 10.49.35.198 with SMTP id k6mr60907qej.18.1366101018165; Tue, 16 Apr 2013 01:30:18 -0700 (PDT) X-BeenThere: rtc-linux@googlegroups.com Received: by 10.49.85.72 with SMTP id f8ls197080qez.98.gmail; Tue, 16 Apr 2013 01:30:17 -0700 (PDT) X-Received: by 10.224.217.195 with SMTP id hn3mr1210964qab.5.1366101017873; Tue, 16 Apr 2013 01:30:17 -0700 (PDT) Received: from comal.ext.ti.com (comal.ext.ti.com. [198.47.26.152]) by gmr-mx.google.com with ESMTPS id f2si177055qcv.1.2013.04.16.01.30.17 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 16 Apr 2013 01:30:17 -0700 (PDT) Received-SPF: pass (google.com: domain of peter.ujfalusi@ti.com designates 198.47.26.152 as permitted sender) client-ip=198.47.26.152; Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r3G8UGGW023498; Tue, 16 Apr 2013 03:30:16 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r3G8UGWV025433; Tue, 16 Apr 2013 03:30:16 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Tue, 16 Apr 2013 03:30:15 -0500 Received: from barack.emea.dhcp.ti.com (barack.emea.dhcp.ti.com [137.167.125.74]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r3G8UESQ032016; Tue, 16 Apr 2013 03:30:14 -0500 From: Peter Ujfalusi To: Alessandro Zummo , Tony Lindgren CC: , , , Christoph Fritz , Grygorii Strashko , Tomi Valkeinen Subject: [rtc-linux] [PATCH v2 1/2] RTC: rtc-twl: Fix rtc_reg_map initialization Date: Tue, 16 Apr 2013 10:30:12 +0200 Message-ID: <1366101013-21183-1-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.8.1.5 MIME-Version: 1.0 X-Original-Sender: peter.ujfalusi@ti.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of peter.ujfalusi@ti.com designates 198.47.26.152 as permitted sender) smtp.mail=peter.ujfalusi@ti.com 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: , Initialize the rtc_reg_map in platform_driver's probe function instead at module_init time. This way we can make sure that the twl-core has been already probed and initialized (twl_priv->twl_id is valid) since the platform device for the RTC driver will be created by the twl-core after it finished it's init. Reported-by: Christoph Fritz Signed-off-by: Peter Ujfalusi Tested-by: Kevin Hilman --- Hi, As Tomi commented on the first version: www.spinics.net/lists/linux-omap/msg90064.html www.spinics.net/lists/linux-omap/msg90066.html I have separated the actual fix from the module_platform_driver() conversion. Regards, Peter drivers/rtc/rtc-twl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/rtc/rtc-twl.c b/drivers/rtc/rtc-twl.c index 8bc6c80..c385e9b 100644 --- a/drivers/rtc/rtc-twl.c +++ b/drivers/rtc/rtc-twl.c @@ -469,6 +469,12 @@ static int twl_rtc_probe(struct platform_device *pdev) if (irq <= 0) goto out1; + /* Initialize the register map */ + if (twl_class_is_4030()) + rtc_reg_map = (u8 *)twl4030_rtc_reg_map; + else + rtc_reg_map = (u8 *)twl6030_rtc_reg_map; + ret = twl_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG); if (ret < 0) goto out1; @@ -614,11 +620,6 @@ static struct platform_driver twl4030rtc_driver = { static int __init twl_rtc_init(void) { - if (twl_class_is_4030()) - rtc_reg_map = (u8 *) twl4030_rtc_reg_map; - else - rtc_reg_map = (u8 *) twl6030_rtc_reg_map; - return platform_driver_register(&twl4030rtc_driver); } module_init(twl_rtc_init);