From patchwork Sun Jun 26 05:52:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 70852 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp529498qgy; Sat, 25 Jun 2016 22:52:58 -0700 (PDT) X-Received: by 10.98.72.150 with SMTP id q22mr21784948pfi.122.1466920377721; Sat, 25 Jun 2016 22:52:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 62si17750544pff.74.2016.06.25.22.52.57; Sat, 25 Jun 2016 22:52:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752015AbcFZFwe (ORCPT + 8 others); Sun, 26 Jun 2016 01:52:34 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:33373 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751915AbcFZFwS (ORCPT ); Sun, 26 Jun 2016 01:52:18 -0400 Received: by mail-pa0-f43.google.com with SMTP id b13so49218471pat.0 for ; Sat, 25 Jun 2016 22:52:17 -0700 (PDT) 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; bh=LX0MtLAk1b1cl1TltQNT0FXbbL2HWrcdjogR9nJCwoM=; b=USt5/q9KQfrWvhyXQLyx5NZDyRWYKTlWLFQQyuhtOcV14aKBCfsgF4Ld0Wq0mdpzbM 67zyStU4D2sysabdoSxAo2NkZdeDtkfnl8Dl5P2dmJiRlxpiD9VjwZ5N4e+6gBoCmH+n CTSOyXT9MMJ3tgx2+HGukuyRJ5WFeU6rynzWI= 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; bh=LX0MtLAk1b1cl1TltQNT0FXbbL2HWrcdjogR9nJCwoM=; b=YwdNvQF3esdE+ej89VWMsP4E1TuzjzfBWOZ7am5nRZB/byaCDMWA3Gry/zGqc1N/nO QRc4f8Ak76pxcnn4YAbU1DEJvr/WDmxPEHE2O9KtnhY4HIFD8zh5ST0yf/zONCpLzA8e Wpu7NMYYQh9GELaduNt8d0kGX59KMWcJdfQJDc3JbQny/Y0F/aDLTON1dq5DvmhM4MS+ F8oL/ga9z2cOGQF0kHqvgQT/kdxtVkixzdEFdk6cQzvSrXDxkg2s9NSPPTiWQ2ZlC5oK foDEKy3DltjrfbYzKKRsdf5dhSRT5AHpDReV50td7lL/oruBdrFnrFQ5E//V0GmEX9+K PhTg== X-Gm-Message-State: ALyK8tLLyK3YGYsuZyzkNjoX7AXyr7lhGLkmFg9XiQGbRbUC77VXpWkq1wb0yI16GF14hObM X-Received: by 10.66.75.72 with SMTP id a8mr21371110paw.99.1466920337348; Sat, 25 Jun 2016 22:52:17 -0700 (PDT) Received: from localhost.localdomain (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id h189sm3045789pfc.52.2016.06.25.22.52.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Jun 2016 22:52:17 -0700 (PDT) From: Stephen Boyd To: Mark Brown Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson Subject: [PATCH 2/3] regulator: qcom_spmi: Update mvs1/mvs2 switches on pm8941 Date: Sat, 25 Jun 2016 22:52:12 -0700 Message-Id: <20160626055213.18071-3-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d In-Reply-To: <20160626055213.18071-1-stephen.boyd@linaro.org> References: <20160626055213.18071-1-stephen.boyd@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The mvs1 and mvs2 switches are actually called 5vs1 and 5vs2 on some datasheets. Let's rename them to match the datasheets and also match the RPM based regulator driver which calls these by their 5vs names (see qcom_smd-regulator.c). There aren't any users of these regulators so far, so there aren't any concerns of DT ABI breakage here. While we're here making updates to the switches, also mandate usage of the OCP irq for these switches too. Cc: Bjorn Andersson Fixes: e92a4047419c ("regulator: Add QCOM SPMI regulator driver") Signed-off-by: Stephen Boyd --- Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt | 2 +- drivers/regulator/qcom_spmi-regulator.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.9.0.rc2.8.ga28705d -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt b/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt index 3e827bb9a56d..0fa3b0fac129 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt @@ -115,7 +115,7 @@ pm8916: pm8941: s1, s2, s3, s4, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l20, l21, l22, l23, l24, lvs1, lvs2, lvs3, - mvs1, mvs2 + 5vs1, 5vs2 pm8994: s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, l1, l2, l3, l4, l5, diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c index fe09407b150b..43f8f20b82e9 100644 --- a/drivers/regulator/qcom_spmi-regulator.c +++ b/drivers/regulator/qcom_spmi-regulator.c @@ -1524,8 +1524,8 @@ static const struct spmi_regulator_data pm8941_regulators[] = { { "lvs1", 0x8000, "vdd_l2_lvs_1_2_3", }, { "lvs2", 0x8100, "vdd_l2_lvs_1_2_3", }, { "lvs3", 0x8200, "vdd_l2_lvs_1_2_3", }, - { "mvs1", 0x8300, "vin_5vs", }, - { "mvs2", 0x8400, "vin_5vs", }, + { "5vs1", 0x8300, "vin_5vs", "ocp-5vs1", }, + { "5vs2", 0x8400, "vin_5vs", "ocp-5vs2", }, { } };