Merge branch 'pm-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus

1 files changed, 44 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index 0ccb8b46d157..b155c366c650 100644
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -16,6 +16,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/gpio.h>
+#include <linux/leds.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -30,9 +31,49 @@
 #include <plat/usb.h>
 
 #include "mux.h"
+#include "pm.h"
+
+#define RX51_GPIO_SLEEP_IND 162
 
 struct omap_sdrc_params *rx51_get_sdram_timings(void);
 
+static struct gpio_led gpio_leds[] = {
+        {
+                .name   = "sleep_ind",
+                .gpio   = RX51_GPIO_SLEEP_IND,
+        },
+};
+
+static struct gpio_led_platform_data gpio_led_info = {
+        .leds           = gpio_leds,
+        .num_leds       = ARRAY_SIZE(gpio_leds),
+};
+
+static struct platform_device leds_gpio = {
+        .name   = "leds-gpio",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &gpio_led_info,
+        },
+};
+
+static struct cpuidle_params rx51_cpuidle_params[] = {
+        /* C1 */
+        {1, 110, 162, 5},
+        /* C2 */
+        {1, 106, 180, 309},
+        /* C3 */
+        {0, 107, 410, 46057},
+        /* C4 */
+        {0, 121, 3374, 46057},
+        /* C5 */
+        {1, 855, 1146, 46057},
+        /* C6 */
+        {0, 7580, 4134, 484329},
+        /* C7 */
+        {1, 7505, 15274, 484329},
+};
+
 static struct omap_lcd_config rx51_lcd_config = {
         .ctrl_name      = "internal",
 };
@@ -62,6 +103,7 @@ static void __init rx51_init_irq(void)
 
         omap_board_config = rx51_config;
         omap_board_config_size = ARRAY_SIZE(rx51_config);
+        omap3_pm_init_cpuidle(rx51_cpuidle_params);
         sdrc_params = rx51_get_sdram_timings();
         omap2_init_common_hw(sdrc_params, sdrc_params);
         omap_init_irq();
@@ -94,6 +136,8 @@ static void __init rx51_init(void)
         /* Ensure SDRC pins are mux'd for self-refresh */
         omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
         omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
+
+        platform_device_register(&leds_gpio);
 }
 
 static void __init rx51_map_io(void)