From patchwork Sun Jun 19 22:27:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chris@lapa.com.au X-Patchwork-Id: 9186757 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9602B6089D for ; Mon, 20 Jun 2016 07:22:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 768BD24B5E for ; Mon, 20 Jun 2016 07:22:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AEBD2522B; Mon, 20 Jun 2016 07:22:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8C0524B5E for ; Mon, 20 Jun 2016 07:22:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752886AbcFTHWS (ORCPT ); Mon, 20 Jun 2016 03:22:18 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:36558 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751775AbcFTHWM (ORCPT ); Mon, 20 Jun 2016 03:22:12 -0400 Received: by mail-pa0-f68.google.com with SMTP id fg1so10392567pad.3 for ; Mon, 20 Jun 2016 00:21:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lapa-com-au.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=p5WMxK8jV66y277r2vMU081BCUHETtaG88QJ5EqLFGU=; b=TxV9FhuItYysR+NZ4B7UkK32n88CnB7lHOqvW4fyRYtIJcL5MsIO6uEZUSf1BAAuK7 8nLe7pN4fO8rRI4tzi43sJozBgB3a1zeAQgsngprs2kc6wpt1pHFsbzUdHX8YxDZfqLS TL+fDOJRXes/fxU3hQCI+yv4NJhwG8S7EXU9eYZr6J9Wvnybhh0aIyi0+aRiTo4XeqXa yslHQKBQO223KYiAEPmeM3h38r6MsFVi6sSm//fZmGHOg3oulC5xQxKCfz0HuqbtM5iv Tg5erIZf7x3lQWSsae5A73rD+YUGuoBDI2JXf+PiYSmAhZd2TaqZUe5H4lme6W3dJxOb aSXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=p5WMxK8jV66y277r2vMU081BCUHETtaG88QJ5EqLFGU=; b=ZrtCFFG2u/j8hVqRZpjtM8A+vMhvgo+DcH/23R/BOx9iXf/qk5r54DCS7wSMv1jdhj DVT2XRg7xA6QrhohQQQwr0hMZcKR29XPuwj3s0hYzTnQrbeqvfSPKYp76jlfr74Co6P/ IkJofi0DjAZT8XlwL7r6KrwlgDTm9iDbyc1k1AMvGBTfiQooVqePsN0XtRRuU/MEiWVp 9Zg2d/Qzmep6Vxlvlrqp/lY5Rlm+g/LkGZyrIpT2a0IXwwmxJp7ZeTLOPzbuZJ6/4PbS 1d632RBgyR8mARFT85JEaOITmuTE6YgvpgKhcszIqLyoEEd6VIA9tW8okQQUAXff2czZ yM/Q== X-Gm-Message-State: ALyK8tKRctjFUjjgwfuCVi6x2QSIDttyPmraIlW0gac1ZRl5Efnyb4bUcdib9IH7e5B1Sw== X-Received: by 10.66.66.234 with SMTP id i10mr20636269pat.114.1466406462615; Mon, 20 Jun 2016 00:07:42 -0700 (PDT) Received: from bbb-dev.management.cpd (163.164.70.115.static.exetel.com.au. [115.70.164.163]) by smtp.gmail.com with ESMTPSA id h5sm78872398pfb.81.2016.06.20.00.07.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jun 2016 00:07:42 -0700 (PDT) From: Chris Lapa X-Google-Original-From: Chris Lapa To: k.kozlowski@samsung.com, dwmw2@infradead.org, dbaryshkov@gmail.com, sre@kernel.org, mark.rutland@arm.com, robh+dt@kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Chris Lapa Subject: [PATCH v4 7/7] max8903: adds support for initiation via device tree Date: Mon, 20 Jun 2016 08:27:22 +1000 Message-Id: <1466375242-38354-8-git-send-email-chris@cpdesign.com.au> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466375242-38354-1-git-send-email-chris@cpdesign.com.au> References: <1464849897-21527-3-git-send-email-chris@lapa.com.au> <1466375242-38354-1-git-send-email-chris@cpdesign.com.au> In-Reply-To: <1464849897-21527-3-git-send-email-chris@lapa.com.au> References: <1464849897-21527-3-git-send-email-chris@lapa.com.au> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chris Lapa Adds support for device tree to setup a max8903 battery charger. DC and USB validity are determined by looking the presence of the dok and uok gpios. Signed-off-by: Chris Lapa Reviewed-by: Krzysztof Kozlowski --- drivers/power/max8903_charger.c | 78 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 72 insertions(+), 6 deletions(-) diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c index 9453bbf..47e3929 100644 --- a/drivers/power/max8903_charger.c +++ b/drivers/power/max8903_charger.c @@ -23,6 +23,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -75,6 +78,7 @@ static int max8903_get_property(struct power_supply *psy, default: return -EINVAL; } + return 0; } @@ -179,6 +183,56 @@ static irqreturn_t max8903_fault(int irq, void *_data) return IRQ_HANDLED; } +static struct max8903_pdata *max8903_parse_dt_data(struct device *dev) +{ + struct device_node *np = dev->of_node; + struct max8903_pdata *pdata = NULL; + + if (!np) + return NULL; + + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) + return NULL; + + pdata->dc_valid = false; + pdata->usb_valid = false; + + pdata->cen = of_get_named_gpio(np, "cen-gpios", 0); + if (!gpio_is_valid(pdata->cen)) + pdata->cen = -EINVAL; + + pdata->chg = of_get_named_gpio(np, "chg-gpios", 0); + if (!gpio_is_valid(pdata->chg)) + pdata->chg = -EINVAL; + + pdata->flt = of_get_named_gpio(np, "flt-gpios", 0); + if (!gpio_is_valid(pdata->flt)) + pdata->flt = -EINVAL; + + pdata->usus = of_get_named_gpio(np, "usus-gpios", 0); + if (!gpio_is_valid(pdata->usus)) + pdata->usus = -EINVAL; + + pdata->dcm = of_get_named_gpio(np, "dcm-gpios", 0); + if (!gpio_is_valid(pdata->dcm)) + pdata->dcm = -EINVAL; + + pdata->dok = of_get_named_gpio(np, "dok-gpios", 0); + if (!gpio_is_valid(pdata->dok)) + pdata->dok = -EINVAL; + else + pdata->dc_valid = true; + + pdata->uok = of_get_named_gpio(np, "uok-gpios", 0); + if (!gpio_is_valid(pdata->uok)) + pdata->uok = -EINVAL; + else + pdata->usb_valid = true; + + return pdata; +} + static int max8903_setup_gpios(struct platform_device *pdev) { struct max8903_data *data = platform_get_drvdata(pdev); @@ -298,16 +352,20 @@ static int max8903_probe(struct platform_device *pdev) struct power_supply_config psy_cfg = {}; int ret = 0; - if (pdata == NULL) { - dev_err(dev, "No platform data.\n"); - return -EINVAL; - } - data = devm_kzalloc(dev, sizeof(struct max8903_data), GFP_KERNEL); if (!data) return -ENOMEM; - data->pdata = pdev->dev.platform_data; + if (IS_ENABLED(CONFIG_OF) && !pdata && dev->of_node) + pdata = max8903_parse_dt_data(dev); + + if (!pdata) { + dev_err(dev, "No platform data.\n"); + return -EINVAL; + } + + pdev->dev.platform_data = pdata; + data->pdata = pdata; data->dev = dev; platform_set_drvdata(pdev, data); @@ -328,6 +386,7 @@ static int max8903_probe(struct platform_device *pdev) data->psy_desc.properties = max8903_charger_props; data->psy_desc.num_properties = ARRAY_SIZE(max8903_charger_props); + psy_cfg.of_node = dev->of_node; psy_cfg.drv_data = data; data->psy = devm_power_supply_register(dev, &data->psy_desc, &psy_cfg); @@ -378,10 +437,17 @@ static int max8903_probe(struct platform_device *pdev) return 0; } +static const struct of_device_id max8903_match_ids[] = { + { .compatible = "maxim,max8903-charger", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(of, max8903_match_ids); + static struct platform_driver max8903_driver = { .probe = max8903_probe, .driver = { .name = "max8903-charger", + .of_match_table = max8903_match_ids }, };