Message ID | 1363787070-14801-4-git-send-email-ldewangan@nvidia.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 3/20/2013 9:44 AM, Laxman Dewangan wrote: > NVIDIA's Tegra114 platform, Dalmore, uses the TPS65090 as > secondary PMICs which mainly act as voltage switch controlled > by I2C communication. > > Add regulator node for this device. > > Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> > --- > .../devicetree/bindings/regulator/tps65090.txt | 4 +- > arch/arm/boot/dts/tegra114-dalmore.dts | 90 ++++++++++++++++++++ > 2 files changed, 92 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/regulator/tps65090.txt b/Documentation/devicetree/bindings/regulator/tps65090.txt > index 313a60b..8926e2d 100644 > --- a/Documentation/devicetree/bindings/regulator/tps65090.txt > +++ b/Documentation/devicetree/bindings/regulator/tps65090.txt > @@ -41,8 +41,8 @@ Example: > infet5-supply = <&some_reg>; > infet6-supply = <&some_reg>; > infet7-supply = <&some_reg>; > - vsys_l1-supply = <&some_reg>; > - vsys_l2-supply = <&some_reg>; > + vsys-l1-supply = <&some_reg>; > + vsys-l2-supply = <&some_reg>; > > regulators { > dcdc1 { > diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts > index 6be9434..a47c3d2 100644 > --- a/arch/arm/boot/dts/tegra114-dalmore.dts > +++ b/arch/arm/boot/dts/tegra114-dalmore.dts > @@ -731,6 +731,82 @@ > regulator-boot-on; > regulator-always-on; > }; > + > + tps65090@48 { > + compatible = "ti,tps65090"; > + reg = <0x48>; > + interrupt-parent = <&gpio>; > + interrupts = <72 0x04>; /* gpio PJ0 */ > + > + vsys1-supply = <&vdd_ac_bat_reg>; > + vsys2-supply = <&vdd_ac_bat_reg>; > + vsys3-supply = <&vdd_ac_bat_reg>; > + infet1-supply = <&vdd_ac_bat_reg>; > + infet2-supply = <&vdd_ac_bat_reg>; > + infet3-supply = <&tps65090_dcdc2_reg>; > + infet4-supply = <&tps65090_dcdc2_reg>; > + infet5-supply = <&tps65090_dcdc2_reg>; > + infet6-supply = <&tps65090_dcdc2_reg>; > + infet7-supply = <&tps65090_dcdc2_reg>; > + vsys-l1-supply = <&vdd_ac_bat_reg>; > + vsys-l2-supply = <&vdd_ac_bat_reg>; > + > + regulators { > + dcdc1 { > + regulator-name = "vdd-sys-5v0"; > + regulator-always-on; > + regulator-boot-on; > + }; You should also add the tps65090_dcdc1_reg label to dcdc1. I believe you make use of it in patch 4 and this currently causes build breaks. > + > + tps65090_dcdc2_reg: dcdc2 { > + regulator-name = "vdd-sys-3v3"; > + regulator-always-on; > + regulator-boot-on; > + }; > + > -rhyland
On Wednesday 20 March 2013 10:27 PM, Rhyland Klein wrote: > On 3/20/2013 9:44 AM, Laxman Dewangan wrote: > + regulators { > + dcdc1 { > + regulator-name = "vdd-sys-5v0"; > + regulator-always-on; > + regulator-boot-on; > + }; > You should also add the tps65090_dcdc1_reg label to dcdc1. I believe you > make use of it in patch 4 and this currently causes build breaks. > Actually patch 4 uses this label and I should add on patch 4, not on patch 3. I removed from patch3 and when cherrypick the patch 4 from different branch to make the patches, I missed the change and hence patch 4 is not getting compiled. I will fix the issue on next revision. Sorry for messing up and thins for pointing this.
On 03/20/2013 07:44 AM, Laxman Dewangan wrote: > NVIDIA's Tegra114 platform, Dalmore, uses the TPS65090 as > secondary PMICs which mainly act as voltage switch controlled > by I2C communication. > diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts > @@ -747,4 +823,18 @@ > bus-width = <8>; > status = "okay"; > }; > + regulators { > + compatible = "simple-bus"; > + #address-cells = <1>; You need a blank line between the nodes there. There a a number of typos and capitalization issues in the various commit descriptions.
diff --git a/Documentation/devicetree/bindings/regulator/tps65090.txt b/Documentation/devicetree/bindings/regulator/tps65090.txt index 313a60b..8926e2d 100644 --- a/Documentation/devicetree/bindings/regulator/tps65090.txt +++ b/Documentation/devicetree/bindings/regulator/tps65090.txt @@ -41,8 +41,8 @@ Example: infet5-supply = <&some_reg>; infet6-supply = <&some_reg>; infet7-supply = <&some_reg>; - vsys_l1-supply = <&some_reg>; - vsys_l2-supply = <&some_reg>; + vsys-l1-supply = <&some_reg>; + vsys-l2-supply = <&some_reg>; regulators { dcdc1 { diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts index 6be9434..a47c3d2 100644 --- a/arch/arm/boot/dts/tegra114-dalmore.dts +++ b/arch/arm/boot/dts/tegra114-dalmore.dts @@ -731,6 +731,82 @@ regulator-boot-on; regulator-always-on; }; + + tps65090@48 { + compatible = "ti,tps65090"; + reg = <0x48>; + interrupt-parent = <&gpio>; + interrupts = <72 0x04>; /* gpio PJ0 */ + + vsys1-supply = <&vdd_ac_bat_reg>; + vsys2-supply = <&vdd_ac_bat_reg>; + vsys3-supply = <&vdd_ac_bat_reg>; + infet1-supply = <&vdd_ac_bat_reg>; + infet2-supply = <&vdd_ac_bat_reg>; + infet3-supply = <&tps65090_dcdc2_reg>; + infet4-supply = <&tps65090_dcdc2_reg>; + infet5-supply = <&tps65090_dcdc2_reg>; + infet6-supply = <&tps65090_dcdc2_reg>; + infet7-supply = <&tps65090_dcdc2_reg>; + vsys-l1-supply = <&vdd_ac_bat_reg>; + vsys-l2-supply = <&vdd_ac_bat_reg>; + + regulators { + dcdc1 { + regulator-name = "vdd-sys-5v0"; + regulator-always-on; + regulator-boot-on; + }; + + tps65090_dcdc2_reg: dcdc2 { + regulator-name = "vdd-sys-3v3"; + regulator-always-on; + regulator-boot-on; + }; + + dcdc3 { + regulator-name = "vdd-ao"; + regulator-always-on; + regulator-boot-on; + }; + + fet1 { + regulator-name = "vdd-lcd-bl"; + }; + + fet3 { + regulator-name = "vdd-modem-3v3"; + }; + + fet4 { + regulator-name = "avdd-lcd"; + }; + + fet5 { + regulator-name = "vdd-lvds"; + }; + + fet6 { + regulator-name = "vdd-sd-slot"; + }; + + fet7 { + regulator-name = "vdd-com-3v3"; + }; + + ldo1 { + regulator-name = "vdd-sby-5v0"; + regulator-always-on; + regulator-boot-on; + }; + + ldo2 { + regulator-name = "vdd-sby-3v3"; + regulator-always-on; + regulator-boot-on; + }; + }; + }; }; pmc { @@ -747,4 +823,18 @@ bus-width = <8>; status = "okay"; }; + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + vdd_ac_bat_reg: regulator@0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "vdd_ac_bat"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + }; };
NVIDIA's Tegra114 platform, Dalmore, uses the TPS65090 as secondary PMICs which mainly act as voltage switch controlled by I2C communication. Add regulator node for this device. Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> --- .../devicetree/bindings/regulator/tps65090.txt | 4 +- arch/arm/boot/dts/tegra114-dalmore.dts | 90 ++++++++++++++++++++ 2 files changed, 92 insertions(+), 2 deletions(-)