| Message ID | 1339427118-32263-10-git-send-email-thierry.reding@avionic-design.de |
|---|---|
| State | Not Applicable |
| Headers | show |
On 06/11/2012 09:05 AM, Thierry Reding wrote: > With the device tree support in place, probe the PCIe controller from > the device tree and remove the corresponding workaround in the board > file. > diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts > + pci_vdd_reg: fixedregulator@0 { I think that'd usually just be "regulator@0". If you need the "@0" part to differentiate between multiple regulators, the node needs a reg property too: reg = <0 0>; although then I wonder about putting the regulator under the root node, since the address wouldn't really make sense... -- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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: > > With the device tree support in place, probe the PCIe controller from > > the device tree and remove the corresponding workaround in the board > > file. > > > diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts > > > + pci_vdd_reg: fixedregulator@0 { > > I think that'd usually just be "regulator@0". > > If you need the "@0" part to differentiate between multiple regulators, > the node needs a reg property too: > > reg = <0 0>; > > although then I wonder about putting the regulator under the root node, > since the address wouldn't really make sense... Perhaps we should add a new "regulators" node under the root node to collect this kind of regulators that don't fit anywhere else. Looking at the code, something like this should work: / { ... regulators { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <0>; pci_vdd_reg: regulator@0 { reg = <0>; }; }; }; Thierry
On 06/11/2012 11:48 PM, Thierry Reding wrote: > * Stephen Warren wrote: >> On 06/11/2012 09:05 AM, Thierry Reding wrote: >>> With the device tree support in place, probe the PCIe >>> controller from the device tree and remove the corresponding >>> workaround in the board file. >> >>> diff --git a/arch/arm/boot/dts/tegra-harmony.dts >>> b/arch/arm/boot/dts/tegra-harmony.dts >> >>> + pci_vdd_reg: fixedregulator@0 { >> >> I think that'd usually just be "regulator@0". >> >> If you need the "@0" part to differentiate between multiple >> regulators, the node needs a reg property too: >> >> reg = <0 0>; >> >> although then I wonder about putting the regulator under the root >> node, since the address wouldn't really make sense... > > Perhaps we should add a new "regulators" node under the root node > to collect this kind of regulators that don't fit anywhere else. > Looking at the code, something like this should work: > > / { ... > > regulators { compatible = "simple-bus"; #address-cells = <1>; > #size-cells = <0>; > > pci_vdd_reg: regulator@0 { reg = <0>; }; }; }; That seems like a good idea, and there's certainly precedent for doing exactly that in other ARM .dts files already. To maintain .dts alphabetical sorting of non-addressed nodes, this new node should slot in just before the sound node, near the end of the file. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts index c98aa2a..1dc907f 100644 --- a/arch/arm/boot/dts/tegra-harmony.dts +++ b/arch/arm/boot/dts/tegra-harmony.dts @@ -276,7 +276,7 @@ status = "okay"; clock-frequency = <400000>; - tps6586x@34 { + pmu: tps6586x@34 { compatible = "ti,tps6586x"; reg = <0x34>; interrupts = <0 88 0x4>; @@ -306,7 +306,7 @@ regulator-always-on; }; - ldo0 { + pci_clk_reg: ldo0 { regulator-name = "PCIE CLK"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; @@ -364,6 +364,21 @@ nvidia,invert-interrupt; }; + pci_vdd_reg: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "PCIE VDD"; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + enable-active-high; + gpio = <&pmu 2 0>; + }; + + pci { + pex-clk-supply = <&pci_clk_reg>; + vdd-supply = <&pci_vdd_reg>; + status = "okay"; + }; + usb@c5000000 { status = "okay"; }; diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index a9a54e6..c7b6ae2 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c @@ -131,17 +131,6 @@ static void __init trimslice_init(void) } #endif -#ifdef CONFIG_MACH_HARMONY -static void __init harmony_init(void) -{ - int ret; - - ret = harmony_pcie_init(); - if (ret) - pr_err("harmony_pcie_init() failed: %d\n", ret); -} -#endif - #ifdef CONFIG_MACH_PAZ00 static void __init paz00_init(void) { @@ -156,9 +145,6 @@ static struct { #ifdef CONFIG_MACH_TRIMSLICE { "compulab,trimslice", trimslice_init }, #endif -#ifdef CONFIG_MACH_HARMONY - { "nvidia,harmony", harmony_init }, -#endif #ifdef CONFIG_MACH_PAZ00 { "compal,paz00", paz00_init }, #endif
With the device tree support in place, probe the PCIe controller from the device tree and remove the corresponding workaround in the board file. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> --- Changes in v2: - new patch --- arch/arm/boot/dts/tegra-harmony.dts | 19 +++++++++++++++++-- arch/arm/mach-tegra/board-dt-tegra20.c | 14 -------------- 2 files changed, 17 insertions(+), 16 deletions(-)