From patchwork Sun Jun 26 05:52:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9199099 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 7B2E4607D3 for ; Sun, 26 Jun 2016 05:54:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B13B223A6 for ; Sun, 26 Jun 2016 05:54:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5FBC12852D; Sun, 26 Jun 2016 05:54:30 +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 25806223A6 for ; Sun, 26 Jun 2016 05:54:30 +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 1bH2zy-0000FD-LL; Sun, 26 Jun 2016 05:52:50 +0000 Received: from mail-pf0-x234.google.com ([2607:f8b0:400e:c00::234]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bH2zm-0000Cl-Kj for linux-arm-kernel@lists.infradead.org; Sun, 26 Jun 2016 05:52:39 +0000 Received: by mail-pf0-x234.google.com with SMTP id c2so51539043pfa.2 for ; Sat, 25 Jun 2016 22:52:16 -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=JSNVO64F52+yg6jGdUUV20rkmcZFHkIjGAQtDfFDk3s=; b=kSFrmfUZ4i60fTlWFLFd2U8RH/fLKBkMYcnGeR4WJRNiLwc1HIL6IARV4/WUJcZCK+ LAvFD4DKgZZ7AnxIkya5bxFKj5+dXya5qfr1aGLnbQC7SJA+4S5SvHydYxxOfCTtRbjO 3PQRrFpR+0TYLO9kuqk70j0IR3bsYspnCgAYw= 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=JSNVO64F52+yg6jGdUUV20rkmcZFHkIjGAQtDfFDk3s=; b=b9FGHoXxJ/wpqxtyfHJvaVf3u/K25f7NVHQuMM12QzHraM6Rbp0Uw2dyZIkqEPvo8K lfNO4d4psu8DiA9BHO4mnaNkiaSkvoodTqQqi2YBz5izP065OXbBJHDFIJmObczcosRO QmCIXKVHh3sDEjfiEwdwB5C/JIhR3r8T8IuxVk1gbM4nn2OCTEPA/Mik11PP3robCpjI jSyy9WPiw5/ROwG483N4IBV5BaWmKnfb81por2MqOZZPhQXrHufnxsyZ0R7f5q+E3z1f eg1KtMceCIMw1sOk5zo9k/JFZeoR2T1FOBxHdftgTWX2/ToSdzB1fHUk4tCwhTtaEiKh d8qQ== X-Gm-Message-State: ALyK8tK2Fv1iNsr3SPQOyweMWcAjuN9Y/i4ESeCj5rQqQgW+OElea0MnMMKNMDGluClrFwcY X-Received: by 10.98.201.210 with SMTP id l79mr21952495pfk.87.1466920336376; Sat, 25 Jun 2016 22:52:16 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Jun 2016 22:52:16 -0700 (PDT) From: Stephen Boyd To: Mark Brown Subject: [PATCH 1/3] regulator: qcom_spmi: Add support for S4 supply on pm8941 Date: Sat, 25 Jun 2016 22:52:11 -0700 Message-Id: <20160626055213.18071-2-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_225238_709952_E3E6A9FE X-CRM114-Status: GOOD ( 11.16 ) 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 S4 supply is sometimes called the boost regulator because it outputs 5V. Typically it's connected to the 5vs1 and 5vs2 switches for use in USB OTG and HDMI applications. Add support for this regulator which was mistakenly left out from the initial submission of this driver. Cc: Bjorn Andersson Fixes: e92a4047419c ("regulator: Add QCOM SPMI regulator driver") Signed-off-by: Stephen Boyd --- Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt | 4 ++-- drivers/regulator/qcom_spmi-regulator.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt b/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt index 46c6f3ed1a1c..3e827bb9a56d 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.txt @@ -113,8 +113,8 @@ pm8916: l14, l15, l16, l17, l18 pm8941: - s1, s2, s3, 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, + 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 pm8994: diff --git a/drivers/regulator/qcom_spmi-regulator.c b/drivers/regulator/qcom_spmi-regulator.c index 84cce21e98cd..fe09407b150b 100644 --- a/drivers/regulator/qcom_spmi-regulator.c +++ b/drivers/regulator/qcom_spmi-regulator.c @@ -1496,6 +1496,7 @@ static const struct spmi_regulator_data pm8941_regulators[] = { { "s1", 0x1400, "vdd_s1", }, { "s2", 0x1700, "vdd_s2", }, { "s3", 0x1a00, "vdd_s3", }, + { "s4", 0xa000, }, { "l1", 0x4000, "vdd_l1_l3", }, { "l2", 0x4100, "vdd_l2_lvs_1_2_3", }, { "l3", 0x4200, "vdd_l1_l3", },