10 files changed, 70 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index d953ccca1efd..a094787aca22 100644
--- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -361,6 +361,15 @@
                 };
         };
 
+        pmc {
+                nvidia,suspend-mode = <2>;
+                nvidia,cpu-pwr-good-time = <5000>;
+                nvidia,cpu-pwr-off-time = <5000>;
+                nvidia,core-pwr-good-time = <3845 3845>;
+                nvidia,core-pwr-off-time = <3875>;
+                nvidia,sys-clock-req-active-high;
+        };
+
         memory-controller@7000f400 {
                 emc-table@83250 {
                         reg = <83250>;
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index d86dd85c4c4e..a44b54eb6037 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -416,6 +416,12 @@
 
         pmc {
                 nvidia,invert-interrupt;
+                nvidia,suspend-mode = <2>;
+                nvidia,cpu-pwr-good-time = <5000>;
+                nvidia,cpu-pwr-off-time = <5000>;
+                nvidia,core-pwr-good-time = <3845 3845>;
+                nvidia,core-pwr-off-time = <3875>;
+                nvidia,sys-clock-req-active-high;
         };
 
         usb@c5000000 {
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index 3bd8448b59f5..8c0e9a265810 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -415,6 +415,12 @@
 
         pmc {
                 nvidia,invert-interrupt;
+                nvidia,suspend-mode = <2>;
+                nvidia,cpu-pwr-good-time = <2000>;
+                nvidia,cpu-pwr-off-time = <0>;
+                nvidia,core-pwr-good-time = <3845 3845>;
+                nvidia,core-pwr-off-time = <0>;
+                nvidia,sys-clock-req-active-high;
         };
 
         usb@c5000000 {
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 6bf4ee75efde..c45b69859748 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -517,6 +517,12 @@
 
         pmc {
                 nvidia,invert-interrupt;
+                nvidia,suspend-mode = <2>;
+                nvidia,cpu-pwr-good-time = <5000>;
+                nvidia,cpu-pwr-off-time = <5000>;
+                nvidia,core-pwr-good-time = <3845 3845>;
+                nvidia,core-pwr-off-time = <3875>;
+                nvidia,sys-clock-req-active-high;
         };
 
         memory-controller@7000f400 {
diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index c19025725918..50b3ec16b93a 100644
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -458,6 +458,12 @@
 
         pmc {
                 nvidia,invert-interrupt;
+                nvidia,suspend-mode = <2>;
+                nvidia,cpu-pwr-good-time = <5000>;
+                nvidia,cpu-pwr-off-time = <5000>;
+                nvidia,core-pwr-good-time = <3845 3845>;
+                nvidia,core-pwr-off-time = <3875>;
+                nvidia,sys-clock-req-active-high;
         };
 
         usb@c5008000 {
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index f96870c4bdac..f2fbc3838d0d 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -300,6 +300,15 @@
                 };
         };
 
+        pmc {
+                nvidia,suspend-mode = <2>;
+                nvidia,cpu-pwr-good-time = <5000>;
+                nvidia,cpu-pwr-off-time = <5000>;
+                nvidia,core-pwr-good-time = <3845 3845>;
+                nvidia,core-pwr-off-time = <3875>;
+                nvidia,sys-clock-req-active-high;
+        };
+
         usb@c5000000 {
                 status = "okay";
                 nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index bdc07b567f25..395df485d558 100644
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -493,6 +493,12 @@
 
         pmc {
                 nvidia,invert-interrupt;
+                nvidia,suspend-mode = <2>;
+                nvidia,cpu-pwr-good-time = <2000>;
+                nvidia,cpu-pwr-off-time = <100>;
+                nvidia,core-pwr-good-time = <3845 3845>;
+                nvidia,core-pwr-off-time = <458>;
+                nvidia,sys-clock-req-active-high;
         };
 
         usb@c5000000 {
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index b3fc47384e7d..2ed6bb8ce6f4 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -496,6 +496,14 @@
 
         pmc {
                 nvidia,invert-interrupt;
+                nvidia,suspend-mode = <2>;
+                nvidia,cpu-pwr-good-time = <2000>;
+                nvidia,cpu-pwr-off-time = <1000>;
+                nvidia,core-pwr-good-time = <0 3845>;
+                nvidia,core-pwr-off-time = <93727>;
+                nvidia,core-power-req-active-high;
+                nvidia,sys-clock-req-active-high;
+                nvidia,combined-power-req;
         };
 
         usb@c5000000 {
diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index a930d19aeb30..b732f7c13a66 100644
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -253,6 +253,13 @@
         pmc {
                 status = "okay";
                 nvidia,invert-interrupt;
+                nvidia,suspend-mode = <2>;
+                nvidia,cpu-pwr-good-time = <2000>;
+                nvidia,cpu-pwr-off-time = <200>;
+                nvidia,core-pwr-good-time = <3845 3845>;
+                nvidia,core-pwr-off-time = <0>;
+                nvidia,core-power-req-active-high;
+                nvidia,sys-clock-req-active-high;
         };
 
         sdhci@78000000 {
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index 0e97c7499008..01b4c26fad96 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -307,6 +307,13 @@
         pmc {
                 status = "okay";
                 nvidia,invert-interrupt;
+                nvidia,suspend-mode = <2>;
+                nvidia,cpu-pwr-good-time = <2000>;
+                nvidia,cpu-pwr-off-time = <200>;
+                nvidia,core-pwr-good-time = <3845 3845>;
+                nvidia,core-pwr-off-time = <0>;
+                nvidia,core-power-req-active-high;
+                nvidia,sys-clock-req-active-high;
         };
 
         sdhci@78000000 {