diff mbox

[V8,1/2] regulator: Add document for MT6323 regulator

Message ID 1468240179-7558-1-git-send-email-john@phrozen.org (mailing list archive)
State New, archived
Headers show

Commit Message

John Crispin July 11, 2016, 12:29 p.m. UTC 
Signed-off-by: John Crispin <john@phrozen.org>
Cc: devicetree@vger.kernel.org
Acked-by: Rob Herring <robh@kernel.org>
---
This is a resend as V7 was dropped due to a merge order conflict.

Changes in V7
* remove another compatible string
* small wording changes

Changes in V6
* remove the compatible string

Changes in V5
* regulator vs regulators

Changes in V4
* regulator is a subnode and not a property

 .../bindings/regulator/mt6323-regulator.txt        |  239 ++++++++++++++++++++
 1 file changed, 239 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/regulator/mt6323-regulator.txt

Comments

Mark Brown July 11, 2016, 6:08 p.m. UTC | #1 
On Mon, Jul 11, 2016 at 02:29:38PM +0200, John Crispin wrote:

> This is a resend as V7 was dropped due to a merge order conflict.

What were the dependencies and why will simply resending this resolve
them?
John Crispin July 11, 2016, 6:55 p.m. UTC | #2 
On 11/07/2016 20:08, Mark Brown wrote:
> On Mon, Jul 11, 2016 at 02:29:38PM +0200, John Crispin wrote:
> 
>> This is a resend as V7 was dropped due to a merge order conflict.
> 
> What were the dependencies and why will simply resending this resolve
> them?
> 

Hi Mark,

the dependency was the mt6323 support inside the mt6397 MFD device [1]
and the headers that it included. this has been merged so the regulator
driver is good to go for 4.8

	John

[1]
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/drivers/mfd/mt6397-core.c?id=refs/tags/v4.7-rc7

> 
> 
> _______________________________________________
> Linux-mediatek mailing list
> Linux-mediatek@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-mediatek
>
Mark Brown July 11, 2016, 7:22 p.m. UTC | #3 
On Mon, Jul 11, 2016 at 08:55:24PM +0200, John Crispin wrote:
> On 11/07/2016 20:08, Mark Brown wrote:
> > On Mon, Jul 11, 2016 at 02:29:38PM +0200, John Crispin wrote:

> >> This is a resend as V7 was dropped due to a merge order conflict.

> > What were the dependencies and why will simply resending this resolve
> > them?

> the dependency was the mt6323 support inside the mt6397 MFD device [1]
> and the headers that it included. this has been merged so the regulator
> driver is good to go for 4.8

No, that's not resolving the dependencies - if I apply these patches
without the dependencies in the regulator tree that will still break the
build for my tree until after the merge window.  It'll also break Linus'
tree if (as is normal) I send my pull requests early on.  I'd need to
merge the MFD commits into my tree which would need coordination with
Lee, he'd need to make a tag for me to pull in.
John Crispin July 11, 2016, 8:31 p.m. UTC | #4 
On 11/07/2016 21:22, Mark Brown wrote:
> On Mon, Jul 11, 2016 at 08:55:24PM +0200, John Crispin wrote:
>> On 11/07/2016 20:08, Mark Brown wrote:
>>> On Mon, Jul 11, 2016 at 02:29:38PM +0200, John Crispin wrote:
> 
>>>> This is a resend as V7 was dropped due to a merge order conflict.
> 
>>> What were the dependencies and why will simply resending this resolve
>>> them?
> 
>> the dependency was the mt6323 support inside the mt6397 MFD device [1]
>> and the headers that it included. this has been merged so the regulator
>> driver is good to go for 4.8
> 
> No, that's not resolving the dependencies - if I apply these patches
> without the dependencies in the regulator tree that will still break the
> build for my tree until after the merge window.  It'll also break Linus'
> tree if (as is normal) I send my pull requests early on.  I'd need to
> merge the MFD commits into my tree which would need coordination with
> Lee, he'd need to make a tag for me to pull in.
> 

hi,

maybe i am missing something here, but i can see the dependencies inside
the for-next branch of
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git. is
this not the tree i should base patches on for v4.8 ?

	John
Mark Brown July 11, 2016, 9:07 p.m. UTC | #5 
On Mon, Jul 11, 2016 at 10:31:45PM +0200, John Crispin wrote:

> maybe i am missing something here, but i can see the dependencies inside
> the for-next branch of
> git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git. is
> this not the tree i should base patches on for v4.8 ?

Oh, so these aren't things that Lee just applied but rather things that
have propagated through?  You didn't say what commits you were talking
about, you linked to a long gitweb URL that would have been difficult to
paste due to wrapping.  This sort of thing is why it's really helpful to
make your e-mails directly human readable, saying something like "these
depend on change X which is in Linus' tree now" would've made this
clear.
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/regulator/mt6323-regulator.txt b/Documentation/devicetree/bindings/regulator/mt6323-regulator.txt
new file mode 100644
index 0000000..9fd95e7
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/mt6323-regulator.txt
@@ -0,0 +1,239 @@ 
+Mediatek MT6323 Regulator Driver
+
+All voltage regulators are defined as subnodes of the regulators node. A list
+of regulators provided by this controller are defined as subnodes of the
+PMIC's node. Each regulator is named according to its regulator type,
+buck_<name> and ldo_<name>. The definition for each of these nodes is defined
+using the standard binding for regulators at
+Documentation/devicetree/bindings/regulator/regulator.txt.
+
+The valid names for regulators are::
+BUCK:
+  buck_vproc, buck_vsys, buck_vpa
+LDO:
+  ldo_vtcxo, ldo_vcn28, ldo_vcn33_bt, ldo_vcn33_wifi, ldo_va, ldo_vcama,
+  ldo_vio28, ldo_vusb, ldo_vmc, ldo_vmch, ldo_vemc3v3, ldo_vgp1, ldo_vgp2,
+  ldo_vgp3, ldo_vcn18, ldo_vsim1, ldo_vsim2, ldo_vrtc, ldo_vcamaf, ldo_vibr,
+  ldo_vrf18, ldo_vm, ldo_vio18, ldo_vcamd, ldo_vcamio
+
+Example:
+
+	pmic: mt6323 {
+		compatible = "mediatek,mt6323";
+
+		mt6323regulator: regulators {
+			mt6323_vproc_reg: buck_vproc{
+				regulator-name = "vproc";
+				regulator-min-microvolt = < 700000>;
+				regulator-max-microvolt = <1350000>;
+				regulator-ramp-delay = <12500>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			mt6323_vsys_reg: buck_vsys{
+				regulator-name = "vsys";
+				regulator-min-microvolt = <1400000>;
+				regulator-max-microvolt = <2987500>;
+				regulator-ramp-delay = <25000>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			mt6323_vpa_reg: buck_vpa{
+				regulator-name = "vpa";
+				regulator-min-microvolt = < 500000>;
+				regulator-max-microvolt = <3650000>;
+			};
+
+			mt6323_vtcxo_reg: ldo_vtcxo{
+				regulator-name = "vtcxo";
+				regulator-min-microvolt = <2800000>;
+				regulator-max-microvolt = <2800000>;
+				regulator-enable-ramp-delay = <90>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			mt6323_vcn28_reg: ldo_vcn28{
+				regulator-name = "vcn28";
+				regulator-min-microvolt = <2800000>;
+				regulator-max-microvolt = <2800000>;
+				regulator-enable-ramp-delay = <185>;
+			};
+
+			mt6323_vcn33_bt_reg: ldo_vcn33_bt{
+				regulator-name = "vcn33_bt";
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3600000>;
+				regulator-enable-ramp-delay = <185>;
+			};
+
+			mt6323_vcn33_wifi_reg: ldo_vcn33_wifi{
+				regulator-name = "vcn33_wifi";
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3600000>;
+				regulator-enable-ramp-delay = <185>;
+			};
+
+			mt6323_va_reg: ldo_va{
+				regulator-name = "va";
+				regulator-min-microvolt = <2800000>;
+				regulator-max-microvolt = <2800000>;
+				regulator-enable-ramp-delay = <216>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			mt6323_vcama_reg: ldo_vcama{
+				regulator-name = "vcama";
+				regulator-min-microvolt = <1500000>;
+				regulator-max-microvolt = <2800000>;
+				regulator-enable-ramp-delay = <216>;
+			};
+
+			mt6323_vio28_reg: ldo_vio28{
+				regulator-name = "vio28";
+				regulator-min-microvolt = <2800000>;
+				regulator-max-microvolt = <2800000>;
+				regulator-enable-ramp-delay = <216>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			mt6323_vusb_reg: ldo_vusb{
+				regulator-name = "vusb";
+				regulator-min-microvolt = <3300000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-enable-ramp-delay = <216>;
+				regulator-boot-on;
+			};
+
+			mt6323_vmc_reg: ldo_vmc{
+				regulator-name = "vmc";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-enable-ramp-delay = <36>;
+				regulator-boot-on;
+			};
+
+			mt6323_vmch_reg: ldo_vmch{
+				regulator-name = "vmch";
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-enable-ramp-delay = <36>;
+				regulator-boot-on;
+			};
+
+			mt6323_vemc3v3_reg: ldo_vemc3v3{
+				regulator-name = "vemc3v3";
+				regulator-min-microvolt = <3000000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-enable-ramp-delay = <36>;
+				regulator-boot-on;
+			};
+
+			mt6323_vgp1_reg: ldo_vgp1{
+				regulator-name = "vgp1";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-enable-ramp-delay = <216>;
+			};
+
+			mt6323_vgp2_reg: ldo_vgp2{
+				regulator-name = "vgp2";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-enable-ramp-delay = <216>;
+			};
+
+			mt6323_vgp3_reg: ldo_vgp3{
+				regulator-name = "vgp3";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-enable-ramp-delay = <216>;
+			};
+
+			mt6323_vcn18_reg: ldo_vcn18{
+				regulator-name = "vcn18";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-enable-ramp-delay = <216>;
+			};
+
+			mt6323_vsim1_reg: ldo_vsim1{
+				regulator-name = "vsim1";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-enable-ramp-delay = <216>;
+			};
+
+			mt6323_vsim2_reg: ldo_vsim2{
+				regulator-name = "vsim2";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-enable-ramp-delay = <216>;
+			};
+
+			mt6323_vrtc_reg: ldo_vrtc{
+				regulator-name = "vrtc";
+				regulator-min-microvolt = <2800000>;
+				regulator-max-microvolt = <2800000>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			mt6323_vcamaf_reg: ldo_vcamaf{
+				regulator-name = "vcamaf";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-enable-ramp-delay = <216>;
+			};
+
+			mt6323_vibr_reg: ldo_vibr{
+				regulator-name = "vibr";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-enable-ramp-delay = <36>;
+			};
+
+			mt6323_vrf18_reg: ldo_vrf18{
+				regulator-name = "vrf18";
+				regulator-min-microvolt = <1825000>;
+				regulator-max-microvolt = <1825000>;
+				regulator-enable-ramp-delay = <187>;
+			};
+
+			mt6323_vm_reg: ldo_vm{
+				regulator-name = "vm";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-enable-ramp-delay = <216>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			mt6323_vio18_reg: ldo_vio18{
+				regulator-name = "vio18";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-enable-ramp-delay = <216>;
+				regulator-always-on;
+				regulator-boot-on;
+			};
+
+			mt6323_vcamd_reg: ldo_vcamd{
+				regulator-name = "vcamd";
+				regulator-min-microvolt = <1200000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-enable-ramp-delay = <216>;
+			};
+
+			mt6323_vcamio_reg: ldo_vcamio{
+				regulator-name = "vcamio";
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1800000>;
+				regulator-enable-ramp-delay = <216>;
+			};
+		};
+	};