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: 70853 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp529509qgy; Sat, 25 Jun 2016 22:53:00 -0700 (PDT) X-Received: by 10.98.46.70 with SMTP id u67mr21384805pfu.134.1466920378440; Sat, 25 Jun 2016 22:52:58 -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:58 -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 S1751807AbcFZFwf (ORCPT + 8 others); Sun, 26 Jun 2016 01:52:35 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:35882 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751789AbcFZFwR (ORCPT ); Sun, 26 Jun 2016 01:52:17 -0400 Received: by mail-pf0-f173.google.com with SMTP id t190so51504344pfb.3 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=MYay9jTZT/mIgr6aO8EMZzCWhL0KkoWgCy3M0mJvbDjZSSItOx+YEX798o0EDgL8Y4 OGGReIoutCtSX7ZKs/ePyDYrlJIJzoAr0f+ZhWjlhUXNYe6buhE2kfD56+FPixy5GcS/ dKreRtNdY2tExADZA2oIkVKJeZ9DjZ4htbsBqkOvGKFo5BAfzzhA48cUsfWsNHuc5d5r KFEoSqMhim5QI6aM+1oO/gaAOeRFKadvpmzHZpUeQP5iCkOaIu1gJGmzCYb7OP/TfPHh AfF2n1m313U+MoGVtMaslyweMaEPFTLfTxINe9bfQIb8zJJkgi5AYrqUtZvDCIFTHLeO Epxg== X-Gm-Message-State: ALyK8tLZR1Z/KzFqM4eNyigBoqwlABubLmaWSKrVDjZKPeSZZCbn2HV+NXN7Yt6V5It445Oe 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 Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Bjorn Andersson 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> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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(-) -- 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 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", },