From patchwork Fri Nov 16 11:01:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 151333 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp279115ljp; Fri, 16 Nov 2018 03:02:16 -0800 (PST) X-Google-Smtp-Source: AJdET5e5W8WnZVoizGxkXrhZCrEl+ypOukTYkVXAEf3Yt0DOt0r0CP4q+5HLXI4moGb3120bQ4MM X-Received: by 2002:a62:a511:: with SMTP id v17-v6mr10511247pfm.18.1542366136121; Fri, 16 Nov 2018 03:02:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542366136; cv=none; d=google.com; s=arc-20160816; b=RrwAb0fFtAyMxqG/UPVH1x4qPG3qVC5t0cU0AZRjxxIQWF9hC1/tAv+6LX2CL0EDgY KVaNeBA03ob2MqNvQYjqZYJLjHXhGwkn4ghWX0S8PiICno1aMTyr1iUcRxaGaMlGJsEh pYZXh++eCCP/xBpGi7GXcTTXYvALLev85zALwD8FMoYqHfNrZqe4PeItG3iXT6nIEXzr L9LnjDP69Q8DtsCqOkXGDR734WufR1ArwG3JFgIhwaSuxaqFFbmtOpvLBpI7JCXSTS3N Q7mMEGxwoQszmKb0cOytkOx/ZjqfyHhQqou0HijbE1Cr0/cGUY1qkWKFqwvUutfUIq/C jXew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=oFvCzZZqNBSbDG9EOSs0H2fQO9rLPB9US33Ar8fKAkM=; b=uytrcxpCMXP+rq5Xi0KkEI2aOkSDr7BHpC5iecvAINVLMylMH8g2/eXsyov5RwLans xDhYu9JNgotc2aNJ/In9Cs1xuX5QMKnUx5+vYxXjXbcecBXE+uRw0AUtnqpr3stWOtW8 elvrZZsx2SzqTSpLYGgD8O5HH/m/Jcta3mgQtD6drCHiFrDglIaztHRd1gsdTRf3gm5X P5Sf5W/kdfApGv6f4c/cTwVFurFQ0zmkSg+TLbaVdXKOlT9heo3gXqo4RyPLARJ4bifN hFd2wvZLDrVQEJWGsFqR9CDjVGbNo7GxSFe6IPv0pAvXZOI+LBrQe7ht6zYQ+y07sWL4 lPCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R0QhzbVv; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p23si27650711pgk.312.2018.11.16.03.02.15; Fri, 16 Nov 2018 03:02:16 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=R0QhzbVv; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389585AbeKPVOF (ORCPT + 6 others); Fri, 16 Nov 2018 16:14:05 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:38985 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389581AbeKPVOF (ORCPT ); Fri, 16 Nov 2018 16:14:05 -0500 Received: by mail-pf1-f194.google.com with SMTP id c72so6567627pfc.6 for ; Fri, 16 Nov 2018 03:02:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=oFvCzZZqNBSbDG9EOSs0H2fQO9rLPB9US33Ar8fKAkM=; b=R0QhzbVvE26Vzwv072oDm8R9rLKqth6qj0b3qrBuv9NlCudvzF0mmxvQx/ZAvuPQDr Q0mMTxVsV62Eo18dZA7NYVFq16oNuJaYaFzb1nGb6sNfHRUrrhu1Z/3bhxa7OSyOcvXc /SjgRJvcZxdBvRUXqUpUt+UGRcGLLGN/cUeq4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=oFvCzZZqNBSbDG9EOSs0H2fQO9rLPB9US33Ar8fKAkM=; b=afwCN2lGSGSM3gS438HxAwGN9FP8YU2cmFNBX6O2oT5rwM3usC3AYQyJ+hhpTz0sXi /OR0NUNoQTpAq4pJimvHzLe6vfFYbsOjrSLMRPM1p8LFNhTyOFmA4+s+zGjnwxt28n8a Xi7FF29i4GJoMn8eWJochogHJcgMkYx28L9wJ35mkG2hHbb11cUUenZ2IDnSvb99erfR ckJwQIUjHx7+mB/krrARcRY7oBslW8+USQg8Mv8wkrkg4Fguf0U4JxmMztRuWvftqyTn k6H/fTmmIsIaYiez3MH21Xb+MijspfL7CS4hNh73Dp7jV0UtZtmCYYooBKkqvF8F/ZdM /PWw== X-Gm-Message-State: AGRZ1gIyEgXvP3/+5TN+2yI5GPsVnsN8fgQzg4hSQfUAOp9pfuhr+QbH d+KezeRdHJEPOWrmACjpYGOUQQ== X-Received: by 2002:a63:e445:: with SMTP id i5mr9466026pgk.307.1542366134115; Fri, 16 Nov 2018 03:02:14 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id 202sm21268106pfy.87.2018.11.16.03.02.09 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Nov 2018 03:02:13 -0800 (PST) From: Baolin Wang To: sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, yuanjiang.yu@unisoc.com, baolin.wang@linaro.org, broonie@kernel.org, linus.walleij@linaro.org Subject: [PATCH 5/6] power: supply: charger-manager: Remove deprecated extcon APIs Date: Fri, 16 Nov 2018 19:01:12 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <4ea9eaf85d780afb190cb45da2df8ff5fd86d449.1542362262.git.baolin.wang@linaro.org> References: <4ea9eaf85d780afb190cb45da2df8ff5fd86d449.1542362262.git.baolin.wang@linaro.org> In-Reply-To: <4ea9eaf85d780afb190cb45da2df8ff5fd86d449.1542362262.git.baolin.wang@linaro.org> References: <4ea9eaf85d780afb190cb45da2df8ff5fd86d449.1542362262.git.baolin.wang@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The struct extcon_specific_cable_nb and related APIs are deprecated now, so we should use new method to get one extcon device and register extcon notifier. Signed-off-by: Baolin Wang --- .../bindings/power/supply/charger-manager.txt | 6 +-- drivers/power/supply/charger-manager.c | 51 ++++++++------------ include/linux/power/charger-manager.h | 2 +- 3 files changed, 23 insertions(+), 36 deletions(-) -- 1.7.9.5 diff --git a/Documentation/devicetree/bindings/power/supply/charger-manager.txt b/Documentation/devicetree/bindings/power/supply/charger-manager.txt index ec4fe9d..315b0cb 100644 --- a/Documentation/devicetree/bindings/power/supply/charger-manager.txt +++ b/Documentation/devicetree/bindings/power/supply/charger-manager.txt @@ -11,7 +11,7 @@ Required properties : - cm-regulator-name : name of charger regulator - subnode : - cm-cable-name : name of charger cable - - cm-cable-extcon : name of extcon dev + - extcon : phandles to external connector devices (optional) - cm-cable-min : minimum current of cable (optional) - cm-cable-max : maximum current of cable @@ -66,13 +66,13 @@ Example : cm-regulator-name = "chg-reg"; cable@0 { cm-cable-name = "USB"; - cm-cable-extcon = "extcon-dev.0"; + extcon = <&extcon_usb>; cm-cable-min = <475000>; cm-cable-max = <500000>; }; cable@1 { cm-cable-name = "TA"; - cm-cable-extcon = "extcon-dev.0"; + extcon = <&extcon_usb>; cm-cable-min = <650000>; cm-cable-max = <675000>; }; diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c index dc0c9a6..4f28c03 100644 --- a/drivers/power/supply/charger-manager.c +++ b/drivers/power/supply/charger-manager.c @@ -1207,12 +1207,11 @@ static int charger_extcon_init(struct charger_manager *cm, */ INIT_WORK(&cable->wq, charger_extcon_work); cable->nb.notifier_call = charger_extcon_notifier; - ret = extcon_register_interest(&cable->extcon_dev, - cable->extcon_name, cable->name, &cable->nb); - if (ret < 0) { - pr_info("Cannot register extcon_dev for %s(cable: %s)\n", - cable->extcon_name, cable->name); - } + ret = devm_extcon_register_notifier(cm->dev, cable->extcon_dev, + EXTCON_USB, &cable->nb); + if (ret < 0) + dev_err(cm->dev, "Cannot register extcon_dev for (cable: %s)\n", + cable->name); return ret; } @@ -1589,15 +1588,25 @@ static struct charger_desc *of_cm_parse_desc(struct device *dev) for_each_child_of_node(child, _child) { of_property_read_string(_child, "cm-cable-name", &cables->name); - of_property_read_string(_child, - "cm-cable-extcon", - &cables->extcon_name); of_property_read_u32(_child, "cm-cable-min", &cables->min_uA); of_property_read_u32(_child, "cm-cable-max", &cables->max_uA); + + if (of_property_read_bool(_child, "extcon")) { + struct device_node *np; + + np = of_parse_phandle(_child, "extcon", 0); + if (!np) + return ERR_PTR(-ENODEV); + + cables->extcon_dev = extcon_find_edev_by_node(np); + of_node_put(np); + if (IS_ERR(cables->extcon_dev)) + return ERR_PTR(PTR_ERR(cables->extcon_dev)); + } cables++; } } @@ -1625,7 +1634,6 @@ static int charger_manager_probe(struct platform_device *pdev) struct charger_desc *desc = cm_get_drv_data(pdev); struct charger_manager *cm; int ret, i = 0; - int j = 0; union power_supply_propval val; struct power_supply *fuel_gauge; struct power_supply_config psy_cfg = {}; @@ -1823,19 +1831,8 @@ static int charger_manager_probe(struct platform_device *pdev) &charger->attr_g); } err_reg_extcon: - for (i = 0; i < desc->num_charger_regulators; i++) { - struct charger_regulator *charger; - - charger = &desc->charger_regulators[i]; - for (j = 0; j < charger->num_cables; j++) { - struct charger_cable *cable = &charger->cables[j]; - /* Remove notifier block if only edev exists */ - if (cable->extcon_dev.edev) - extcon_unregister_interest(&cable->extcon_dev); - } - + for (i = 0; i < desc->num_charger_regulators; i++) regulator_put(desc->charger_regulators[i].consumer); - } power_supply_unregister(cm->charger_psy); @@ -1847,7 +1844,6 @@ static int charger_manager_remove(struct platform_device *pdev) struct charger_manager *cm = platform_get_drvdata(pdev); struct charger_desc *desc = cm->desc; int i = 0; - int j = 0; /* Remove from the list */ mutex_lock(&cm_list_mtx); @@ -1857,15 +1853,6 @@ static int charger_manager_remove(struct platform_device *pdev) cancel_work_sync(&setup_polling); cancel_delayed_work_sync(&cm_monitor_work); - for (i = 0 ; i < desc->num_charger_regulators ; i++) { - struct charger_regulator *charger - = &desc->charger_regulators[i]; - for (j = 0 ; j < charger->num_cables ; j++) { - struct charger_cable *cable = &charger->cables[j]; - extcon_unregister_interest(&cable->extcon_dev); - } - } - for (i = 0 ; i < desc->num_charger_regulators ; i++) regulator_put(desc->charger_regulators[i].consumer); diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h index c4fa907..e4d0269 100644 --- a/include/linux/power/charger-manager.h +++ b/include/linux/power/charger-manager.h @@ -66,7 +66,7 @@ struct charger_cable { const char *name; /* The charger-manager use Extcon framework */ - struct extcon_specific_cable_nb extcon_dev; + struct extcon_dev *extcon_dev; struct work_struct wq; struct notifier_block nb;