7 files changed, 93 insertions, 106 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index b33c78586bfc..9d090833e245 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -39,6 +39,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/i2c-omap.h>
+#include <linux/pm_runtime.h>
 
 /* I2C controller revisions */
 #define OMAP_I2C_REV_2                  0x20
@@ -175,8 +176,6 @@ struct omap_i2c_dev {
         void __iomem            *base;          /* virtual */
         int                     irq;
         int                     reg_shift;      /* bit shift for I2C register addresses */
-        struct clk              *iclk;          /* Interface clock */
-        struct clk              *fclk;          /* Functional clock */
         struct completion       cmd_complete;
         struct resource         *ioarea;
         u32                     latency;        /* maximum mpu wkup latency */
@@ -265,45 +264,18 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)
                                 (i2c_dev->regs[reg] << i2c_dev->reg_shift));
 }
 
-static int __init omap_i2c_get_clocks(struct omap_i2c_dev *dev)
+static void omap_i2c_unidle(struct omap_i2c_dev *dev)
 {
-        int ret;
+        struct platform_device *pdev;
+        struct omap_i2c_bus_platform_data *pdata;
 
-        dev->iclk = clk_get(dev->dev, "ick");
-        if (IS_ERR(dev->iclk)) {
-                ret = PTR_ERR(dev->iclk);
-                dev->iclk = NULL;
-                return ret;
-        }
+        WARN_ON(!dev->idle);
 
-        dev->fclk = clk_get(dev->dev, "fck");
-        if (IS_ERR(dev->fclk)) {
-                ret = PTR_ERR(dev->fclk);
-                if (dev->iclk != NULL) {
-                        clk_put(dev->iclk);
-                        dev->iclk = NULL;
-                }
-                dev->fclk = NULL;
-                return ret;
-        }
+        pdev = to_platform_device(dev->dev);
+        pdata = pdev->dev.platform_data;
 
-        return 0;
-}
+        pm_runtime_get_sync(&pdev->dev);
 
-static void omap_i2c_put_clocks(struct omap_i2c_dev *dev)
-{
-        clk_put(dev->fclk);
-        dev->fclk = NULL;
-        clk_put(dev->iclk);
-        dev->iclk = NULL;
-}
-
-static void omap_i2c_unidle(struct omap_i2c_dev *dev)
-{
-        WARN_ON(!dev->idle);
-
-        clk_enable(dev->iclk);
-        clk_enable(dev->fclk);
         if (cpu_is_omap34xx()) {
                 omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
                 omap_i2c_write_reg(dev, OMAP_I2C_PSC_REG, dev->pscstate);
@@ -326,10 +298,15 @@ static void omap_i2c_unidle(struct omap_i2c_dev *dev)
 
 static void omap_i2c_idle(struct omap_i2c_dev *dev)
 {
+        struct platform_device *pdev;
+        struct omap_i2c_bus_platform_data *pdata;
         u16 iv;
 
         WARN_ON(dev->idle);
 
+        pdev = to_platform_device(dev->dev);
+        pdata = pdev->dev.platform_data;
+
         dev->iestate = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);
         if (dev->rev >= OMAP_I2C_REV_ON_4430)
                 omap_i2c_write_reg(dev, OMAP_I2C_IRQENABLE_CLR, 1);
@@ -345,8 +322,8 @@ static void omap_i2c_idle(struct omap_i2c_dev *dev)
                 omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG);
         }
         dev->idle = 1;
-        clk_disable(dev->fclk);
-        clk_disable(dev->iclk);
+
+        pm_runtime_put_sync(&pdev->dev);
 }
 
 static int omap_i2c_init(struct omap_i2c_dev *dev)
@@ -356,6 +333,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
         unsigned long fclk_rate = 12000000;
         unsigned long timeout;
         unsigned long internal_clk = 0;
+        struct clk *fclk;
 
         if (dev->rev >= OMAP_I2C_REV_2) {
                 /* Disable I2C controller before soft reset */
@@ -414,7 +392,9 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
                  * always returns 12MHz for the functional clock, we can
                  * do this bit unconditionally.
                  */
-                fclk_rate = clk_get_rate(dev->fclk);
+                fclk = clk_get(dev->dev, "fck");
+                fclk_rate = clk_get_rate(fclk);
+                clk_put(fclk);
 
                 /* TRM for 5912 says the I2C clock must be prescaled to be
                  * between 7 - 12 MHz. The XOR input clock is typically
@@ -443,7 +423,9 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
                         internal_clk = 9600;
                 else
                         internal_clk = 4000;
-                fclk_rate = clk_get_rate(dev->fclk) / 1000;
+                fclk = clk_get(dev->dev, "fck");
+                fclk_rate = clk_get_rate(fclk) / 1000;
+                clk_put(fclk);
 
                 /* Compute prescaler divisor */
                 psc = fclk_rate / internal_clk;
@@ -1048,14 +1030,12 @@ omap_i2c_probe(struct platform_device *pdev)
         else
                 dev->reg_shift = 2;
 
-        if ((r = omap_i2c_get_clocks(dev)) != 0)
-                goto err_iounmap;
-
         if (cpu_is_omap44xx())
                 dev->regs = (u8 *) omap4_reg_map;
         else
                 dev->regs = (u8 *) reg_map;
 
+        pm_runtime_enable(&pdev->dev);
         omap_i2c_unidle(dev);
 
         dev->rev = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG) & 0xff;
@@ -1127,8 +1107,6 @@ err_free_irq:
 err_unuse_clocks:
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
         omap_i2c_idle(dev);
-        omap_i2c_put_clocks(dev);
-err_iounmap:
         iounmap(dev->base);
 err_free_mem:
         platform_set_drvdata(pdev, NULL);
@@ -1150,7 +1128,6 @@ omap_i2c_remove(struct platform_device *pdev)
         free_irq(dev->irq, dev);
         i2c_del_adapter(&dev->adapter);
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
-        omap_i2c_put_clocks(dev);
         iounmap(dev->base);
         kfree(dev);
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1162,7 +1139,7 @@ static struct platform_driver omap_i2c_driver = {
         .probe          = omap_i2c_probe,
         .remove         = omap_i2c_remove,
         .driver         = {
-                .name   = "i2c_omap",
+                .name   = "omap_i2c",
                 .owner  = THIS_MODULE,
         },
 };
@@ -1184,4 +1161,4 @@ module_exit(omap_i2c_exit_driver);
 MODULE_AUTHOR("MontaVista Software, Inc. (and others)");
 MODULE_DESCRIPTION("TI OMAP I2C bus adapter");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:i2c_omap");
+MODULE_ALIAS("platform:omap_i2c");
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index a72e61ddca91..0e2a19cb43d8 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -65,7 +65,6 @@ struct omap_kp {
 
 static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);
 
-static int *keymap;
 static unsigned int *row_gpios;
 static unsigned int *col_gpios;
 
@@ -162,20 +161,11 @@ static void omap_kp_scan_keypad(struct omap_kp *omap_kp, unsigned char *state)
         }
 }
 
-static inline int omap_kp_find_key(int col, int row)
-{
-        int i, key;
-
-        key = KEY(col, row, 0);
-        for (i = 0; keymap[i] != 0; i++)
-                if ((keymap[i] & 0xff000000) == key)
-                        return keymap[i] & 0x00ffffff;
-        return -1;
-}
-
 static void omap_kp_tasklet(unsigned long data)
 {
         struct omap_kp *omap_kp_data = (struct omap_kp *) data;
+        unsigned short *keycodes = omap_kp_data->input->keycode;
+        unsigned int row_shift = get_count_order(omap_kp_data->cols);
         unsigned char new_state[8], changed, key_down = 0;
         int col, row;
         int spurious = 0;
@@ -199,7 +189,7 @@ static void omap_kp_tasklet(unsigned long data)
                                row, (new_state[col] & (1 << row)) ?
                                "pressed" : "released");
 #else
-                        key = omap_kp_find_key(col, row);
+                        key = keycodes[MATRIX_SCAN_CODE(row, col, row_shift)];
                         if (key < 0) {
                                 printk(KERN_WARNING
                                       "omap-keypad: Spurious key event %d-%d\n",
@@ -298,13 +288,18 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
         struct input_dev *input_dev;
         struct omap_kp_platform_data *pdata =  pdev->dev.platform_data;
         int i, col_idx, row_idx, irq_idx, ret;
+        unsigned int row_shift, keycodemax;
 
-        if (!pdata->rows || !pdata->cols || !pdata->keymap) {
-                printk(KERN_ERR "No rows, cols or keymap from pdata\n");
+        if (!pdata->rows || !pdata->cols || !pdata->keymap_data) {
+                printk(KERN_ERR "No rows, cols or keymap_data from pdata\n");
                 return -EINVAL;
         }
 
-        omap_kp = kzalloc(sizeof(struct omap_kp), GFP_KERNEL);
+        row_shift = get_count_order(pdata->cols);
+        keycodemax = pdata->rows << row_shift;
+
+        omap_kp = kzalloc(sizeof(struct omap_kp) +
+                        keycodemax * sizeof(unsigned short), GFP_KERNEL);
         input_dev = input_allocate_device();
         if (!omap_kp || !input_dev) {
                 kfree(omap_kp);
@@ -320,7 +315,9 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
         if (!cpu_is_omap24xx())
                 omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
 
-        keymap = pdata->keymap;
+        input_dev->keycode      = &omap_kp[1];
+        input_dev->keycodesize  = sizeof(unsigned short);
+        input_dev->keycodemax   = keycodemax;
 
         if (pdata->rep)
                 __set_bit(EV_REP, input_dev->evbit);
@@ -374,8 +371,8 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
 
         /* setup input device */
         __set_bit(EV_KEY, input_dev->evbit);
-        for (i = 0; keymap[i] != 0; i++)
-                __set_bit(keymap[i] & KEY_MAX, input_dev->keybit);
+        matrix_keypad_build_keymap(pdata->keymap_data, row_shift,
+                        input_dev->keycode, input_dev->keybit);
         input_dev->name = "omap-keypad";
         input_dev->phys = "omap-keypad/input0";
         input_dev->dev.parent = &pdev->dev;
@@ -416,7 +413,7 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
         return 0;
 err5:
         for (i = irq_idx - 1; i >=0; i--)
-                free_irq(row_gpios[i], 0);
+                free_irq(row_gpios[i], NULL);
 err4:
         input_unregister_device(omap_kp->input);
         input_dev = NULL;
@@ -447,11 +444,11 @@ static int __devexit omap_kp_remove(struct platform_device *pdev)
                         gpio_free(col_gpios[i]);
                 for (i = 0; i < omap_kp->rows; i++) {
                         gpio_free(row_gpios[i]);
-                        free_irq(gpio_to_irq(row_gpios[i]), 0);
+                        free_irq(gpio_to_irq(row_gpios[i]), NULL);
                 }
         } else {
                 omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
-                free_irq(omap_kp->irq, 0);
+                free_irq(omap_kp->irq, NULL);
         }
 
         del_timer_sync(&omap_kp->timer);
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 6256233d2bfb..bcb1fdedb595 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -214,7 +214,6 @@ config SERIO_AMS_DELTA
         tristate "Amstrad Delta (E3) mailboard support"
         depends on MACH_AMS_DELTA
         default y
-        select AMS_DELTA_FIQ
         ---help---
           Say Y here if you have an E3 and want to use its mailboard,
           or any standard AT keyboard connected to the mailboard port.
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 9f322f1a7f22..d0894ca7798b 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -721,6 +721,9 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
         case 3:
                 c->freq = 83;
                 break;
+        case 4:
+                c->freq = 104;
+                break;
         }
 
 #ifdef CONFIG_MTD_PARTITIONS
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 09a550860dcf..ee74c934de89 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -653,13 +653,13 @@ static void serial8250_set_sleep(struct uart_8250_port *p, int sleep)
 {
         if (p->capabilities & UART_CAP_SLEEP) {
                 if (p->capabilities & UART_CAP_EFR) {
-                        serial_outp(p, UART_LCR, 0xBF);
+                        serial_outp(p, UART_LCR, UART_LCR_CONF_MODE_B);
                         serial_outp(p, UART_EFR, UART_EFR_ECB);
                         serial_outp(p, UART_LCR, 0);
                 }
                 serial_outp(p, UART_IER, sleep ? UART_IERX_SLEEP : 0);
                 if (p->capabilities & UART_CAP_EFR) {
-                        serial_outp(p, UART_LCR, 0xBF);
+                        serial_outp(p, UART_LCR, UART_LCR_CONF_MODE_B);
                         serial_outp(p, UART_EFR, 0);
                         serial_outp(p, UART_LCR, 0);
                 }
@@ -752,7 +752,7 @@ static int size_fifo(struct uart_8250_port *up)
         serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO |
                     UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT);
         serial_outp(up, UART_MCR, UART_MCR_LOOP);
-        serial_outp(up, UART_LCR, UART_LCR_DLAB);
+        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_A);
         old_dl = serial_dl_read(up);
         serial_dl_write(up, 0x0001);
         serial_outp(up, UART_LCR, 0x03);
@@ -764,7 +764,7 @@ static int size_fifo(struct uart_8250_port *up)
                 serial_inp(up, UART_RX);
         serial_outp(up, UART_FCR, old_fcr);
         serial_outp(up, UART_MCR, old_mcr);
-        serial_outp(up, UART_LCR, UART_LCR_DLAB);
+        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_A);
         serial_dl_write(up, old_dl);
         serial_outp(up, UART_LCR, old_lcr);
 
@@ -782,7 +782,7 @@ static unsigned int autoconfig_read_divisor_id(struct uart_8250_port *p)
         unsigned int id;
 
         old_lcr = serial_inp(p, UART_LCR);
-        serial_outp(p, UART_LCR, UART_LCR_DLAB);
+        serial_outp(p, UART_LCR, UART_LCR_CONF_MODE_A);
 
         old_dll = serial_inp(p, UART_DLL);
         old_dlm = serial_inp(p, UART_DLM);
@@ -836,7 +836,7 @@ static void autoconfig_has_efr(struct uart_8250_port *up)
          * recommended for new designs).
          */
         up->acr = 0;
-        serial_out(up, UART_LCR, 0xBF);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         serial_out(up, UART_EFR, UART_EFR_ECB);
         serial_out(up, UART_LCR, 0x00);
         id1 = serial_icr_read(up, UART_ID1);
@@ -945,7 +945,7 @@ static void autoconfig_16550a(struct uart_8250_port *up)
          * Check for presence of the EFR when DLAB is set.
          * Only ST16C650V1 UARTs pass this test.
          */
-        serial_outp(up, UART_LCR, UART_LCR_DLAB);
+        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_A);
         if (serial_in(up, UART_EFR) == 0) {
                 serial_outp(up, UART_EFR, 0xA8);
                 if (serial_in(up, UART_EFR) != 0) {
@@ -963,7 +963,7 @@ static void autoconfig_16550a(struct uart_8250_port *up)
          * Maybe it requires 0xbf to be written to the LCR.
          * (other ST16C650V2 UARTs, TI16C752A, etc)
          */
-        serial_outp(up, UART_LCR, 0xBF);
+        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
         if (serial_in(up, UART_EFR) == 0 && !broken_efr(up)) {
                 DEBUG_AUTOCONF("EFRv2 ");
                 autoconfig_has_efr(up);
@@ -1024,7 +1024,7 @@ static void autoconfig_16550a(struct uart_8250_port *up)
         serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
         status1 = serial_in(up, UART_IIR) >> 5;
         serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
-        serial_outp(up, UART_LCR, UART_LCR_DLAB);
+        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_A);
         serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR7_64BYTE);
         status2 = serial_in(up, UART_IIR) >> 5;
         serial_outp(up, UART_FCR, UART_FCR_ENABLE_FIFO);
@@ -1183,7 +1183,7 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
          * We also initialise the EFR (if any) to zero for later.  The
          * EFR occupies the same register location as the FCR and IIR.
          */
-        serial_outp(up, UART_LCR, 0xBF);
+        serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
         serial_outp(up, UART_EFR, 0);
         serial_outp(up, UART_LCR, 0);
 
@@ -1952,7 +1952,7 @@ static int serial8250_startup(struct uart_port *port)
         if (up->port.type == PORT_16C950) {
                 /* Wake up and initialize UART */
                 up->acr = 0;
-                serial_outp(up, UART_LCR, 0xBF);
+                serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
                 serial_outp(up, UART_EFR, UART_EFR_ECB);
                 serial_outp(up, UART_IER, 0);
                 serial_outp(up, UART_LCR, 0);
@@ -2002,7 +2002,7 @@ static int serial8250_startup(struct uart_port *port)
         if (up->port.type == PORT_16850) {
                 unsigned char fctr;
 
-                serial_outp(up, UART_LCR, 0xbf);
+                serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
                 fctr = serial_inp(up, UART_FCTR) & ~(UART_FCTR_RX|UART_FCTR_TX);
                 serial_outp(up, UART_FCTR, fctr | UART_FCTR_TRGD | UART_FCTR_RX);
@@ -2363,7 +2363,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
                 if (termios->c_cflag & CRTSCTS)
                         efr |= UART_EFR_CTS;
 
-                serial_outp(up, UART_LCR, 0xBF);
+                serial_outp(up, UART_LCR, UART_LCR_CONF_MODE_B);
                 serial_outp(up, UART_EFR, efr);
         }
 
diff --git a/drivers/serial/omap-serial.c b/drivers/serial/omap-serial.c
index 14365f72b664..1201eff1831e 100644
--- a/drivers/serial/omap-serial.c
+++ b/drivers/serial/omap-serial.c
@@ -570,7 +570,7 @@ serial_omap_configure_xonxoff
         unsigned char efr = 0;
 
         up->lcr = serial_in(up, UART_LCR);
-        serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         up->efr = serial_in(up, UART_EFR);
         serial_out(up, UART_EFR, up->efr & ~UART_EFR_ECB);
 
@@ -598,7 +598,7 @@ serial_omap_configure_xonxoff
                 efr |= OMAP_UART_SW_RX;
 
         serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
-        serial_out(up, UART_LCR, UART_LCR_DLAB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
 
         up->mcr = serial_in(up, UART_MCR);
 
@@ -612,14 +612,14 @@ serial_omap_configure_xonxoff
                 up->mcr |= UART_MCR_XONANY;
 
         serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
-        serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         serial_out(up, UART_TI752_TCR, OMAP_UART_TCR_TRIG);
         /* Enable special char function UARTi.EFR_REG[5] and
          * load the new software flow control mode IXON or IXOFF
          * and restore the UARTi.EFR_REG[4] ENHANCED_EN value.
          */
         serial_out(up, UART_EFR, efr | UART_EFR_SCD);
-        serial_out(up, UART_LCR, UART_LCR_DLAB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
 
         serial_out(up, UART_MCR, up->mcr & ~UART_MCR_TCRTLR);
         serial_out(up, UART_LCR, up->lcr);
@@ -724,22 +724,22 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
          * baud clock is not running
          * DLL_REG and DLH_REG set to 0.
          */
-        serial_out(up, UART_LCR, UART_LCR_DLAB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
         serial_out(up, UART_DLL, 0);
         serial_out(up, UART_DLM, 0);
         serial_out(up, UART_LCR, 0);
 
-        serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
         up->efr = serial_in(up, UART_EFR);
         serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
 
-        serial_out(up, UART_LCR, UART_LCR_DLAB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
         up->mcr = serial_in(up, UART_MCR);
         serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
         /* FIFO ENABLE, DMA MODE */
         serial_out(up, UART_FCR, up->fcr);
-        serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
         if (up->use_dma) {
                 serial_out(up, UART_TI752_TLR, 0);
@@ -748,52 +748,52 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios,
         }
 
         serial_out(up, UART_EFR, up->efr);
-        serial_out(up, UART_LCR, UART_LCR_DLAB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
         serial_out(up, UART_MCR, up->mcr);
 
         /* Protocol, Baud Rate, and Interrupt Settings */
 
-        serial_out(up, UART_OMAP_MDR1, OMAP_MDR1_DISABLE);
-        serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB);
+        serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_DISABLE);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
         up->efr = serial_in(up, UART_EFR);
         serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
 
         serial_out(up, UART_LCR, 0);
         serial_out(up, UART_IER, 0);
-        serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
         serial_out(up, UART_DLL, quot & 0xff);          /* LS of divisor */
         serial_out(up, UART_DLM, quot >> 8);            /* MS of divisor */
 
         serial_out(up, UART_LCR, 0);
         serial_out(up, UART_IER, up->ier);
-        serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
 
         serial_out(up, UART_EFR, up->efr);
         serial_out(up, UART_LCR, cval);
 
         if (baud > 230400 && baud != 3000000)
-                serial_out(up, UART_OMAP_MDR1, OMAP_MDR1_MODE13X);
+                serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_13X_MODE);
         else
-                serial_out(up, UART_OMAP_MDR1, OMAP_MDR1_MODE16X);
+                serial_out(up, UART_OMAP_MDR1, UART_OMAP_MDR1_16X_MODE);
 
         /* Hardware Flow Control Configuration */
 
         if (termios->c_cflag & CRTSCTS) {
                 efr |= (UART_EFR_CTS | UART_EFR_RTS);
-                serial_out(up, UART_LCR, UART_LCR_DLAB);
+                serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
 
                 up->mcr = serial_in(up, UART_MCR);
                 serial_out(up, UART_MCR, up->mcr | UART_MCR_TCRTLR);
 
-                serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB);
+                serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
                 up->efr = serial_in(up, UART_EFR);
                 serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
 
                 serial_out(up, UART_TI752_TCR, OMAP_UART_TCR_TRIG);
                 serial_out(up, UART_EFR, efr); /* Enable AUTORTS and AUTOCTS */
-                serial_out(up, UART_LCR, UART_LCR_DLAB);
+                serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
                 serial_out(up, UART_MCR, up->mcr | UART_MCR_RTS);
                 serial_out(up, UART_LCR, cval);
         }
@@ -815,13 +815,13 @@ serial_omap_pm(struct uart_port *port, unsigned int state,
         unsigned char efr;
 
         dev_dbg(up->port.dev, "serial_omap_pm+%d\n", up->pdev->id);
-        serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         efr = serial_in(up, UART_EFR);
         serial_out(up, UART_EFR, efr | UART_EFR_ECB);
         serial_out(up, UART_LCR, 0);
 
         serial_out(up, UART_IER, (state != 0) ? UART_IERX_SLEEP : 0);
-        serial_out(up, UART_LCR, OMAP_UART_LCR_CONF_MDB);
+        serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
         serial_out(up, UART_EFR, efr);
         serial_out(up, UART_LCR, 0);
         /* Enable module level wake up */
diff --git a/drivers/staging/tidspbridge/core/_tiomap.h b/drivers/staging/tidspbridge/core/_tiomap.h
index 1c1f157e167a..1159a500f49d 100644
--- a/drivers/staging/tidspbridge/core/_tiomap.h
+++ b/drivers/staging/tidspbridge/core/_tiomap.h
@@ -19,8 +19,19 @@
 #ifndef _TIOMAP_
 #define _TIOMAP_
 
-#include <plat/powerdomain.h>
-#include <plat/clockdomain.h>
+/*
+ * XXX These powerdomain.h/clockdomain.h includes are wrong and should
+ * be removed.  No driver should call pwrdm_* or clkdm_* functions
+ * directly; they should rely on OMAP core code to do this.
+ */
+#include <mach-omap2/powerdomain.h>
+#include <mach-omap2/clockdomain.h>
+/*
+ * XXX These mach-omap2/ includes are wrong and should be removed.  No
+ * driver should read or write to PRM/CM registers directly; they
+ * should rely on OMAP core code to do this.
+ */
+#include <mach-omap2/cm2xxx_3xxx.h>
 #include <mach-omap2/prm-regbits-34xx.h>
 #include <mach-omap2/cm-regbits-34xx.h>
 #include <dspbridge/devdefs.h>