Merge remote-tracking branch 'fbdev/for-next'

[karo-tx-linux.git] / arch / arm / boot / dts / tegra30-cardhu.dtsi

diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index f65b53d32416749244d1cc977d23c1e5bea64477..e19dbf238e5c8498878dc56492018585190830ce 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -31,6 +31,26 @@
                reg = <0x80000000 0x40000000>;
        };
 
+       pcie-controller {
+               status = "okay";
+               pex-clk-supply = <&pex_hvdd_3v3_reg>;
+               vdd-supply = <&ldo1_reg>;
+               avdd-supply = <&ldo2_reg>;
+
+               pci@1,0 {
+                       nvidia,num-lanes = <4>;
+               };
+
+               pci@2,0 {
+                       nvidia,num-lanes = <1>;
+               };
+
+               pci@3,0 {
+                       status = "okay";
+                       nvidia,num-lanes = <1>;
+               };
+       };
+
        pinmux {
                pinctrl-names = "default";
                pinctrl-0 = <&state_default>;
@@ -173,19 +193,6 @@
                        gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
                };
 
-               tps62361 {
-                       compatible = "ti,tps62361";
-                       reg = <0x60>;
-
-                       regulator-name = "tps62361-vout";
-                       regulator-min-microvolt = <500000>;
-                       regulator-max-microvolt = <1500000>;
-                       regulator-boot-on;
-                       regulator-always-on;
-                       ti,vsel0-state-high;
-                       ti,vsel1-state-high;
-               };
-
                pmic: tps65911@2d {
                        compatible = "ti,tps65911";
                        reg = <0x2d>;
@@ -286,6 +293,26 @@
                                };
                        };
                };
+
+               nct1008 {
+                       compatible = "onnn,nct1008";
+                       reg = <0x4c>;
+                       interrupt-parent = <&gpio>;
+                       interrupts = <TEGRA_GPIO(CC, 2) IRQ_TYPE_LEVEL_LOW>;
+               };
+
+               tps62361 {
+                       compatible = "ti,tps62361";
+                       reg = <0x60>;
+
+                       regulator-name = "tps62361-vout";
+                       regulator-min-microvolt = <500000>;
+                       regulator-max-microvolt = <1500000>;
+                       regulator-boot-on;
+                       regulator-always-on;
+                       ti,vsel0-state-high;
+                       ti,vsel1-state-high;
+               };
        };
 
        spi@7000da00 {
@@ -307,7 +334,7 @@
        pmc {
                status = "okay";
                nvidia,invert-interrupt;
-               nvidia,suspend-mode = <2>;
+               nvidia,suspend-mode = <1>;
                nvidia,cpu-pwr-good-time = <2000>;
                nvidia,cpu-pwr-off-time = <200>;
                nvidia,core-pwr-good-time = <3845 3845>;
@@ -330,6 +357,15 @@
                non-removable;
        };
 
+       usb@7d008000 {
+               status = "okay";
+       };
+
+       usb-phy@7d008000 {
+               vbus-supply = <&usb3_vbus_reg>;
+               status = "okay";
+       };
+
        clocks {
                compatible = "simple-bus";
                #address-cells = <1>;