diff options
author | Victor Gallardo <vgallardo@apm.com> | 2010-10-08 06:25:44 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2010-11-29 10:05:24 -0500 |
commit | ee2ffd8bbb2170f9b52fc8ff4aebe9702e0de651 (patch) | |
tree | a8c98011e96c68839fb84d715d596d35dc404ff6 /arch/powerpc/boot/dts | |
parent | 05ed60874e7fc958707183b71ea47260c1dab358 (diff) |
powerpc/4xx: Add Canyonlands suspend and idle support
- Add Clock Power Management (CPM) node to dts tree
- Add idle-doze entry in CPM node
- Add standby entry in CPM node
- Add PM and SUSPEND support by default in defconfig
- Remove UART2 and UART3 as they are unused, this will
allow CPM to put unused-units (UART2 and UART3) to sleep.
Signed-off-by: Victor Gallardo <vgallardo@apm.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/boot/dts')
-rw-r--r-- | arch/powerpc/boot/dts/canyonlands.dts | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts index a30370396250..5b27a4b74b79 100644 --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts | |||
@@ -105,6 +105,15 @@ | |||
105 | dcr-reg = <0x00c 0x002>; | 105 | dcr-reg = <0x00c 0x002>; |
106 | }; | 106 | }; |
107 | 107 | ||
108 | CPM0: cpm { | ||
109 | compatible = "ibm,cpm"; | ||
110 | dcr-access-method = "native"; | ||
111 | dcr-reg = <0x160 0x003>; | ||
112 | unused-units = <0x00000100>; | ||
113 | idle-doze = <0x02000000>; | ||
114 | standby = <0xfeff791d>; | ||
115 | }; | ||
116 | |||
108 | L2C0: l2c { | 117 | L2C0: l2c { |
109 | compatible = "ibm,l2-cache-460ex", "ibm,l2-cache"; | 118 | compatible = "ibm,l2-cache-460ex", "ibm,l2-cache"; |
110 | dcr-reg = <0x020 0x008 /* Internal SRAM DCR's */ | 119 | dcr-reg = <0x020 0x008 /* Internal SRAM DCR's */ |
@@ -270,28 +279,6 @@ | |||
270 | interrupts = <0x1 0x4>; | 279 | interrupts = <0x1 0x4>; |
271 | }; | 280 | }; |
272 | 281 | ||
273 | UART2: serial@ef600500 { | ||
274 | device_type = "serial"; | ||
275 | compatible = "ns16550"; | ||
276 | reg = <0xef600500 0x00000008>; | ||
277 | virtual-reg = <0xef600500>; | ||
278 | clock-frequency = <0>; /* Filled in by U-Boot */ | ||
279 | current-speed = <0>; /* Filled in by U-Boot */ | ||
280 | interrupt-parent = <&UIC1>; | ||
281 | interrupts = <28 0x4>; | ||
282 | }; | ||
283 | |||
284 | UART3: serial@ef600600 { | ||
285 | device_type = "serial"; | ||
286 | compatible = "ns16550"; | ||
287 | reg = <0xef600600 0x00000008>; | ||
288 | virtual-reg = <0xef600600>; | ||
289 | clock-frequency = <0>; /* Filled in by U-Boot */ | ||
290 | current-speed = <0>; /* Filled in by U-Boot */ | ||
291 | interrupt-parent = <&UIC1>; | ||
292 | interrupts = <29 0x4>; | ||
293 | }; | ||
294 | |||
295 | IIC0: i2c@ef600700 { | 282 | IIC0: i2c@ef600700 { |
296 | compatible = "ibm,iic-460ex", "ibm,iic"; | 283 | compatible = "ibm,iic-460ex", "ibm,iic"; |
297 | reg = <0xef600700 0x00000014>; | 284 | reg = <0xef600700 0x00000014>; |