3 files changed, 40 insertions, 91 deletions

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 903da8eb886c..cdd05f2e67ee 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -55,12 +55,6 @@ config MACH_OMAP_H3
           TI OMAP 1710 H3 board support. Say Y here if you have such
           a board.
 
-config MACH_OMAP_HTCWIZARD
-        bool "HTC Wizard"
-        depends on ARCH_OMAP850
-        help
-          HTC Wizard smartphone support (AKA QTEK 9100, ...)
-
 config MACH_HERALD
         bool "HTC Herald"
         depends on ARCH_OMAP850
diff --git a/arch/arm/mach-omap1/dma.h b/arch/arm/mach-omap1/dma.h
index da6345dab03f..d05909c96715 100644
--- a/arch/arm/mach-omap1/dma.h
+++ b/arch/arm/mach-omap1/dma.h
@@ -21,21 +21,10 @@
 
 /* DMA channels for omap1 */
 #define OMAP_DMA_NO_DEVICE              0
-#define OMAP_DMA_MCSI1_TX               1
-#define OMAP_DMA_MCSI1_RX               2
-#define OMAP_DMA_I2C_RX                 3
-#define OMAP_DMA_I2C_TX                 4
-#define OMAP_DMA_EXT_NDMA_REQ           5
-#define OMAP_DMA_EXT_NDMA_REQ2          6
-#define OMAP_DMA_UWIRE_TX               7
 #define OMAP_DMA_MCBSP1_TX              8
 #define OMAP_DMA_MCBSP1_RX              9
 #define OMAP_DMA_MCBSP3_TX              10
 #define OMAP_DMA_MCBSP3_RX              11
-#define OMAP_DMA_UART1_TX               12
-#define OMAP_DMA_UART1_RX               13
-#define OMAP_DMA_UART2_TX               14
-#define OMAP_DMA_UART2_RX               15
 #define OMAP_DMA_MCBSP2_TX              16
 #define OMAP_DMA_MCBSP2_RX              17
 #define OMAP_DMA_UART3_TX               18
@@ -43,41 +32,11 @@
 #define OMAP_DMA_CAMERA_IF_RX           20
 #define OMAP_DMA_MMC_TX                 21
 #define OMAP_DMA_MMC_RX                 22
-#define OMAP_DMA_NAND                   23
-#define OMAP_DMA_IRQ_LCD_LINE           24
-#define OMAP_DMA_MEMORY_STICK           25
 #define OMAP_DMA_USB_W2FC_RX0           26
-#define OMAP_DMA_USB_W2FC_RX1           27
-#define OMAP_DMA_USB_W2FC_RX2           28
 #define OMAP_DMA_USB_W2FC_TX0           29
-#define OMAP_DMA_USB_W2FC_TX1           30
-#define OMAP_DMA_USB_W2FC_TX2           31
 
 /* These are only for 1610 */
-#define OMAP_DMA_CRYPTO_DES_IN          32
-#define OMAP_DMA_SPI_TX                 33
-#define OMAP_DMA_SPI_RX                 34
-#define OMAP_DMA_CRYPTO_HASH            35
-#define OMAP_DMA_CCP_ATTN               36
-#define OMAP_DMA_CCP_FIFO_NOT_EMPTY     37
-#define OMAP_DMA_CMT_APE_TX_CHAN_0      38
-#define OMAP_DMA_CMT_APE_RV_CHAN_0      39
-#define OMAP_DMA_CMT_APE_TX_CHAN_1      40
-#define OMAP_DMA_CMT_APE_RV_CHAN_1      41
-#define OMAP_DMA_CMT_APE_TX_CHAN_2      42
-#define OMAP_DMA_CMT_APE_RV_CHAN_2      43
-#define OMAP_DMA_CMT_APE_TX_CHAN_3      44
-#define OMAP_DMA_CMT_APE_RV_CHAN_3      45
-#define OMAP_DMA_CMT_APE_TX_CHAN_4      46
-#define OMAP_DMA_CMT_APE_RV_CHAN_4      47
-#define OMAP_DMA_CMT_APE_TX_CHAN_5      48
-#define OMAP_DMA_CMT_APE_RV_CHAN_5      49
-#define OMAP_DMA_CMT_APE_TX_CHAN_6      50
-#define OMAP_DMA_CMT_APE_RV_CHAN_6      51
-#define OMAP_DMA_CMT_APE_TX_CHAN_7      52
-#define OMAP_DMA_CMT_APE_RV_CHAN_7      53
 #define OMAP_DMA_MMC2_TX                54
 #define OMAP_DMA_MMC2_RX                55
-#define OMAP_DMA_CRYPTO_DES_OUT         56
 
 #endif /* __OMAP1_DMA_CHANNEL_H */
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 7a7690ab6cb8..dd712f109738 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -37,12 +37,14 @@
 
 #include <linux/suspend.h>
 #include <linux/sched.h>
-#include <linux/proc_fs.h>
+#include <linux/debugfs.h>
+#include <linux/seq_file.h>
 #include <linux/interrupt.h>
 #include <linux/sysfs.h>
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/atomic.h>
+#include <linux/cpu.h>
 
 #include <asm/fncpy.h>
 #include <asm/system_misc.h>
@@ -422,23 +424,12 @@ void omap1_pm_suspend(void)
                 omap_rev());
 }
 
-#if defined(DEBUG) && defined(CONFIG_PROC_FS)
-static int g_read_completed;
-
+#ifdef CONFIG_DEBUG_FS
 /*
  * Read system PM registers for debugging
  */
-static int omap_pm_read_proc(
-        char *page_buffer,
-        char **my_first_byte,
-        off_t virtual_start,
-        int length,
-        int *eof,
-        void *data)
+static int omap_pm_debug_show(struct seq_file *m, void *v)
 {
-        int my_buffer_offset = 0;
-        char * const my_base = page_buffer;
-
         ARM_SAVE(ARM_CKCTL);
         ARM_SAVE(ARM_IDLECT1);
         ARM_SAVE(ARM_IDLECT2);
@@ -479,10 +470,7 @@ static int omap_pm_read_proc(
                 MPUI1610_SAVE(EMIFS_CONFIG);
         }
 
-        if (virtual_start == 0) {
-                g_read_completed = 0;
-
-                my_buffer_offset += sprintf(my_base + my_buffer_offset,
+        seq_printf(m,
                    "ARM_CKCTL_REG:            0x%-8x     \n"
                    "ARM_IDLECT1_REG:          0x%-8x     \n"
                    "ARM_IDLECT2_REG:          0x%-8x     \n"
@@ -512,8 +500,8 @@ static int omap_pm_read_proc(
                    ULPD_SHOW(ULPD_STATUS_REQ),
                    ULPD_SHOW(ULPD_POWER_CTRL));
 
-                if (cpu_is_omap7xx()) {
-                        my_buffer_offset += sprintf(my_base + my_buffer_offset,
+        if (cpu_is_omap7xx()) {
+                seq_printf(m,
                            "MPUI7XX_CTRL_REG         0x%-8x \n"
                            "MPUI7XX_DSP_STATUS_REG:      0x%-8x \n"
                            "MPUI7XX_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
@@ -526,8 +514,8 @@ static int omap_pm_read_proc(
                            MPUI7XX_SHOW(MPUI_DSP_API_CONFIG),
                            MPUI7XX_SHOW(EMIFF_SDRAM_CONFIG),
                            MPUI7XX_SHOW(EMIFS_CONFIG));
-                } else if (cpu_is_omap15xx()) {
-                        my_buffer_offset += sprintf(my_base + my_buffer_offset,
+        } else if (cpu_is_omap15xx()) {
+                seq_printf(m,
                            "MPUI1510_CTRL_REG             0x%-8x \n"
                            "MPUI1510_DSP_STATUS_REG:      0x%-8x \n"
                            "MPUI1510_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
@@ -540,8 +528,8 @@ static int omap_pm_read_proc(
                            MPUI1510_SHOW(MPUI_DSP_API_CONFIG),
                            MPUI1510_SHOW(EMIFF_SDRAM_CONFIG),
                            MPUI1510_SHOW(EMIFS_CONFIG));
-                } else if (cpu_is_omap16xx()) {
-                        my_buffer_offset += sprintf(my_base + my_buffer_offset,
+        } else if (cpu_is_omap16xx()) {
+                seq_printf(m,
                            "MPUI1610_CTRL_REG             0x%-8x \n"
                            "MPUI1610_DSP_STATUS_REG:      0x%-8x \n"
                            "MPUI1610_DSP_BOOT_CONFIG_REG: 0x%-8x \n"
@@ -554,28 +542,37 @@ static int omap_pm_read_proc(
                            MPUI1610_SHOW(MPUI_DSP_API_CONFIG),
                            MPUI1610_SHOW(EMIFF_SDRAM_CONFIG),
                            MPUI1610_SHOW(EMIFS_CONFIG));
-                }
-
-                g_read_completed++;
-        } else if (g_read_completed >= 1) {
-                 *eof = 1;
-                 return 0;
         }
-        g_read_completed++;
 
-        *my_first_byte = page_buffer;
-        return  my_buffer_offset;
+        return 0;
 }
 
-static void omap_pm_init_proc(void)
+static int omap_pm_debug_open(struct inode *inode, struct file *file)
 {
-        /* XXX Appears to leak memory */
-        create_proc_read_entry("driver/omap_pm",
-                               S_IWUSR | S_IRUGO, NULL,
-                               omap_pm_read_proc, NULL);
+        return single_open(file, omap_pm_debug_show,
+                                &inode->i_private);
 }
 
-#endif /* DEBUG && CONFIG_PROC_FS */
+static const struct file_operations omap_pm_debug_fops = {
+        .open           = omap_pm_debug_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+
+static void omap_pm_init_debugfs(void)
+{
+        struct dentry *d;
+
+        d = debugfs_create_dir("pm_debug", NULL);
+        if (!d)
+                return;
+
+        (void) debugfs_create_file("omap_pm", S_IWUSR | S_IRUGO,
+                                        d, NULL, &omap_pm_debug_fops);
+}
+
+#endif /* CONFIG_DEBUG_FS */
 
 /*
  *      omap_pm_prepare - Do preliminary suspend work.
@@ -584,8 +581,7 @@ static void omap_pm_init_proc(void)
 static int omap_pm_prepare(void)
 {
         /* We cannot sleep in idle until we have resumed */
-        disable_hlt();
-
+        cpu_idle_poll_ctrl(true);
         return 0;
 }
 
@@ -621,7 +617,7 @@ static int omap_pm_enter(suspend_state_t state)
 
 static void omap_pm_finish(void)
 {
-        enable_hlt();
+        cpu_idle_poll_ctrl(false);
 }
 
 
@@ -701,8 +697,8 @@ static int __init omap_pm_init(void)
 
         suspend_set_ops(&omap_pm_ops);
 
-#if defined(DEBUG) && defined(CONFIG_PROC_FS)
-        omap_pm_init_proc();
+#ifdef CONFIG_DEBUG_FS
+        omap_pm_init_debugfs();
 #endif
 
 #ifdef CONFIG_OMAP_32K_TIMER