omap: headers: Move remaining headers from include/mach to include/plat

[linux-block.git] / drivers / input / keyboard / omap-keypad.c

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 87ec7b18ac69dbca67065b51891c1c9afb028982..1a494d505431a3babe4b08c6911fa8db6c9652bd 100644 (file)
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -35,12 +35,12 @@
 #include <linux/mutex.h>
 #include <linux/errno.h>
 #include <mach/gpio.h>
-#include <mach/keypad.h>
-#include <mach/menelaus.h>
+#include <plat/keypad.h>
+#include <plat/menelaus.h>
 #include <asm/irq.h>
 #include <mach/hardware.h>
 #include <asm/io.h>
-#include <mach/mux.h>
+#include <plat/mux.h>
 
 #undef NEW_BOARD_LEARNING_MODE
 
@@ -116,7 +116,7 @@ static irqreturn_t omap_kp_interrupt(int irq, void *dev_id)
                }
        } else
                /* disable keyboard interrupt and schedule for handling */
-               omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+               omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 
        tasklet_schedule(&kp_tasklet);
 
@@ -143,20 +143,20 @@ static void omap_kp_scan_keypad(struct omap_kp *omap_kp, unsigned char *state)
 
        } else {
                /* disable keyboard interrupt and schedule for handling */
-               omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+               omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 
                /* read the keypad status */
-               omap_writew(0xff, OMAP_MPUIO_BASE + OMAP_MPUIO_KBC);
+               omap_writew(0xff, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBC);
                for (col = 0; col < omap_kp->cols; col++) {
                        omap_writew(~(1 << col) & 0xff,
-                                   OMAP_MPUIO_BASE + OMAP_MPUIO_KBC);
+                                   OMAP1_MPUIO_BASE + OMAP_MPUIO_KBC);
 
                        udelay(omap_kp->delay);
 
-                       state[col] = ~omap_readw(OMAP_MPUIO_BASE +
+                       state[col] = ~omap_readw(OMAP1_MPUIO_BASE +
                                                 OMAP_MPUIO_KBR_LATCH) & 0xff;
                }
-               omap_writew(0x00, OMAP_MPUIO_BASE + OMAP_MPUIO_KBC);
+               omap_writew(0x00, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBC);
                udelay(2);
        }
 }
@@ -234,7 +234,7 @@ static void omap_kp_tasklet(unsigned long data)
                        for (i = 0; i < omap_kp_data->rows; i++)
                                enable_irq(gpio_to_irq(row_gpios[i]));
                } else {
-                       omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+                       omap_writew(0, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
                        kp_cur_group = -1;
                }
        }
@@ -317,7 +317,7 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
 
        /* Disable the interrupt for the MPUIO keyboard */
        if (!cpu_is_omap24xx())
-               omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+               omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 
        keymap = pdata->keymap;
 
@@ -391,7 +391,7 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
        }
 
        if (pdata->dbounce)
-               omap_writew(0xff, OMAP_MPUIO_BASE + OMAP_MPUIO_GPIO_DEBOUNCING);
+               omap_writew(0xff, OMAP1_MPUIO_BASE + OMAP_MPUIO_GPIO_DEBOUNCING);
 
        /* scan current status and enable interrupt */
        omap_kp_scan_keypad(omap_kp, keypad_state);
@@ -402,7 +402,7 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
                                        "omap-keypad", omap_kp) < 0)
                                goto err4;
                }
-               omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+               omap_writew(0, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
        } else {
                for (irq_idx = 0; irq_idx < omap_kp->rows; irq_idx++) {
                        if (request_irq(gpio_to_irq(row_gpios[irq_idx]),
@@ -449,7 +449,7 @@ static int __devexit omap_kp_remove(struct platform_device *pdev)
                        free_irq(gpio_to_irq(row_gpios[i]), 0);
                }
        } else {
-               omap_writew(1, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
+               omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
                free_irq(omap_kp->irq, 0);
        }