From patchwork Thu Jul 9 06:55:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 50917 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 98DB0228E5 for ; Thu, 9 Jul 2015 06:58:27 +0000 (UTC) Received: by laar3 with SMTP id r3sf72426506laa.1 for ; Wed, 08 Jul 2015 23:58:26 -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: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=bGQwcMSqfSG2NXwJDg4GQ4J0G5FbbKtffISLzk2+4BEzTxI5Xf5VNkBATF1DHA1+yo aVj1Tnt9Th0mXa0g10+wjaNWho2x57hr5vUVkbeXiXrLvv23juABTUcsTdd3OudRJs1Z XKTifImSGv0HqCf8q7q2kSbP6SU87Dn8+QpAPQA8as0IfjQWEJ63yHmRFdPb18Gx6pJz d4/i/JOsCnE2l+/8TmDd1q/iOJeQVuUWrNig47WhvK5Wpgx14M+m3p4kkh1xkiJ6tqGO NmYGWHHqITjTKBdakrFMpYy16ac5WyOhssAM8fBVjJzBtgAIDZ0P9iwfGpYaHzIhF5BC W/4Q== X-Gm-Message-State: ALoCoQmKgPRjyYPAeaO4dXAxWe/RXAJ1TRDl4KgtfnD/FLA2B+o1+BXX8Fxfk+QbjuGqnOrlsCD7 X-Received: by 10.180.198.9 with SMTP id iy9mr8486629wic.7.1436425106603; Wed, 08 Jul 2015 23:58:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.4 with SMTP id x4ls1045417lag.100.gmail; Wed, 08 Jul 2015 23:58:26 -0700 (PDT) X-Received: by 10.152.36.102 with SMTP id p6mr13198871laj.19.1436425106396; Wed, 08 Jul 2015 23:58:26 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id q15si3683353lal.76.2015.07.08.23.58.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jul 2015 23:58:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lagc2 with SMTP id c2so237069069lag.3 for ; Wed, 08 Jul 2015 23:58:25 -0700 (PDT) X-Received: by 10.112.126.101 with SMTP id mx5mr13409761lbb.35.1436425105775; Wed, 08 Jul 2015 23:58:25 -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 hn6csp447120lbb; Wed, 8 Jul 2015 23:58:24 -0700 (PDT) X-Received: by 10.66.236.39 with SMTP id ur7mr28152692pac.123.1436425103843; Wed, 08 Jul 2015 23:58:23 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bi1si7710395pbb.130.2015.07.08.23.58.22; Wed, 08 Jul 2015 23:58:23 -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 S1752117AbbGIG6U (ORCPT + 29 others); Thu, 9 Jul 2015 02:58:20 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:34376 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751085AbbGIG6I (ORCPT ); Thu, 9 Jul 2015 02:58:08 -0400 Received: by pdbep18 with SMTP id ep18so159699432pdb.1 for ; Wed, 08 Jul 2015 23:58:08 -0700 (PDT) X-Received: by 10.70.102.11 with SMTP id fk11mr28084569pdb.144.1436425088294; Wed, 08 Jul 2015 23:58:08 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by smtp.gmail.com with ESMTPSA id h12sm4701100pdk.77.2015.07.08.23.58.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jul 2015 23:58:06 -0700 (PDT) From: Vaibhav Hiremath To: linux-arm-kernel@lists.infradead.org Cc: Vaibhav Hiremath , Chao Xie , Alessandro Zummo , Alexandre Belloni , rtc-linux@googlegroups.com (open list:REAL TIME CLOCK (RTC) SUBSYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [RESEND PATCH-v2] rtc: 88pm80x: add device tree support Date: Thu, 9 Jul 2015 12:25:51 +0530 Message-Id: <1436424952-29680-1-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 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.46 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);