From patchwork Fri May 29 22:19:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 49244 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5AFFE24588 for ; Fri, 29 May 2015 22:22:39 +0000 (UTC) Received: by wgv5 with SMTP id 5sf17207851wgv.0 for ; Fri, 29 May 2015 15:22:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=vhxxv2iXoh+vMLIp9Uqc0yriUAYATJqplozRStx4+Og=; b=XWNTMnmwAB/CmE5cWWiCTyYSF8E1M/PQ2sj23sVj6Ak9hFDtWumbB9U40w9VBZtHUy Rb7fBsiZkDcjktNDh9epXmSt5ntEekS9/9VNIIpxSrLRGE7Y5nBLxiJO1P+cJwOhXTsE trl8ctJ17YDHKz0+bumjk7e8lfVQIkIoVYfWalX2V6R+E7i5KwuG0eoW1p3eh1Slj5Xg qVIMhNpCBwCOOtsiTgMCY4OvSrUCDBHhfr2tahUsCE82PFaZ4dtJBoVQUXclyoNdtd3+ kDoc6x3ObNPz8/ffA33zoVGTOGRVNrez9Uzj8YNJmvXCazyUXkLRB51MzjQXOziRLyyG w7gQ== X-Gm-Message-State: ALoCoQmlpNNW+DzFdxY+uZVGykLIzm8PBLw0s3x9ay3kZQPL9JBOF2F2n3n0UkStS53q581D0rvg X-Received: by 10.180.19.72 with SMTP id c8mr4699188wie.2.1432938158713; Fri, 29 May 2015 15:22:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.22.72 with SMTP id b8ls426748laf.81.gmail; Fri, 29 May 2015 15:22:38 -0700 (PDT) X-Received: by 10.112.159.162 with SMTP id xd2mr9951446lbb.67.1432938158511; Fri, 29 May 2015 15:22:38 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id le13si5810087lbb.27.2015.05.29.15.22.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 May 2015 15:22:38 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by lbcue7 with SMTP id ue7so56857935lbc.0 for ; Fri, 29 May 2015 15:22:38 -0700 (PDT) X-Received: by 10.112.182.4 with SMTP id ea4mr4817270lbc.35.1432938158398; Fri, 29 May 2015 15:22:38 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp667195lbb; Fri, 29 May 2015 15:22:37 -0700 (PDT) X-Received: by 10.70.128.130 with SMTP id no2mr18685385pdb.95.1432938156700; Fri, 29 May 2015 15:22:36 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yo4si1400620pac.203.2015.05.29.15.22.34; Fri, 29 May 2015 15:22:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757498AbbE2WWV (ORCPT + 28 others); Fri, 29 May 2015 18:22:21 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:36381 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757237AbbE2WV7 (ORCPT ); Fri, 29 May 2015 18:21:59 -0400 Received: by pdfh10 with SMTP id h10so62912276pdf.3 for ; Fri, 29 May 2015 15:21:58 -0700 (PDT) X-Received: by 10.68.105.195 with SMTP id go3mr2238418pbb.48.1432938118138; Fri, 29 May 2015 15:21:58 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by mx.google.com with ESMTPSA id nb10sm6605761pdb.76.2015.05.29.15.21.53 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 May 2015 15:21:57 -0700 (PDT) From: Vaibhav Hiremath To: linux-arm-kernel@lists.infradead.org Cc: robh+dt@kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com, sameo@linux.intel.com, lee.jones@linaro.org, a.zummo@towertech.it, alexandre.belloni@free-electrons.com, Vaibhav Hiremath , Chao Xie Subject: [PATCH 3/4] rtc: 88pm80x: add device tree support Date: Sat, 30 May 2015 03:49:21 +0530 Message-Id: <1432937962-4537-4-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432937962-4537-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1432937962-4537-1-git-send-email-vaibhav.hiremath@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: vaibhav.hiremath@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Along with DT support, this patch also cleans up the unnecessary code around 'rtc_wakeup' initialization. Signed-off-by: Chao Xie Signed-off-by: Vaibhav Hiremath --- drivers/rtc/rtc-88pm80x.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/rtc/rtc-88pm80x.c b/drivers/rtc/rtc-88pm80x.c index 7df0579..8f66519 100644 --- a/drivers/rtc/rtc-88pm80x.c +++ b/drivers/rtc/rtc-88pm80x.c @@ -251,17 +251,26 @@ static SIMPLE_DEV_PM_OPS(pm80x_rtc_pm_ops, pm80x_rtc_suspend, pm80x_rtc_resume); static int pm80x_rtc_probe(struct platform_device *pdev) { struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent); - struct pm80x_platform_data *pm80x_pdata = - dev_get_platdata(pdev->dev.parent); - struct pm80x_rtc_pdata *pdata = NULL; + struct pm80x_rtc_pdata *pdata = dev_get_platdata(&pdev->dev); struct pm80x_rtc_info *info; + struct device_node *node = pdev->dev.of_node; struct rtc_time tm; unsigned long ticks = 0; int ret; - pdata = dev_get_platdata(&pdev->dev); - if (pdata == NULL) - dev_warn(&pdev->dev, "No platform data!\n"); + if (!pdata && !node) { + dev_err(&pdev->dev, + "pm80x-rtc requires platform data or of_node\n"); + return -EINVAL; + } + + if (!pdata) { + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) { + dev_err(&pdev->dev, "failed to allocate memory\n"); + return -ENOMEM; + } + } info = devm_kzalloc(&pdev->dev, sizeof(struct pm80x_rtc_info), GFP_KERNEL); @@ -327,11 +336,8 @@ static int pm80x_rtc_probe(struct platform_device *pdev) regmap_update_bits(info->map, PM800_RTC_CONTROL, PM800_RTC1_USE_XO, PM800_RTC1_USE_XO); - if (pm80x_pdata) { - pdata = pm80x_pdata->rtc; - if (pdata) - info->rtc_dev->dev.platform_data = &pdata->rtc_wakeup; - } + /* remeber whether this power up is caused by PMIC RTC or not */ + info->rtc_dev->dev.platform_data = &pdata->rtc_wakeup; device_init_wakeup(&pdev->dev, 1);