diff options
author | Victor Gallardo <vgallardo@apm.com> | 2010-10-08 06:26:13 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2010-11-29 10:05:18 -0500 |
commit | 05ed60874e7fc958707183b71ea47260c1dab358 (patch) | |
tree | 9bdc217723c86b6557c3713feb421943f2cacbd4 /arch/powerpc | |
parent | d164f6d4f9108126f69ba2963cf6fb7ef4ba9232 (diff) |
powerpc/4xx: Add Kilauea 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
- Add NO_HZ and CONFIG_HIGH_RES_TIMERS support by
default in defconfig
Signed-off-by: Victor Gallardo <vgallardo@apm.com>
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/boot/dts/kilauea.dts | 9 | ||||
-rw-r--r-- | arch/powerpc/configs/40x/kilauea_defconfig | 5 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts index 083e68eeaca4..89edb16649c3 100644 --- a/arch/powerpc/boot/dts/kilauea.dts +++ b/arch/powerpc/boot/dts/kilauea.dts | |||
@@ -82,6 +82,15 @@ | |||
82 | interrupt-parent = <&UIC0>; | 82 | interrupt-parent = <&UIC0>; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | CPM0: cpm { | ||
86 | compatible = "ibm,cpm"; | ||
87 | dcr-access-method = "native"; | ||
88 | dcr-reg = <0x0b0 0x003>; | ||
89 | unused-units = <0x00000000>; | ||
90 | idle-doze = <0x02000000>; | ||
91 | standby = <0xe3e74800>; | ||
92 | }; | ||
93 | |||
85 | plb { | 94 | plb { |
86 | compatible = "ibm,plb-405ex", "ibm,plb4"; | 95 | compatible = "ibm,plb-405ex", "ibm,plb4"; |
87 | #address-cells = <1>; | 96 | #address-cells = <1>; |
diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig index 4e19ee7ce4ee..34b8c1a1e752 100644 --- a/arch/powerpc/configs/40x/kilauea_defconfig +++ b/arch/powerpc/configs/40x/kilauea_defconfig | |||
@@ -12,6 +12,8 @@ CONFIG_MODULES=y | |||
12 | CONFIG_MODULE_UNLOAD=y | 12 | CONFIG_MODULE_UNLOAD=y |
13 | # CONFIG_BLK_DEV_BSG is not set | 13 | # CONFIG_BLK_DEV_BSG is not set |
14 | CONFIG_KILAUEA=y | 14 | CONFIG_KILAUEA=y |
15 | CONFIG_NO_HZ=y | ||
16 | CONFIG_HIGH_RES_TIMERS=y | ||
15 | # CONFIG_WALNUT is not set | 17 | # CONFIG_WALNUT is not set |
16 | CONFIG_SPARSE_IRQ=y | 18 | CONFIG_SPARSE_IRQ=y |
17 | CONFIG_PCI=y | 19 | CONFIG_PCI=y |
@@ -42,6 +44,9 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
42 | CONFIG_MTD_NAND=y | 44 | CONFIG_MTD_NAND=y |
43 | CONFIG_MTD_NAND_NDFC=y | 45 | CONFIG_MTD_NAND_NDFC=y |
44 | CONFIG_PROC_DEVICETREE=y | 46 | CONFIG_PROC_DEVICETREE=y |
47 | CONFIG_PM=y | ||
48 | CONFIG_SUSPEND=y | ||
49 | CONFIG_PPC4xx_CPM=y | ||
45 | CONFIG_BLK_DEV_RAM=y | 50 | CONFIG_BLK_DEV_RAM=y |
46 | CONFIG_BLK_DEV_RAM_SIZE=35000 | 51 | CONFIG_BLK_DEV_RAM_SIZE=35000 |
47 | # CONFIG_MISC_DEVICES is not set | 52 | # CONFIG_MISC_DEVICES is not set |