From patchwork Fri Jan 25 15:37:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 156611 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp518257jaa; Fri, 25 Jan 2019 07:57:13 -0800 (PST) X-Google-Smtp-Source: ALg8bN76L7GZgpTRLwT0K0fifC0+D0hmDWSFgzYeHTcpv9mKNxepqwkBGq9gCVEwHVssKQsYTNTa X-Received: by 2002:a63:e84c:: with SMTP id a12mr10299224pgk.241.1548431833221; Fri, 25 Jan 2019 07:57:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548431833; cv=none; d=google.com; s=arc-20160816; b=g59XIxZ0sMNfLsY3tGXkLuJISODv9szULRWRbyrzdBzdk9emvS+ZtH4AvvshzGFQTF S1VPUpkzxp3a+HjV0ejK7EstYScOdwqO0GcJx0fjfGjkrKfPX++Pc4QHYAVEhlnjbYxr GtmYyoDjCHXn8IXvbaK90nx+/PacW1tLyqH0Ew/K2a0pTKruqWvPFzWxi3QMiVOyMPMq QhSd+/d9mXW+EJKhpNaWZzYQCPqF68/rIgRGKyeGGgRZNkk13wpQpvrloVx2EaiAVajU mGcaPNcaGj/IpGsjvMnVD2SFjWoaR8HpR95aclW27sl1oWO0NKc6YbiAFdLWtqL8qQL4 Ttfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=yznjzNNy1+1fIbKuH6Qgt44pp5Q8zl8F/RgJ2eO6RFw=; b=JTAl8FDAZw1wCBeOyiV0h3q1Fc7KnqP+lNTIT8to+gZCLjEe6ZGkMdiD5VVEdxh5Ph aSMHkuEkOKFK2gNe6oi+Lzz7ISuUucOAouUVpAwxpjcuSnXHPbn7YLzhhiHUQfHdRd5C S18qfE0M57ALieaDgfd1JHpsk1of6k2AT8Ou+Ew+TOWty3EmJ9oWnpR3VIplb+M5qvkP mI+EqB+SJtm9vURKcFhfM5PQ/4TEJSKS+jSL8iRhjeFJ8d2RuYOfFfdRyo2SwHZnVZwb w7AJRIgoaxbn/+WX2+3Q44l6WL3XpOY9KbTukKLqFSCZBJUY/pDWh9NdFCOP8TuaECkG bGyQ== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l6si24942422pgg.592.2019.01.25.07.57.13; Fri, 25 Jan 2019 07:57:13 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726964AbfAYP5M (ORCPT + 7 others); Fri, 25 Jan 2019 10:57:12 -0500 Received: from mail-oi1-f196.google.com ([209.85.167.196]:35156 "EHLO mail-oi1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726252AbfAYP5M (ORCPT ); Fri, 25 Jan 2019 10:57:12 -0500 Received: by mail-oi1-f196.google.com with SMTP id v6so8022818oif.2; Fri, 25 Jan 2019 07:57:11 -0800 (PST) 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:mime-version:content-transfer-encoding; bh=yznjzNNy1+1fIbKuH6Qgt44pp5Q8zl8F/RgJ2eO6RFw=; b=lpUqZjZD+tzq0d6qU+KcAHALjjXeTU8Y+PQ0hq0e1cKq9zcZjnkTEM7VWg0nSkIm/w ZGbMZ5wZh2nEF2biacDmgiMd6Lj/p/xXbgKVa2AtV8praq2yO/IJqkmU995Tn9ZtSfHN jDOEmuKyl01IUtXnuLoYPY7Hn8fySnGWYeuPwzbwG9pv+RkGuYyP9KfAYXjyxK0D6kNV rnV9VUPpocrxUWeSs62Vcm5C/f4nqDlWd4gEELjK11zKQmFdFjCLEk78O7tFB16Ue4rm 5cjRM7xyZGe8NTqoekjUs5ysCI67ovb6jg3MvjiZOn9vBlGZ2muhEceMLnGCqc8hem47 kYMg== X-Gm-Message-State: AJcUukcx7FZvm/NPlj2nUDQoY1JsiEPbk0dUQgnPwIdSc0A20ogI9e4D lr2SCbEhWLNzujc2LRAHEzEsoFU= X-Received: by 2002:aca:e715:: with SMTP id e21mr1684734oih.76.1548430629308; Fri, 25 Jan 2019 07:37:09 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id w5sm1259009oif.48.2019.01.25.07.37.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 07:37:08 -0800 (PST) From: Rob Herring To: Mark Brown Cc: linux-kernel@vger.kernel.org, Frank Rowand , devicetree@vger.kernel.org, Support Opensource , Liam Girdwood Subject: [PATCH 2/2] regulator: da9052: Use lowercase regulator names to match the DT Date: Fri, 25 Jan 2019 09:37:05 -0600 Message-Id: <20190125153705.29921-2-robh@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190125153705.29921-1-robh@kernel.org> References: <20190125153705.29921-1-robh@kernel.org> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Since c32569e358ad ("regulator: Use of_node_name_eq for node name comparisons"), regulator node name comparisons are case sensitive. The DA9052 driver uses uppercase, but the DT has lowercase. Fix this by using a lowercase regulator name to match the DT node name. Fixes: c32569e358ad ("regulator: Use of_node_name_eq for node name comparisons") Cc: Support Opensource Cc: Liam Girdwood Cc: Mark Brown Signed-off-by: Rob Herring --- drivers/regulator/da9052-regulator.c | 64 ++++++++++++++-------------- 1 file changed, 32 insertions(+), 32 deletions(-) -- 2.19.1 diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c index 207cb3859dcc..cefa3558236d 100644 --- a/drivers/regulator/da9052-regulator.c +++ b/drivers/regulator/da9052-regulator.c @@ -290,10 +290,10 @@ static const struct regulator_ops da9052_ldo_ops = { .disable = regulator_disable_regmap, }; -#define DA9052_LDO(_id, step, min, max, sbits, ebits, abits) \ +#define DA9052_LDO(_id, _name, step, min, max, sbits, ebits, abits) \ {\ .reg_desc = {\ - .name = #_id,\ + .name = #_name,\ .ops = &da9052_ldo_ops,\ .type = REGULATOR_VOLTAGE,\ .id = DA9052_ID_##_id,\ @@ -310,10 +310,10 @@ static const struct regulator_ops da9052_ldo_ops = { .activate_bit = (abits),\ } -#define DA9052_DCDC(_id, step, min, max, sbits, ebits, abits) \ +#define DA9052_DCDC(_id, _name, step, min, max, sbits, ebits, abits) \ {\ .reg_desc = {\ - .name = #_id,\ + .name = #_name,\ .ops = &da9052_dcdc_ops,\ .type = REGULATOR_VOLTAGE,\ .id = DA9052_ID_##_id,\ @@ -331,37 +331,37 @@ static const struct regulator_ops da9052_ldo_ops = { } static struct da9052_regulator_info da9052_regulator_info[] = { - DA9052_DCDC(BUCK1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO), - DA9052_DCDC(BUCK2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO), - DA9052_DCDC(BUCK3, 25, 950, 2525, 6, 6, DA9052_SUPPLY_VBMEMGO), - DA9052_DCDC(BUCK4, 50, 1800, 3600, 5, 6, 0), - DA9052_LDO(LDO1, 50, 600, 1800, 5, 6, 0), - DA9052_LDO(LDO2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO), - DA9052_LDO(LDO3, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO), - DA9052_LDO(LDO4, 25, 1725, 3300, 6, 6, 0), - DA9052_LDO(LDO5, 50, 1200, 3600, 6, 6, 0), - DA9052_LDO(LDO6, 50, 1200, 3600, 6, 6, 0), - DA9052_LDO(LDO7, 50, 1200, 3600, 6, 6, 0), - DA9052_LDO(LDO8, 50, 1200, 3600, 6, 6, 0), - DA9052_LDO(LDO9, 50, 1250, 3650, 6, 6, 0), - DA9052_LDO(LDO10, 50, 1200, 3600, 6, 6, 0), + DA9052_DCDC(BUCK1, buck1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO), + DA9052_DCDC(BUCK2, buck2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO), + DA9052_DCDC(BUCK3, buck3, 25, 950, 2525, 6, 6, DA9052_SUPPLY_VBMEMGO), + DA9052_DCDC(BUCK4, buck4, 50, 1800, 3600, 5, 6, 0), + DA9052_LDO(LDO1, ldo1, 50, 600, 1800, 5, 6, 0), + DA9052_LDO(LDO2, ldo2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO), + DA9052_LDO(LDO3, ldo3, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO), + DA9052_LDO(LDO4, ldo4, 25, 1725, 3300, 6, 6, 0), + DA9052_LDO(LDO5, ldo5, 50, 1200, 3600, 6, 6, 0), + DA9052_LDO(LDO6, ldo6, 50, 1200, 3600, 6, 6, 0), + DA9052_LDO(LDO7, ldo7, 50, 1200, 3600, 6, 6, 0), + DA9052_LDO(LDO8, ldo8, 50, 1200, 3600, 6, 6, 0), + DA9052_LDO(LDO9, ldo9, 50, 1250, 3650, 6, 6, 0), + DA9052_LDO(LDO10, ldo10, 50, 1200, 3600, 6, 6, 0), }; static struct da9052_regulator_info da9053_regulator_info[] = { - DA9052_DCDC(BUCK1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO), - DA9052_DCDC(BUCK2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO), - DA9052_DCDC(BUCK3, 25, 950, 2525, 6, 6, DA9052_SUPPLY_VBMEMGO), - DA9052_DCDC(BUCK4, 25, 950, 2525, 6, 6, 0), - DA9052_LDO(LDO1, 50, 600, 1800, 5, 6, 0), - DA9052_LDO(LDO2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO), - DA9052_LDO(LDO3, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO), - DA9052_LDO(LDO4, 25, 1725, 3300, 6, 6, 0), - DA9052_LDO(LDO5, 50, 1200, 3600, 6, 6, 0), - DA9052_LDO(LDO6, 50, 1200, 3600, 6, 6, 0), - DA9052_LDO(LDO7, 50, 1200, 3600, 6, 6, 0), - DA9052_LDO(LDO8, 50, 1200, 3600, 6, 6, 0), - DA9052_LDO(LDO9, 50, 1250, 3650, 6, 6, 0), - DA9052_LDO(LDO10, 50, 1200, 3600, 6, 6, 0), + DA9052_DCDC(BUCK1, buck1, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBCOREGO), + DA9052_DCDC(BUCK2, buck2, 25, 500, 2075, 6, 6, DA9052_SUPPLY_VBPROGO), + DA9052_DCDC(BUCK3, buck3, 25, 950, 2525, 6, 6, DA9052_SUPPLY_VBMEMGO), + DA9052_DCDC(BUCK4, buck4, 25, 950, 2525, 6, 6, 0), + DA9052_LDO(LDO1, ldo1, 50, 600, 1800, 5, 6, 0), + DA9052_LDO(LDO2, ldo2, 25, 600, 1800, 6, 6, DA9052_SUPPLY_VLDO2GO), + DA9052_LDO(LDO3, ldo3, 25, 1725, 3300, 6, 6, DA9052_SUPPLY_VLDO3GO), + DA9052_LDO(LDO4, ldo4, 25, 1725, 3300, 6, 6, 0), + DA9052_LDO(LDO5, ldo5, 50, 1200, 3600, 6, 6, 0), + DA9052_LDO(LDO6, ldo6, 50, 1200, 3600, 6, 6, 0), + DA9052_LDO(LDO7, ldo7, 50, 1200, 3600, 6, 6, 0), + DA9052_LDO(LDO8, ldo8, 50, 1200, 3600, 6, 6, 0), + DA9052_LDO(LDO9, ldo9, 50, 1250, 3650, 6, 6, 0), + DA9052_LDO(LDO10, ldo10, 50, 1200, 3600, 6, 6, 0), }; static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id,