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: 9199095 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 70033607D3 for ; Sun, 26 Jun 2016 05:54:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E0A72852D for ; Sun, 26 Jun 2016 05:54:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 510082852F; Sun, 26 Jun 2016 05:54:23 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DF7E9223A6 for ; Sun, 26 Jun 2016 05:54:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bH306-0000Go-2x; Sun, 26 Jun 2016 05:52:58 +0000 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bH2zm-0000Cm-W2 for linux-arm-kernel@lists.infradead.org; Sun, 26 Jun 2016 05:52:40 +0000 Received: by mail-pa0-x230.google.com with SMTP id bz2so49181460pad.1 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=S+RsnkyI6t0YX51Wb0EUVeeC7dF0iMS/BM/+H4ZrJf8n70/hrKP00iFyegLJh4k7ML 6WbA5Mh1AoYQL9+kZSXbWA0Cg+SjhnZp4PlKMe2bKsgrWCerOGLFXuRQZ3DZ4X8dwXPU p8XAagkyRqBiQRwC22YhHC/tl44gf7WMhz1Jfpk5wAKdpTvvWhVylvMO2dB/QvgQjN0C yjXJQKTy17j3PUXTt/nJB6Na5MLYymUmojUpLga1L4BPqQC06OBBf37iWqlKbdQcE38N Fw/r2njHLuR6pHkFg3e/mbWgg7Qp6IRHoMnhESxVTrEScHqR7YxDDU7nFSQPf2jBev2c R+7A== X-Gm-Message-State: ALyK8tIvNdNfaXjGwqEe3j/Fw7uK4XXXDilkjXJPF2Sad8G+E00o396/EnOhROqlxPTK9A1L 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160625_225239_056490_D926B4A9 X-CRM114-Status: GOOD ( 12.33 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bjorn Andersson MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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", }, { } };