From patchwork Wed Jul 8 12:26:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 50872 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1144922A03 for ; Wed, 8 Jul 2015 12:30:05 +0000 (UTC) Received: by lagx9 with SMTP id x9sf66156448lag.2 for ; Wed, 08 Jul 2015 05:30:03 -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=mVZ+TPRjgucqy3tzy1Zy6UvaNL+lJRAzp7DxAAMLKSI=; b=PnWP+QFlQazF02s1C/7UFaheE38H+wJJV3ZPn2ancnAlpO2AUgMifqk4izMGkW7wiX sYO4aX25NZPllTTzF3ZXyGuBfMcD5WdY4Uc06tvACLrNvf4zToP+KrdttY5cL/Q366LC iKR9MZS4Cb6NSOB84humcpFueN2MPL8AQbc1F3LWehZ+QHk6eZ4P5L1mOSqi7uCgzpE7 /ATGdqd2Ohi1s88QM2Q77E6nd0aWNEn85URYxofB/SuXgmXeniCJHYXS0k9ZFFWo2BKm 8HTPdrQTID92ln+KYNKtHj809+98eI03CuAiArXib5HlrkXKGY3KGHHml7dwX1Pn+jN+ CXxg== X-Gm-Message-State: ALoCoQkHEmaRtqwT4vp8M8gSg05Xm/8pxQjNubD4YgMdxcJHMshUKMenQMZnCrvLm2RFKEMvS7Sy X-Received: by 10.152.26.226 with SMTP id o2mr4764604lag.0.1436358603304; Wed, 08 Jul 2015 05:30:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.224.162 with SMTP id rd2ls886672lac.84.gmail; Wed, 08 Jul 2015 05:30:03 -0700 (PDT) X-Received: by 10.112.118.137 with SMTP id km9mr9329377lbb.28.1436358603054; Wed, 08 Jul 2015 05:30:03 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id lm6si1542440lac.58.2015.07.08.05.30.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jul 2015 05:30:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by labgy5 with SMTP id gy5so71906068lab.2 for ; Wed, 08 Jul 2015 05:30:03 -0700 (PDT) X-Received: by 10.152.5.228 with SMTP id v4mr1895863lav.36.1436358602952; Wed, 08 Jul 2015 05:30:02 -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 hn6csp3060084lbb; Wed, 8 Jul 2015 05:30:01 -0700 (PDT) X-Received: by 10.66.147.131 with SMTP id tk3mr8532795pab.104.1436358600533; Wed, 08 Jul 2015 05:30:00 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tg9si3857451pab.202.2015.07.08.05.29.59; Wed, 08 Jul 2015 05:30:00 -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 S1758442AbbGHM3j (ORCPT + 29 others); Wed, 8 Jul 2015 08:29:39 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:33184 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758383AbbGHM3g (ORCPT ); Wed, 8 Jul 2015 08:29:36 -0400 Received: by pdbqm3 with SMTP id qm3so1733888pdb.0 for ; Wed, 08 Jul 2015 05:29:35 -0700 (PDT) X-Received: by 10.70.37.43 with SMTP id v11mr20161301pdj.89.1436358575791; Wed, 08 Jul 2015 05:29:35 -0700 (PDT) Received: from localhost.localdomain ([202.62.93.138]) by smtp.gmail.com with ESMTPSA id db1sm2415741pdb.50.2015.07.08.05.29.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jul 2015 05:29:34 -0700 (PDT) From: Vaibhav Hiremath To: linux-arm-kernel@lists.infradead.org Cc: Vaibhav Hiremath , Chao Xie , Samuel Ortiz , Lee Jones , linux-kernel@vger.kernel.org (open list) Subject: [PATCH-v6 2/6] mfd: 88pm800: Add device tree support Date: Wed, 8 Jul 2015 17:56:28 +0530 Message-Id: <1436358392-15449-3-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436358392-15449-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1436358392-15449-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.41 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: , Add DT support to the 88pm800 driver, along with compatible field for it's sub-devices (rtc, onkey and regulator) Signed-off-by: Chao Xie Signed-off-by: Vaibhav Hiremath Reviewed-by: Krzysztof Kozlowski Acked-by: Lee Jones --- drivers/mfd/88pm800.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c index 0c5470e..95c418c 100644 --- a/drivers/mfd/88pm800.c +++ b/drivers/mfd/88pm800.c @@ -27,6 +27,7 @@ #include #include #include +#include /* Interrupt Registers */ #define PM800_INT_STATUS1 (0x05) @@ -121,6 +122,11 @@ static const struct i2c_device_id pm80x_id_table[] = { }; MODULE_DEVICE_TABLE(i2c, pm80x_id_table); +static const struct of_device_id pm80x_of_match_table[] = { + { .compatible = "marvell,88pm800", }, + {}, +}; + static struct resource rtc_resources[] = { { .name = "88pm80x-rtc", @@ -133,6 +139,7 @@ static struct resource rtc_resources[] = { static struct mfd_cell rtc_devs[] = { { .name = "88pm80x-rtc", + .of_compatible = "marvell,88pm80x-rtc", .num_resources = ARRAY_SIZE(rtc_resources), .resources = &rtc_resources[0], .id = -1, @@ -151,6 +158,7 @@ static struct resource onkey_resources[] = { static const struct mfd_cell onkey_devs[] = { { .name = "88pm80x-onkey", + .of_compatible = "marvell,88pm80x-onkey", .num_resources = 1, .resources = &onkey_resources[0], .id = -1, @@ -160,6 +168,7 @@ static const struct mfd_cell onkey_devs[] = { static const struct mfd_cell regulator_devs[] = { { .name = "88pm80x-regulator", + .of_compatible = "marvell,88pm80x-regulator", .id = -1, }, }; @@ -520,8 +529,24 @@ static int pm800_probe(struct i2c_client *client, int ret = 0; struct pm80x_chip *chip; struct pm80x_platform_data *pdata = dev_get_platdata(&client->dev); + struct device_node *np = client->dev.of_node; struct pm80x_subchip *subchip; + if (!pdata && !np) { + dev_err(&client->dev, + "pm80x requires platform data or of_node\n"); + return -EINVAL; + } + + if (!pdata) { + pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return -ENOMEM; + + /* Ensure we only alloc platform data once */ + client->dev.platform_data = pdata; + } + ret = pm80x_init(client); if (ret) { dev_err(&client->dev, "pm800_init fail\n"); @@ -587,6 +612,7 @@ static struct i2c_driver pm800_driver = { .name = "88PM800", .owner = THIS_MODULE, .pm = &pm80x_pm_ops, + .of_match_table = pm80x_of_match_table, }, .probe = pm800_probe, .remove = pm800_remove,