From patchwork Wed Jun 17 18:58:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 49987 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3AEEE228CC for ; Wed, 17 Jun 2015 19:01:44 +0000 (UTC) Received: by lbbti3 with SMTP id ti3sf14917451lbb.1 for ; Wed, 17 Jun 2015 12:01:43 -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=fjSO7eKK0mOwyRY6MZ+yn6A+cAqtk0QooCB0dfBHRQQ=; b=NfzSUToxomfhzV8I9FvwRAB0/Pk167LSbGxf4GsiC7hLNHlpD0uzuf2cYn2ll9ZyX9 O2RfjBS3Hc2eGuTPvZukL9ZM5It7ftmsiFsHFAqexBxwN4Abw67on7L42MsJE1k8giZF jihrrib8xZM2JVFEY9585BITFdSiH7ZYDTmJbXepXZmundQKBZGl1lrzXB61Sv2fKslF aX/QXfjA/HJC48n1MYCjvShOWuSX4kX6d6LPlnhyp9iz8qEr+QZGzyFvlFshchTyjwGk WzvAQnqPwNzI7YAw1dGR9+tcdZzUkK487/i/0kEbUIVjAbf12dBgT3286zxaMC7NkgUC 1vXQ== X-Gm-Message-State: ALoCoQmwlq0nl/FNb52ZT66SW2O3ERAKblKlt8lg/gP+sVlsjURf5+svDbudPQ9tQ2SLSwk3H8Yy X-Received: by 10.112.28.111 with SMTP id a15mr6624750lbh.21.1434567703191; Wed, 17 Jun 2015 12:01:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.7 with SMTP id f7ls336611lah.48.gmail; Wed, 17 Jun 2015 12:01:42 -0700 (PDT) X-Received: by 10.152.43.37 with SMTP id t5mr9199713lal.96.1434567702942; Wed, 17 Jun 2015 12:01:42 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id h4si4332559lbm.158.2015.06.17.12.01.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jun 2015 12:01:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by labko7 with SMTP id ko7so39775347lab.2 for ; Wed, 17 Jun 2015 12:01:42 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr9185469lac.41.1434567702745; Wed, 17 Jun 2015 12:01:42 -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 hn6csp662947lbb; Wed, 17 Jun 2015 12:01:41 -0700 (PDT) X-Received: by 10.70.42.13 with SMTP id j13mr13851366pdl.90.1434567700696; Wed, 17 Jun 2015 12:01:40 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pm11si7609723pdb.55.2015.06.17.12.01.39; Wed, 17 Jun 2015 12:01:40 -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 S1757900AbbFQTBe (ORCPT + 30 others); Wed, 17 Jun 2015 15:01:34 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:34337 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757519AbbFQTBK (ORCPT ); Wed, 17 Jun 2015 15:01:10 -0400 Received: by pacgb13 with SMTP id gb13so42439479pac.1 for ; Wed, 17 Jun 2015 12:01:09 -0700 (PDT) X-Received: by 10.66.62.202 with SMTP id a10mr8342109pas.42.1434567669601; Wed, 17 Jun 2015 12:01:09 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by mx.google.com with ESMTPSA id y1sm5521122pdy.2.2015.06.17.12.01.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Jun 2015 12:01:08 -0700 (PDT) From: Vaibhav Hiremath To: linux-arm-kernel@lists.infradead.org Cc: robh+dt@kernel.org, lee.jones@linaro.org, devicetree@vger.kernel.org, rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org, Vaibhav Hiremath , Chao Xie Subject: [PATCH-v2] rtc: 88pm80x: add device tree support Date: Thu, 18 Jun 2015 00:28:06 +0530 Message-Id: <1434567488-6477-3-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434567488-6477-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1434567488-6477-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.215.42 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 --- Link to V1: https://lkml.org/lkml/2015/5/29/757 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);