summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorBibek Basu <bbasu@nvidia.com>2014-09-12 14:22:00 +0530
committerMatthew Pedro <mapedro@nvidia.com>2014-09-15 10:49:13 -0700
commit1eb27a70ed42f6594a84c4c90cd04f2189241c1a (patch)
tree4a7f07a7b4d0e1fb5b17d7e47bec3cdec3cdc33e /arch
parentdebaa673365f6b8b9c959f67df2b216d5818cdb1 (diff)
arm: tegra12: dtb: rearrange pmc registration
PMC should be suspended as soon as interrupt- controller bus is suspended so that no wake signal is entertained in between leading to abnormal system behaviour Bug 200036432 Change-Id: I4de7462a8c0588f8cecde270a97c39040748a4b6 Signed-off-by: Bibek Basu <bbasu@nvidia.com> Reviewed-on: http://git-master/r/498280 Reviewed-by: Matthew Pedro <mapedro@nvidia.com> Tested-by: Matthew Pedro <mapedro@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/tegra124-soc.dtsi40
1 files changed, 20 insertions, 20 deletions
diff --git a/arch/arm/boot/dts/tegra124-soc.dtsi b/arch/arm/boot/dts/tegra124-soc.dtsi
index 0249b093eacf..080f88bf9e67 100644
--- a/arch/arm/boot/dts/tegra124-soc.dtsi
+++ b/arch/arm/boot/dts/tegra124-soc.dtsi
@@ -41,13 +41,6 @@
interrupt-controller;
};
- se: se@70012000 {
- compatible = "nvidia,tegra124-se";
- reg = <0x0 0x70012000 0x0 0x2000 /* SE base */
- 0x0 0x7000e400 0x0 0x400>; /* PMC base */
- interrupts = <0 58 0x04>;
- };
-
tegra_car: clock {
compatible = "nvidia,tegra124-car";
reg = <0x0 0x60006000 0x0 0x1000>;
@@ -316,11 +309,12 @@
dma-names = "rx", "tx";
};
- pmc {
- compatible = "nvidia,tegra124-pmc";
- reg = <0x0 0x7000e400 0x0 0x400>;
- clocks = <&tegra_car 261>, <&clk32k_in>;
- clock-names = "pclk", "clk32k_in";
+ sata@0x70020000 {
+ compatible = "nvidia,tegra114-ahci-sata";
+ reg = <0x0 0x70027000 0x0 0x00002000>,
+ <0x0 0x70021000 0x0 0x00001000>;
+ interrupts = <0 23 0x04>;
+ status = "disabled";
};
efuse@7000f800 {
@@ -646,14 +640,6 @@
status = "disabled";
};
- sata@0x70020000 {
- compatible = "nvidia,tegra114-ahci-sata";
- reg = <0x0 0x70027000 0x0 0x00002000>,
- <0x0 0x70021000 0x0 0x00001000>;
- interrupts = <0 23 0x04>;
- status = "disabled";
- };
-
psci {
compatible = "arm,psci";
method = "smc";
@@ -689,4 +675,18 @@
nvidia,memory-clients = <25>;
status = "disabled";
};
+
+ pmc {
+ compatible = "nvidia,tegra124-pmc";
+ reg = <0x0 0x7000e400 0x0 0x400>;
+ clocks = <&tegra_car 261>, <&clk32k_in>;
+ clock-names = "pclk", "clk32k_in";
+ };
+
+ se: se@70012000 {
+ compatible = "nvidia,tegra124-se";
+ reg = <0x0 0x70012000 0x0 0x2000 /* SE base */
+ 0x0 0x7000e400 0x0 0x400>; /* PMC base */
+ interrupts = <0 58 0x04>;
+ };
};