ARM: tegra: harmony: Initialize PCIe from DT

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>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>

diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index d44cf9074ac63a1fc591b76ff1f4bede4df2c8d6..e156ab30e76343b37271b7f650e71b55d263be85 100644 (file)
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -335,7 +335,7 @@
                                        regulator-always-on;
                                };
 
-                               ldo0 {
+                               pci_clk_reg: ldo0 {
                                        regulator-name = "vdd_ldo0,vddio_pex_clk";
                                        regulator-min-microvolt = <3300000>;
                                        regulator-max-microvolt = <3300000>;
@@ -425,6 +425,20 @@
                nvidia,sys-clock-req-active-high;
        };
 
+       pcie-controller {
+               pex-clk-supply = <&pci_clk_reg>;
+               vdd-supply = <&pci_vdd_reg>;
+               status = "okay";
+
+               pci@1,0 {
+                       status = "okay";
+               };
+
+               pci@2,0 {
+                       status = "okay";
+               };
+       };
+
        usb@c5000000 {
                status = "okay";
        };
@@ -643,7 +657,7 @@
                        enable-active-high;
                };
 
-               regulator@3 {
+               pci_vdd_reg: regulator@3 {
                        compatible = "regulator-fixed";
                        reg = <3>;
                        regulator-name = "vdd_1v05";
@@ -651,8 +665,6 @@
                        regulator-max-microvolt = <1050000>;
                        gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
-                       /* Hack until board-harmony-pcie.c is removed */
-                       status = "disabled";
                };
 
                regulator@4 {