| Message ID | 1339427118-32263-9-git-send-email-thierry.reding@avionic-design.de |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 06/11/2012 09:05 AM, Thierry Reding wrote: > Device tree support for the TPS6586x PMU used on Harmony has recently > been added. This commit adds the required device tree nodes to probe the > PMU from the device tree. > diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts > + tps6586x@34 { > + compatible = "ti,tps6586x"; > + reg = <0x34>; > + interrupts = <0 88 0x4>; > + > + #gpio-cells = <2>; > + gpio-controller; > + > + regulators { Per the TPS65911 discussion on regulator bindings, this node should have: #address-cells = <1>; #size-cells = <0>; > + sm0 { Each of these nodes should be named regulator@0, regulator@1, etc. Within each of these nodes, you need a matching reg property. reg = <0>; and something to identify which regulator within the chip this node configurations, although I don't think we've reached a final decision on the property name. See the the following for details: http://www.spinics.net/lists/linux-tegra/msg05577.html -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Stephen Warren wrote: > On 06/11/2012 09:05 AM, Thierry Reding wrote: > > Device tree support for the TPS6586x PMU used on Harmony has recently > > been added. This commit adds the required device tree nodes to probe the > > PMU from the device tree. > > > diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts > > > + tps6586x@34 { > > + compatible = "ti,tps6586x"; > > + reg = <0x34>; > > + interrupts = <0 88 0x4>; > > + > > + #gpio-cells = <2>; > > + gpio-controller; > > + > > + regulators { > > Per the TPS65911 discussion on regulator bindings, this node should have: > > #address-cells = <1>; > #size-cells = <0>; > > > + sm0 { > > Each of these nodes should be named regulator@0, regulator@1, etc. > > Within each of these nodes, you need a matching reg property. > > reg = <0>; > > and something to identify which regulator within the chip this node > configurations, although I don't think we've reached a final decision on > the property name. > > See the the following for details: > > http://www.spinics.net/lists/linux-tegra/msg05577.html Okay, I'll monitor that discussion and see what you end up with. I guess I'll have to update the tps6586x binding when that decision has been reached and add a patch to this series. Thierry
On 06/11/2012 09:05 AM, Thierry Reding wrote: > Device tree support for the TPS6586x PMU used on Harmony has recently > been added. This commit adds the required device tree nodes to probe the > PMU from the device tree. > diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts > + tps6586x@34 { > + compatible = "ti,tps6586x"; > + reg = <0x34>; > + interrupts = <0 88 0x4>; I believe that should be interrupt 86 not 88. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, Jun 21, 2012 at 02:17:32PM -0600, Stephen Warren wrote: > On 06/11/2012 09:05 AM, Thierry Reding wrote: > > Device tree support for the TPS6586x PMU used on Harmony has recently > > been added. This commit adds the required device tree nodes to probe the > > PMU from the device tree. > > > diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts > > > + tps6586x@34 { > > + compatible = "ti,tps6586x"; > > + reg = <0x34>; > > + interrupts = <0 88 0x4>; > > I believe that should be interrupt 86 not 88. Yes, you're absolutely correct. Thierry
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts index f146dbf..c98aa2a 100644 --- a/arch/arm/boot/dts/tegra-harmony.dts +++ b/arch/arm/boot/dts/tegra-harmony.dts @@ -275,6 +275,89 @@ i2c@7000d000 { status = "okay"; clock-frequency = <400000>; + + tps6586x@34 { + compatible = "ti,tps6586x"; + reg = <0x34>; + interrupts = <0 88 0x4>; + + #gpio-cells = <2>; + gpio-controller; + + regulators { + sm0 { + regulator-min-microvolt = < 725000>; + regulator-max-microvolt = <1500000>; + regulator-boot-on; + regulator-always-on; + }; + + sm1 { + regulator-min-microvolt = < 725000>; + regulator-max-microvolt = <1500000>; + regulator-boot-on; + regulator-always-on; + }; + + sm2 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <4550000>; + regulator-boot-on; + regulator-always-on; + }; + + ldo0 { + regulator-name = "PCIE CLK"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + ldo1 { + regulator-min-microvolt = < 725000>; + regulator-max-microvolt = <1500000>; + }; + + ldo2 { + regulator-min-microvolt = < 725000>; + regulator-max-microvolt = <1500000>; + }; + + ldo3 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + + ldo4 { + regulator-min-microvolt = <1700000>; + regulator-max-microvolt = <2475000>; + }; + + ldo5 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + + ldo6 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + + ldo7 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + + ldo8 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + + ldo9 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <3300000>; + }; + }; + }; }; pmc { diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index 0f29c05..a9a54e6 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c @@ -136,12 +136,6 @@ static void __init harmony_init(void) { int ret; - ret = harmony_regulator_init(); - if (ret) { - pr_err("harmony_regulator_init() failed: %d\n", ret); - return; - } - ret = harmony_pcie_init(); if (ret) pr_err("harmony_pcie_init() failed: %d\n", ret);
Device tree support for the TPS6586x PMU used on Harmony has recently been added. This commit adds the required device tree nodes to probe the PMU from the device tree. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> --- Changes in v2: - new patch --- arch/arm/boot/dts/tegra-harmony.dts | 83 ++++++++++++++++++++++++++++++++ arch/arm/mach-tegra/board-dt-tegra20.c | 6 --- 2 files changed, 83 insertions(+), 6 deletions(-)