From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Warren Subject: Re: [PATCH V3] regulator: tps6586x: add support for SYS rail Date: Mon, 13 Aug 2012 11:42:57 -0600 Message-ID: <50293CA1.80900@wwwdotorg.org> References: <1344152518-29378-1-git-send-email-ldewangan@nvidia.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1344152518-29378-1-git-send-email-ldewangan@nvidia.com> Sender: linux-doc-owner@vger.kernel.org To: broonie@opensource.wolfsonmicro.com Cc: Laxman Dewangan , sameo@linux.intel.com, grant.likely@secretlab.ca, rob.herring@calxeda.com, swarren@nvidia.com, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org List-Id: devicetree@vger.kernel.org On 08/05/2012 01:41 AM, Laxman Dewangan wrote: > Device have SYS rail which is always ON. It is system > power bus. LDO5 and LDO_RTC get powered through this rail > internally. Add support for this rail and make the > LDO5/LDO_RTC input supply to "sys". > Update document accordingly. Mark, This patch appears to have been applied correctly as b93fffb in your tree, but your for-next branch merge commit f110340 appears to have dropped the following two hunks: > diff --git a/Documentation/devicetree/bindings/regulator/tps6586x.txt b/Documentation/devicetree/bindings/regulator/tps6586x.txt > index d156e1b..ec527d9 100644 > --- a/Documentation/devicetree/bindings/regulator/tps6586x.txt > +++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt > @@ -8,7 +8,8 @@ Required properties: > - gpio-controller: mark the device as a GPIO controller > - regulators: list of regulators provided by this controller, must have > property "regulator-compatible" to match their hardware counterparts: > - sm[0-2], ldo[0-9] and ldo_rtc > + sys, sm[0-2], ldo[0-9] and ldo_rtc > +- sys-supply: The input supply for SYS. > - sm0-supply: The input supply for the SM0. > - sm1-supply: The input supply for the SM1. > - sm2-supply: The input supply for the SM2. > @@ -30,6 +34,7 @@ Example: > #gpio-cells = <2>; > gpio-controller; > > + sys-supply = <&some_reg>; > sm0-supply = <&some_reg>; > sm1-supply = <&some_reg>; > sm2-supply = <&some_reg>;