From patchwork Wed Jun 17 18:58:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 49985 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4346B228CC for ; Wed, 17 Jun 2015 19:01:15 +0000 (UTC) Received: by wgez8 with SMTP id z8sf14459911wge.2 for ; Wed, 17 Jun 2015 12:01:14 -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=8MH5Z0AsL4htPRBW7Lsjth/jYbn5NpuSS+bI93QivOA=; b=bnS8LCqban/zQR/ALdLqlinmqGUxV6EMhL4haVX2LNOMhcDoFIVComY45WwMww2WsH ezYKpAyvFFB1n2inldikNZ3e5EtUABlX2ECKqf7hwjUe5ErBU/lsx3why6KbUZ+QWNpF Ivo7tIf+NdNlh0KsW4beptCAeGXRYgN6s1ZzhX6dZaq2skF5M7PPxfNb3Aaqbey+kYST 1Jq4Tw1BnykQbeM35JWfKXxzdwRShiWX+nZCM4GK3XU4o0S08rxNImTUf9XnWoQti9k/ k6pOALZsAArpB1X7J9ivMeJn08/kI5UFrwUlN+D0jm2BbznCNQk0fxyBZsMRmPBloz7b sw5g== X-Gm-Message-State: ALoCoQkLd2tFKby9pPFVFNWUybongfa3rLTnZVke7tHpbrOH7Q8L2aH+slonVnRcm3MjRv/zae7H X-Received: by 10.112.28.111 with SMTP id a15mr6623243lbh.21.1434567674480; Wed, 17 Jun 2015 12:01:14 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.201 with SMTP id t9ls347985laa.95.gmail; Wed, 17 Jun 2015 12:01:14 -0700 (PDT) X-Received: by 10.152.198.166 with SMTP id jd6mr9441767lac.26.1434567674267; Wed, 17 Jun 2015 12:01:14 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id a4si4360763lae.4.2015.06.17.12.01.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jun 2015 12:01:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by laka10 with SMTP id a10so39716089lak.0 for ; Wed, 17 Jun 2015 12:01:14 -0700 (PDT) X-Received: by 10.112.93.37 with SMTP id cr5mr9484646lbb.106.1434567674174; Wed, 17 Jun 2015 12:01:14 -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 hn6csp662641lbb; Wed, 17 Jun 2015 12:01:13 -0700 (PDT) X-Received: by 10.66.136.78 with SMTP id py14mr13769297pab.1.1434567672363; Wed, 17 Jun 2015 12:01:12 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id im3si7585215pbb.55.2015.06.17.12.01.11; Wed, 17 Jun 2015 12:01:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-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 S1757532AbbFQTBI (ORCPT + 7 others); Wed, 17 Jun 2015 15:01:08 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:34245 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757519AbbFQTBF (ORCPT ); Wed, 17 Jun 2015 15:01:05 -0400 Received: by pacgb13 with SMTP id gb13so42437530pac.1 for ; Wed, 17 Jun 2015 12:01:04 -0700 (PDT) X-Received: by 10.68.197.39 with SMTP id ir7mr13506634pbc.87.1434567664325; Wed, 17 Jun 2015 12:01:04 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by mx.google.com with ESMTPSA id y1sm5521122pdy.2.2015.06.17.12.00.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Jun 2015 12:01:02 -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 1/3] mfd: 88pm800: Add device tree support Date: Thu, 18 Jun 2015 00:28:05 +0530 Message-Id: <1434567488-6477-2-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: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@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.44 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 --- drivers/mfd/88pm800.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c index 841717a..059f01a 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, }, }; @@ -544,8 +553,23 @@ 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) { + dev_err(&client->dev, "failed to allocaate memory\n"); + return -ENOMEM; + } + } + ret = pm80x_init(client); if (ret) { dev_err(&client->dev, "pm800_init fail\n"); @@ -611,6 +635,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,