23 files changed, 192 insertions, 389 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
index 146f3570af8..20f17908b03 100644
--- a/drivers/gpu/drm/radeon/r600_cp.c
+++ b/drivers/gpu/drm/radeon/r600_cp.c
@@ -384,8 +384,9 @@ static void r600_cp_load_microcode(drm_radeon_private_t *dev_priv)
                DRM_INFO("Loading RV670 PFP Microcode\n");
                for (i = 0; i < PFP_UCODE_SIZE; i++)
                        RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RV670_pfp_microcode[i]);
-        } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780)) {
+        } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
-                DRM_INFO("Loading RS780 CP Microcode\n");
+                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880)) {
+                DRM_INFO("Loading RS780/RS880 CP Microcode\n");
                for (i = 0; i < PM4_UCODE_SIZE; i++) {
                        RADEON_WRITE(R600_CP_ME_RAM_DATA,
                                     RS780_cp_microcode[i][0]);
@@ -396,7 +397,7 @@ static void r600_cp_load_microcode(drm_radeon_private_t *dev_priv)
                }
                RADEON_WRITE(R600_CP_PFP_UCODE_ADDR, 0);
-                DRM_INFO("Loading RS780 PFP Microcode\n");
+                DRM_INFO("Loading RS780/RS880 PFP Microcode\n");
                for (i = 0; i < PFP_UCODE_SIZE; i++)
                        RADEON_WRITE(R600_CP_PFP_UCODE_DATA, RS780_pfp_microcode[i]);
        }
@@ -783,6 +784,7 @@ static void r600_gfx_init(struct drm_device *dev,
                break;
        case CHIP_RV610:
        case CHIP_RS780:
+        case CHIP_RS880:
        case CHIP_RV620:
                dev_priv->r600_max_pipes = 1;
                dev_priv->r600_max_tile_pipes = 1;
@@ -917,7 +919,8 @@ static void r600_gfx_init(struct drm_device *dev,
            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV630) ||
            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780))
+            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880))
                RADEON_WRITE(R600_DB_DEBUG, R600_PREZ_MUST_WAIT_FOR_POSTZ_DONE);
        else
                RADEON_WRITE(R600_DB_DEBUG, 0);
@@ -935,7 +938,8 @@ static void r600_gfx_init(struct drm_device *dev,
        sq_ms_fifo_sizes = RADEON_READ(R600_SQ_MS_FIFO_SIZES);
        if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780)) {
+            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880)) {
                sq_ms_fifo_sizes = (R600_CACHE_FIFO_SIZE(0xa) |
                                    R600_FETCH_FIFO_HIWATER(0xa) |
                                    R600_DONE_FIFO_HIWATER(0xe0) |
@@ -978,7 +982,8 @@ static void r600_gfx_init(struct drm_device *dev,
                                            R600_NUM_ES_STACK_ENTRIES(0));
        } else if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780)) {
+                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+                   ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880)) {
                /* no vertex cache */
                sq_config &= ~R600_VC_ENABLE;
@@ -1035,7 +1040,8 @@ static void r600_gfx_init(struct drm_device *dev,
        if (((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV610) ||
            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RV620) ||
-            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780))
+            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS780) ||
+            ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS880))
                RADEON_WRITE(R600_VGT_CACHE_INVALIDATION, R600_CACHE_INVALIDATION(R600_TC_ONLY));
        else
                RADEON_WRITE(R600_VGT_CACHE_INVALIDATION, R600_CACHE_INVALIDATION(R600_VC_AND_TC));
@@ -1078,6 +1084,7 @@ static void r600_gfx_init(struct drm_device *dev,
                break;
        case CHIP_RV610:
        case CHIP_RS780:
+        case CHIP_RS880:
        case CHIP_RV620:
                gs_prim_buffer_depth = 32;
                break;
@@ -1123,6 +1130,7 @@ static void r600_gfx_init(struct drm_device *dev,
        switch (dev_priv->flags & RADEON_FAMILY_MASK) {
        case CHIP_RV610:
        case CHIP_RS780:
+        case CHIP_RS880:
        case CHIP_RV620:
                tc_cntl = R600_TC_L2_SIZE(8);
                break;
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index a162ade74b7..9ff6dcb97f9 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -152,7 +152,9 @@ int radeon_mc_setup(struct radeon_device *rdev)
                }
        } else {
                rdev->mc.vram_location = 0;
-                rdev->mc.gtt_location = rdev->mc.mc_vram_size;
+                tmp = rdev->mc.mc_vram_size;
+                tmp = (tmp + rdev->mc.gtt_size - 1) & ~(rdev->mc.gtt_size - 1);
+                rdev->mc.gtt_location = tmp;
        }
        DRM_INFO("radeon: VRAM %uM\n", rdev->mc.real_vram_size >> 20);
        DRM_INFO("radeon: VRAM from 0x%08X to 0x%08X\n",
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 127d0456f62..3933f8216a3 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -143,6 +143,7 @@ enum radeon_family {
        CHIP_RV635,
        CHIP_RV670,
        CHIP_RS780,
+        CHIP_RS880,
        CHIP_RV770,
        CHIP_RV730,
        CHIP_RV710,
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c
index dd9ac2fed6d..e98cae3bf4a 100644
--- a/drivers/gpu/drm/radeon/radeon_object.c
+++ b/drivers/gpu/drm/radeon/radeon_object.c
@@ -106,7 +106,7 @@ static inline uint32_t radeon_object_flags_from_domain(uint32_t domain)
                flags |= TTM_PL_FLAG_VRAM | TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
        }
        if (domain & RADEON_GEM_DOMAIN_GTT) {
-                flags |= TTM_PL_FLAG_TT | TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED;
+                flags |= TTM_PL_FLAG_TT | TTM_PL_MASK_CACHING;
        }
        if (domain & RADEON_GEM_DOMAIN_CPU) {
                flags |= TTM_PL_FLAG_SYSTEM | TTM_PL_MASK_CACHING;
diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c
index e9b2e7cb05b..541b981ff07 100644
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
@@ -27,6 +27,7 @@ struct matrix_keypad {
        const struct matrix_keypad_platform_data *pdata;
        struct input_dev *input_dev;
        unsigned short *keycodes;
+        unsigned int row_shift;
        uint32_t last_key_state[MATRIX_MAX_COLS];
        struct delayed_work work;
@@ -136,7 +137,7 @@ static void matrix_keypad_scan(struct work_struct *work)
                        if ((bits_changed & (1 << row)) == 0)
                                continue;
-                        code = (row << 4) + col;
+                        code = MATRIX_SCAN_CODE(row, col, keypad->row_shift);
                        input_event(input_dev, EV_MSC, MSC_SCAN, code);
                        input_report_key(input_dev,
                                         keypad->keycodes[code],
@@ -317,6 +318,7 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev)
        struct matrix_keypad *keypad;
        struct input_dev *input_dev;
        unsigned short *keycodes;
+        unsigned int row_shift;
        int i;
        int err;
@@ -332,14 +334,11 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev)
                return -EINVAL;
        }
-        if (!keymap_data->max_keymap_size) {
+        row_shift = get_count_order(pdata->num_col_gpios);
-                dev_err(&pdev->dev, "invalid keymap data supplied\n");
-                return -EINVAL;
-        }
        keypad = kzalloc(sizeof(struct matrix_keypad), GFP_KERNEL);
-        keycodes = kzalloc(keymap_data->max_keymap_size *
+        keycodes = kzalloc((pdata->num_row_gpios << row_shift) *
-                                sizeof(keypad->keycodes),
+                                sizeof(*keycodes),
                           GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!keypad || !keycodes || !input_dev) {
@@ -350,6 +349,7 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev)
        keypad->input_dev = input_dev;
        keypad->pdata = pdata;
        keypad->keycodes = keycodes;
+        keypad->row_shift = row_shift;
        keypad->stopped = true;
        INIT_DELAYED_WORK(&keypad->work, matrix_keypad_scan);
        spin_lock_init(&keypad->lock);
@@ -363,7 +363,7 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev)
        input_dev->keycode      = keycodes;
        input_dev->keycodesize  = sizeof(*keycodes);
-        input_dev->keycodemax   = keymap_data->max_keymap_size;
+        input_dev->keycodemax   = pdata->num_row_gpios << keypad->row_shift;
        for (i = 0; i < keymap_data->keymap_size; i++) {
                unsigned int key = keymap_data->keymap[i];
@@ -371,7 +371,7 @@ static int __devinit matrix_keypad_probe(struct platform_device *pdev)
                unsigned int col = KEY_COL(key);
                unsigned short code = KEY_VAL(key);
-                keycodes[(row << 4) + col] = code;
+                keycodes[MATRIX_SCAN_CODE(row, col, row_shift)] = code;
                __set_bit(code, input_dev->keybit);
        }
        __clear_bit(KEY_RESERVED, input_dev->keybit);
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index 26e17a9a22e..27ee976eb54 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -611,6 +611,20 @@ static struct key_entry keymap_wistron_generic[] __initdata = {
        { KE_END, 0 }
 };
+static struct key_entry keymap_prestigio[] __initdata = {
+        { KE_KEY,  0x11, {KEY_PROG1} },
+        { KE_KEY,  0x12, {KEY_PROG2} },
+        { KE_WIFI,  0x30 },
+        { KE_KEY,  0x22, {KEY_REWIND} },
+        { KE_KEY,  0x23, {KEY_FORWARD} },
+        { KE_KEY,  0x24, {KEY_PLAYPAUSE} },
+        { KE_KEY,  0x25, {KEY_STOPCD} },
+        { KE_KEY,  0x31, {KEY_MAIL} },
+        { KE_KEY,  0x36, {KEY_WWW} },
+        { KE_END,  0 }
+};
 /*
 * If your machine is not here (which is currently rather likely), please send
 * a list of buttons and their key codes (reported when loading this module
@@ -971,6 +985,8 @@ static int __init select_keymap(void)
        if (keymap_name != NULL) {
                if (strcmp (keymap_name, "1557/MS2141") == 0)
                        keymap = keymap_wistron_ms2141;
+                else if (strcmp (keymap_name, "prestigio") == 0)
+                        keymap = keymap_prestigio;
                else if (strcmp (keymap_name, "generic") == 0)
                        keymap = keymap_wistron_generic;
                else {
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 924e8ed7f2c..ae04d8a494e 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -78,6 +78,14 @@ static struct dmi_system_id __initdata i8042_dmi_noloop_table[] = {
                },
        },
        {
+                .ident = "ASUS G1S",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer Inc."),
+                        DMI_MATCH(DMI_BOARD_NAME, "G1S"),
+                        DMI_MATCH(DMI_BOARD_VERSION, "1.0"),
+                },
+        },
+        {
                /* AUX LOOP command does not raise AUX IRQ */
                .ident = "ASUS P65UP5",
                .matches = {
diff --git a/drivers/mmc/host/sdhci-of.c b/drivers/mmc/host/sdhci-of.c
index 908844327db..1e8aa590bb3 100644
--- a/drivers/mmc/host/sdhci-of.c
+++ b/drivers/mmc/host/sdhci-of.c
@@ -234,7 +234,7 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev,
                return -ENODEV;
        host = sdhci_alloc_host(&ofdev->dev, sizeof(*of_host));
-        if (!host)
+        if (IS_ERR(host))
                return -ENOMEM;
        of_host = sdhci_priv(host);
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 0b98654d8ee..7a58bd5522f 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -284,13 +284,6 @@ config MTD_L440GX
          BE VERY CAREFUL.
-config MTD_SBC8240
-        tristate "Flash device on SBC8240"
-        depends on MTD_JEDECPROBE && 8260
-        help
-          Flash access on the SBC8240 board from Wind River.  See
-          <http://www.windriver.com/products/sbc8240/>
 config MTD_TQM8XXL
        tristate "CFI Flash device mapped on TQM8XXL"
        depends on MTD_CFI && TQM8xxL
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 8bae7f9850c..5beb0662d72 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -50,7 +50,6 @@ obj-$(CONFIG_MTD_UCLINUX)	+= uclinux.o
 obj-$(CONFIG_MTD_NETtel)        += nettel.o
 obj-$(CONFIG_MTD_SCB2_FLASH)    += scb2_flash.o
 obj-$(CONFIG_MTD_H720X)         += h720x-flash.o
-obj-$(CONFIG_MTD_SBC8240)       += sbc8240.o
 obj-$(CONFIG_MTD_IXP4XX)        += ixp4xx.o
 obj-$(CONFIG_MTD_IXP2000)       += ixp2000.o
 obj-$(CONFIG_MTD_WRSBC8260)     += wr_sbc82xx_flash.o
diff --git a/drivers/mtd/maps/sbc8240.c b/drivers/mtd/maps/sbc8240.c
index d5374cdcb16..e69de29bb2d 100644
--- a/drivers/mtd/maps/sbc8240.c
+++ b/drivers/mtd/maps/sbc8240.c
@@ -1,250 +0,0 @@
-/*
- * Handle mapping of the flash memory access routines on the SBC8240 board.
- *
- * Carolyn Smith, Tektronix, Inc.
- *
- * This code is GPLed
- */
-/*
- * The SBC8240 has 2 flash banks.
- * Bank 0 is a 512 KiB AMD AM29F040B; 8 x 64 KiB sectors.
- * It contains the U-Boot code (7 sectors) and the environment (1 sector).
- * Bank 1 is 4 x 1 MiB AMD AM29LV800BT; 15 x 64 KiB sectors, 1 x 32 KiB sector,
- * 2 x 8 KiB sectors, 1 x 16 KiB sectors.
- * Both parts are JEDEC compatible.
- */
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <asm/io.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/cfi.h>
-#ifdef CONFIG_MTD_PARTITIONS
-#include <linux/mtd/partitions.h>
-#endif
-#define DEBUG
-#ifdef  DEBUG
-# define debugk(fmt,args...)    printk(fmt ,##args)
-#else
-# define debugk(fmt,args...)
-#endif
-#define WINDOW_ADDR0    0xFFF00000              /* 512 KiB */
-#define WINDOW_SIZE0    0x00080000
-#define BUSWIDTH0       1
-#define WINDOW_ADDR1    0xFF000000              /* 4 MiB */
-#define WINDOW_SIZE1    0x00400000
-#define BUSWIDTH1       8
-#define MSG_PREFIX "sbc8240:"   /* prefix for our printk()'s */
-#define MTDID      "sbc8240-%d" /* for mtdparts= partitioning */
-static struct map_info sbc8240_map[2] = {
-        {
-                .name           = "sbc8240 Flash Bank #0",
-                .size           = WINDOW_SIZE0,
-                .bankwidth       = BUSWIDTH0,
-        },
-        {
-                .name           = "sbc8240 Flash Bank #1",
-                .size           = WINDOW_SIZE1,
-                .bankwidth       = BUSWIDTH1,
-        }
-};
-#define NUM_FLASH_BANKS ARRAY_SIZE(sbc8240_map)
-/*
- * The following defines the partition layout of SBC8240 boards.
- *
- * See include/linux/mtd/partitions.h for definition of the
- * mtd_partition structure.
- *
- * The *_max_flash_size is the maximum possible mapped flash size
- * which is not necessarily the actual flash size. It must correspond
- * to the value specified in the mapping definition defined by the
- * "struct map_desc *_io_desc" for the corresponding machine.
- */
-#ifdef CONFIG_MTD_PARTITIONS
-static struct mtd_partition sbc8240_uboot_partitions [] = {
-        /* Bank 0 */
-        {
-                .name = "U-boot",                       /* U-Boot Firmware      */
-                .offset =       0,
-                .size = 0x00070000,                     /*  7 x 64 KiB sectors  */
-                .mask_flags = MTD_WRITEABLE,            /*  force read-only     */
-        },
-        {
-                .name = "environment",                  /* U-Boot environment   */
-                .offset =       0x00070000,
-                .size = 0x00010000,                     /*  1 x 64 KiB sector   */
-        },
-};
-static struct mtd_partition sbc8240_fs_partitions [] = {
-        {
-                .name = "jffs",                         /* JFFS  filesystem     */
-                .offset =       0,
-                .size = 0x003C0000,                     /*  4 * 15 * 64KiB      */
-        },
-        {
-                .name = "tmp32",
-                .offset =       0x003C0000,
-                .size = 0x00020000,                     /*  4 * 32KiB           */
-        },
-        {
-                .name = "tmp8a",
-                .offset =       0x003E0000,
-                .size = 0x00008000,                     /*  4 * 8KiB            */
-        },
-        {
-                .name = "tmp8b",
-                .offset =       0x003E8000,
-                .size = 0x00008000,                     /*  4 * 8KiB            */
-        },
-        {
-                .name = "tmp16",
-                .offset =       0x003F0000,
-                .size = 0x00010000,                     /*  4 * 16KiB           */
-        }
-};
-/* trivial struct to describe partition information */
-struct mtd_part_def
-{
-        int nums;
-        unsigned char *type;
-        struct mtd_partition* mtd_part;
-};
-static struct mtd_info *sbc8240_mtd[NUM_FLASH_BANKS];
-static struct mtd_part_def sbc8240_part_banks[NUM_FLASH_BANKS];
-#endif  /* CONFIG_MTD_PARTITIONS */
-static int __init init_sbc8240_mtd (void)
-{
-        static struct _cjs {
-                u_long addr;
-                u_long size;
-        } pt[NUM_FLASH_BANKS] = {
-                {
-                        .addr = WINDOW_ADDR0,
-                        .size = WINDOW_SIZE0
-                },
-                {
-                        .addr = WINDOW_ADDR1,
-                        .size = WINDOW_SIZE1
-                },
-        };
-        int devicesfound = 0;
-        int i,j;
-        for (i = 0; i < NUM_FLASH_BANKS; i++) {
-                printk (KERN_NOTICE MSG_PREFIX
-                        "Probing 0x%08lx at 0x%08lx\n", pt[i].size, pt[i].addr);
-                sbc8240_map[i].map_priv_1 =
-                        (unsigned long) ioremap (pt[i].addr, pt[i].size);
-                if (!sbc8240_map[i].map_priv_1) {
-                        printk (MSG_PREFIX "failed to ioremap\n");
-                        for (j = 0; j < i; j++) {
-                                iounmap((void *) sbc8240_map[j].map_priv_1);
-                                sbc8240_map[j].map_priv_1 = 0;
-                        }
-                        return -EIO;
-                }
-                simple_map_init(&sbc8240_mtd[i]);
-                sbc8240_mtd[i] = do_map_probe("jedec_probe", &sbc8240_map[i]);
-                if (sbc8240_mtd[i]) {
-                        sbc8240_mtd[i]->module = THIS_MODULE;
-                        devicesfound++;
-                } else {
-                        if (sbc8240_map[i].map_priv_1) {
-                                iounmap((void *) sbc8240_map[i].map_priv_1);
-                                sbc8240_map[i].map_priv_1 = 0;
-                        }
-                }
-        }
-        if (!devicesfound) {
-                printk(KERN_NOTICE MSG_PREFIX
-                       "No suppported flash chips found!\n");
-                return -ENXIO;
-        }
-#ifdef CONFIG_MTD_PARTITIONS
-        sbc8240_part_banks[0].mtd_part   = sbc8240_uboot_partitions;
-        sbc8240_part_banks[0].type       = "static image";
-        sbc8240_part_banks[0].nums       = ARRAY_SIZE(sbc8240_uboot_partitions);
-        sbc8240_part_banks[1].mtd_part   = sbc8240_fs_partitions;
-        sbc8240_part_banks[1].type       = "static file system";
-        sbc8240_part_banks[1].nums       = ARRAY_SIZE(sbc8240_fs_partitions);
-        for (i = 0; i < NUM_FLASH_BANKS; i++) {
-                if (!sbc8240_mtd[i]) continue;
-                if (sbc8240_part_banks[i].nums == 0) {
-                        printk (KERN_NOTICE MSG_PREFIX
-                                "No partition info available, registering whole device\n");
-                        add_mtd_device(sbc8240_mtd[i]);
-                } else {
-                        printk (KERN_NOTICE MSG_PREFIX
-                                "Using %s partition definition\n", sbc8240_part_banks[i].mtd_part->name);
-                        add_mtd_partitions (sbc8240_mtd[i],
-                                            sbc8240_part_banks[i].mtd_part,
-                                            sbc8240_part_banks[i].nums);
-                }
-        }
-#else
-        printk(KERN_NOTICE MSG_PREFIX
-               "Registering %d flash banks at once\n", devicesfound);
-        for (i = 0; i < devicesfound; i++) {
-                add_mtd_device(sbc8240_mtd[i]);
-        }
-#endif  /* CONFIG_MTD_PARTITIONS */
-        return devicesfound == 0 ? -ENXIO : 0;
-}
-static void __exit cleanup_sbc8240_mtd (void)
-{
-        int i;
-        for (i = 0; i < NUM_FLASH_BANKS; i++) {
-                if (sbc8240_mtd[i]) {
-                        del_mtd_device (sbc8240_mtd[i]);
-                        map_destroy (sbc8240_mtd[i]);
-                }
-                if (sbc8240_map[i].map_priv_1) {
-                        iounmap ((void *) sbc8240_map[i].map_priv_1);
-                        sbc8240_map[i].map_priv_1 = 0;
-                }
-        }
-}
-module_init (init_sbc8240_mtd);
-module_exit (cleanup_sbc8240_mtd);
-MODULE_LICENSE ("GPL");
-MODULE_AUTHOR ("Carolyn Smith <carolyn.smith@tektronix.com>");
-MODULE_DESCRIPTION ("MTD map driver for SBC8240 boards");
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index c3f62654b6d..7baba40c1ed 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -144,7 +144,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode)
        struct mtd_blktrans_ops *tr = dev->tr;
        int ret = -ENODEV;
-        if (!try_module_get(dev->mtd->owner))
+        if (!get_mtd_device(NULL, dev->mtd->index))
                goto out;
        if (!try_module_get(tr->owner))
@@ -158,7 +158,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode)
        ret = 0;
        if (tr->open && (ret = tr->open(dev))) {
                dev->mtd->usecount--;
-                module_put(dev->mtd->owner);
+                put_mtd_device(dev->mtd);
        out_tr:
                module_put(tr->owner);
        }
@@ -177,7 +177,7 @@ static int blktrans_release(struct gendisk *disk, fmode_t mode)
        if (!ret) {
                dev->mtd->usecount--;
-                module_put(dev->mtd->owner);
+                put_mtd_device(dev->mtd);
                module_put(tr->owner);
        }
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index 208c6faa035..77db5ce24d9 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -29,6 +29,8 @@ static struct mtdblk_dev {
        enum { STATE_EMPTY, STATE_CLEAN, STATE_DIRTY } cache_state;
 } *mtdblks[MAX_MTD_DEVICES];
+static struct mutex mtdblks_lock;
 /*
 * Cache stuff...
 *
@@ -270,15 +272,19 @@ static int mtdblock_open(struct mtd_blktrans_dev *mbd)
        DEBUG(MTD_DEBUG_LEVEL1,"mtdblock_open\n");
+        mutex_lock(&mtdblks_lock);
        if (mtdblks[dev]) {
                mtdblks[dev]->count++;
+                mutex_unlock(&mtdblks_lock);
                return 0;
        }
        /* OK, it's not open. Create cache info for it */
        mtdblk = kzalloc(sizeof(struct mtdblk_dev), GFP_KERNEL);
-        if (!mtdblk)
+        if (!mtdblk) {
+                mutex_unlock(&mtdblks_lock);
                return -ENOMEM;
+        }
        mtdblk->count = 1;
        mtdblk->mtd = mtd;
@@ -291,6 +297,7 @@ static int mtdblock_open(struct mtd_blktrans_dev *mbd)
        }
        mtdblks[dev] = mtdblk;
+        mutex_unlock(&mtdblks_lock);
        DEBUG(MTD_DEBUG_LEVEL1, "ok\n");
@@ -304,6 +311,8 @@ static int mtdblock_release(struct mtd_blktrans_dev *mbd)
        DEBUG(MTD_DEBUG_LEVEL1, "mtdblock_release\n");
+        mutex_lock(&mtdblks_lock);
        mutex_lock(&mtdblk->cache_mutex);
        write_cached_data(mtdblk);
        mutex_unlock(&mtdblk->cache_mutex);
@@ -316,6 +325,9 @@ static int mtdblock_release(struct mtd_blktrans_dev *mbd)
                vfree(mtdblk->cache_data);
                kfree(mtdblk);
        }
+        mutex_unlock(&mtdblks_lock);
        DEBUG(MTD_DEBUG_LEVEL1, "ok\n");
        return 0;
@@ -376,6 +388,8 @@ static struct mtd_blktrans_ops mtdblock_tr = {
 static int __init init_mtdblock(void)
 {
+        mutex_init(&mtdblks_lock);
        return register_mtd_blktrans(&mtdblock_tr);
 }
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index fac54a3fa3f..00ebf7af746 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -65,8 +65,8 @@ static void mtd_release(struct device *dev)
 static int mtd_cls_suspend(struct device *dev, pm_message_t state)
 {
        struct mtd_info *mtd = dev_to_mtd(dev);
-        
-        if (mtd->suspend)
+        if (mtd && mtd->suspend)
                return mtd->suspend(mtd);
        else
                return 0;
@@ -76,7 +76,7 @@ static int mtd_cls_resume(struct device *dev)
 {
        struct mtd_info *mtd = dev_to_mtd(dev);
        
-        if (mtd->resume)
+        if (mtd && mtd->resume)
                mtd->resume(mtd);
        return 0;
 }
@@ -298,6 +298,7 @@ int add_mtd_device(struct mtd_info *mtd)
                        mtd->dev.class = &mtd_class;
                        mtd->dev.devt = MTD_DEVT(i);
                        dev_set_name(&mtd->dev, "mtd%d", i);
+                        dev_set_drvdata(&mtd->dev, mtd);
                        if (device_register(&mtd->dev) != 0) {
                                mtd_table[i] = NULL;
                                break;
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 38d656b9b2e..0108ed42e87 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -266,7 +266,7 @@ static inline int omap2_onenand_bufferram_offset(struct mtd_info *mtd, int area)
        if (ONENAND_CURRENT_BUFFERRAM(this)) {
                if (area == ONENAND_DATARAM)
-                        return mtd->writesize;
+                        return this->writesize;
                if (area == ONENAND_SPARERAM)
                        return mtd->oobsize;
        }
@@ -770,6 +770,7 @@ static int __devexit omap2_onenand_remove(struct platform_device *pdev)
        }
        iounmap(c->onenand.base);
        release_mem_region(c->phys_base, ONENAND_IO_SIZE);
+        gpmc_cs_free(c->gpmc_cs);
        kfree(c);
        return 0;
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 471a9a60376..3a44695b9c0 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -1082,7 +1082,6 @@ static void fbcon_init(struct vc_data *vc, int init)
        new_rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
        new_cols /= vc->vc_font.width;
        new_rows /= vc->vc_font.height;
-        vc_resize(vc, new_cols, new_rows);
        /*
         * We must always set the mode. The mode of the previous console
@@ -1111,10 +1110,11 @@ static void fbcon_init(struct vc_data *vc, int init)
         *  vc_{cols,rows}, but we must not set those if we are only
         *  resizing the console.
         */
-        if (!init) {
+        if (init) {
                vc->vc_cols = new_cols;
                vc->vc_rows = new_rows;
-        }
+        } else
+                vc_resize(vc, new_cols, new_rows);
        if (logo)
                fbcon_prepare_logo(vc, info, cols, rows, new_cols, new_rows);
diff --git a/drivers/video/console/fbcon_rotate.h b/drivers/video/console/fbcon_rotate.h
index 75be5ce53dc..e233444cda6 100644
--- a/drivers/video/console/fbcon_rotate.h
+++ b/drivers/video/console/fbcon_rotate.h
@@ -45,7 +45,7 @@ static inline void rotate_ud(const char *in, char *out, u32 width, u32 height)
        width = (width + 7) & ~7;
        for (i = 0; i < height; i++) {
-                for (j = 0; j < width; j++) {
+                for (j = 0; j < width - shift; j++) {
                        if (pattern_test_bit(j, i, width, in))
                                pattern_set_bit(width - (1 + j + shift),
                                                height - (1 + i),
diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c
index f8778cde218..054ef29be47 100644
--- a/drivers/video/mx3fb.c
+++ b/drivers/video/mx3fb.c
@@ -669,7 +669,8 @@ static uint32_t bpp_to_pixfmt(int bpp)
 }
 static int mx3fb_blank(int blank, struct fb_info *fbi);
-static int mx3fb_map_video_memory(struct fb_info *fbi, unsigned int mem_len);
+static int mx3fb_map_video_memory(struct fb_info *fbi, unsigned int mem_len,
+                                  bool lock);
 static int mx3fb_unmap_video_memory(struct fb_info *fbi);
 /**
@@ -711,12 +712,7 @@ static void mx3fb_dma_done(void *arg)
        complete(&mx3_fbi->flip_cmpl);
 }
-/**
+static int __set_par(struct fb_info *fbi, bool lock)
- * mx3fb_set_par() - set framebuffer parameters and change the operating mode.
- * @fbi:        framebuffer information pointer.
- * @return:     0 on success or negative error code on failure.
- */
-static int mx3fb_set_par(struct fb_info *fbi)
 {
        u32 mem_len;
        struct ipu_di_signal_cfg sig_cfg;
@@ -727,10 +723,6 @@ static int mx3fb_set_par(struct fb_info *fbi)
        struct idmac_video_param *video = &ichan->params.video;
        struct scatterlist *sg = mx3_fbi->sg;
-        dev_dbg(mx3fb->dev, "%s [%c]\n", __func__, list_empty(&ichan->queue) ? '-' : '+');
-        mutex_lock(&mx3_fbi->mutex);
        /* Total cleanup */
        if (mx3_fbi->txd)
                sdc_disable_channel(mx3_fbi);
@@ -742,10 +734,8 @@ static int mx3fb_set_par(struct fb_info *fbi)
                if (fbi->fix.smem_start)
                        mx3fb_unmap_video_memory(fbi);
-                if (mx3fb_map_video_memory(fbi, mem_len) < 0) {
+                if (mx3fb_map_video_memory(fbi, mem_len, lock) < 0)
-                        mutex_unlock(&mx3_fbi->mutex);
                        return -ENOMEM;
-                }
        }
        sg_init_table(&sg[0], 1);
@@ -791,7 +781,6 @@ static int mx3fb_set_par(struct fb_info *fbi)
                                   fbi->var.vsync_len,
                                   fbi->var.lower_margin +
                                   fbi->var.vsync_len, sig_cfg) != 0) {
-                        mutex_unlock(&mx3_fbi->mutex);
                        dev_err(fbi->device,
                                "mx3fb: Error initializing panel.\n");
                        return -EINVAL;
@@ -810,9 +799,30 @@ static int mx3fb_set_par(struct fb_info *fbi)
        if (mx3_fbi->blank == FB_BLANK_UNBLANK)
                sdc_enable_channel(mx3_fbi);
+        return 0;
+}
+/**
+ * mx3fb_set_par() - set framebuffer parameters and change the operating mode.
+ * @fbi:        framebuffer information pointer.
+ * @return:     0 on success or negative error code on failure.
+ */
+static int mx3fb_set_par(struct fb_info *fbi)
+{
+        struct mx3fb_info *mx3_fbi = fbi->par;
+        struct mx3fb_data *mx3fb = mx3_fbi->mx3fb;
+        struct idmac_channel *ichan = mx3_fbi->idmac_channel;
+        int ret;
+        dev_dbg(mx3fb->dev, "%s [%c]\n", __func__, list_empty(&ichan->queue) ? '-' : '+');
+        mutex_lock(&mx3_fbi->mutex);
+        ret = __set_par(fbi, true);
        mutex_unlock(&mx3_fbi->mutex);
-        return 0;
+        return ret;
 }
 /**
@@ -966,21 +976,11 @@ static int mx3fb_setcolreg(unsigned int regno, unsigned int red,
        return ret;
 }
-/**
+static void __blank(int blank, struct fb_info *fbi)
- * mx3fb_blank() - blank the display.
- */
-static int mx3fb_blank(int blank, struct fb_info *fbi)
 {
        struct mx3fb_info *mx3_fbi = fbi->par;
        struct mx3fb_data *mx3fb = mx3_fbi->mx3fb;
-        dev_dbg(fbi->device, "%s, blank = %d, base %p, len %u\n", __func__,
-                blank, fbi->screen_base, fbi->fix.smem_len);
-        if (mx3_fbi->blank == blank)
-                return 0;
-        mutex_lock(&mx3_fbi->mutex);
        mx3_fbi->blank = blank;
        switch (blank) {
@@ -999,6 +999,23 @@ static int mx3fb_blank(int blank, struct fb_info *fbi)
                sdc_set_brightness(mx3fb, mx3fb->backlight_level);
                break;
        }
+}
+/**
+ * mx3fb_blank() - blank the display.
+ */
+static int mx3fb_blank(int blank, struct fb_info *fbi)
+{
+        struct mx3fb_info *mx3_fbi = fbi->par;
+        dev_dbg(fbi->device, "%s, blank = %d, base %p, len %u\n", __func__,
+                blank, fbi->screen_base, fbi->fix.smem_len);
+        if (mx3_fbi->blank == blank)
+                return 0;
+        mutex_lock(&mx3_fbi->mutex);
+        __blank(blank, fbi);
        mutex_unlock(&mx3_fbi->mutex);
        return 0;
@@ -1198,6 +1215,7 @@ static int mx3fb_resume(struct platform_device *pdev)
 * mx3fb_map_video_memory() - allocates the DRAM memory for the frame buffer.
 * @fbi:        framebuffer information pointer
 * @mem_len:    length of mapped memory
+ * @lock:       do not lock during initialisation
 * @return:     Error code indicating success or failure
 *
 * This buffer is remapped into a non-cached, non-buffered, memory region to
@@ -1205,7 +1223,8 @@ static int mx3fb_resume(struct platform_device *pdev)
 * area is remapped, all virtual memory access to the video memory should occur
 * at the new region.
 */
-static int mx3fb_map_video_memory(struct fb_info *fbi, unsigned int mem_len)
+static int mx3fb_map_video_memory(struct fb_info *fbi, unsigned int mem_len,
+                                  bool lock)
 {
        int retval = 0;
        dma_addr_t addr;
@@ -1221,10 +1240,12 @@ static int mx3fb_map_video_memory(struct fb_info *fbi, unsigned int mem_len)
                goto err0;
        }
-        mutex_lock(&fbi->mm_lock);
+        if (lock)
+                mutex_lock(&fbi->mm_lock);
        fbi->fix.smem_start = addr;
        fbi->fix.smem_len = mem_len;
-        mutex_unlock(&fbi->mm_lock);
+        if (lock)
+                mutex_unlock(&fbi->mm_lock);
        dev_dbg(fbi->device, "allocated fb @ p=0x%08x, v=0x%p, size=%d.\n",
                (uint32_t) fbi->fix.smem_start, fbi->screen_base, fbi->fix.smem_len);
@@ -1365,6 +1386,11 @@ static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan)
        init_completion(&mx3fbi->flip_cmpl);
        disable_irq(ichan->eof_irq);
        dev_dbg(mx3fb->dev, "disabling irq %d\n", ichan->eof_irq);
+        ret = __set_par(fbi, false);
+        if (ret < 0)
+                goto esetpar;
+        __blank(FB_BLANK_UNBLANK, fbi);
        dev_info(dev, "registered, using mode %s\n", fb_mode);
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
index fcd53ceb88f..c8960003f47 100644
--- a/drivers/video/via/hw.c
+++ b/drivers/video/via/hw.c
@@ -2407,14 +2407,14 @@ int viafb_setmode(int vmode_index, int hor_res, int ver_res, int video_bpp,
                        viafb_dvi_set_mode(viafb_get_mode_index
                                     (viaparinfo->tmds_setting_info->h_active,
                                      viaparinfo->tmds_setting_info->
-                                      v_active, 1),
+                                      v_active),
                                     video_bpp1, viaparinfo->
                                     tmds_setting_info->iga_path);
                } else {
                        viafb_dvi_set_mode(viafb_get_mode_index
                                     (viaparinfo->tmds_setting_info->h_active,
                                      viaparinfo->
-                                      tmds_setting_info->v_active, 0),
+                                      tmds_setting_info->v_active),
                                     video_bpp, viaparinfo->
                                     tmds_setting_info->iga_path);
                }
diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
index 6c7290a6a44..78c6b338794 100644
--- a/drivers/video/via/lcd.c
+++ b/drivers/video/via/lcd.c
@@ -580,10 +580,7 @@ static void load_lcd_k400_patch_tbl(int set_hres, int set_vres,
        int reg_num = 0;
        struct io_reg *lcd_patch_reg = NULL;
-        if (viaparinfo->lvds_setting_info->iga_path == IGA2)
+        vmode_index = viafb_get_mode_index(set_hres, set_vres);
-                vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);
-        else
-                vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);
        switch (panel_id) {
                /* LCD 800x600 */
        case LCD_PANEL_ID1_800X600:
@@ -761,10 +758,7 @@ static void load_lcd_p880_patch_tbl(int set_hres, int set_vres,
        int reg_num = 0;
        struct io_reg *lcd_patch_reg = NULL;
-        if (viaparinfo->lvds_setting_info->iga_path == IGA2)
+        vmode_index = viafb_get_mode_index(set_hres, set_vres);
-                vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);
-        else
-                vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);
        switch (panel_id) {
        case LCD_PANEL_ID5_1400X1050:
@@ -832,10 +826,7 @@ static void load_lcd_patch_regs(int set_hres, int set_vres,
 {
        int vmode_index;
-        if (viaparinfo->lvds_setting_info->iga_path == IGA2)
+        vmode_index = viafb_get_mode_index(set_hres, set_vres);
-                vmode_index = viafb_get_mode_index(set_hres, set_vres, 1);
-        else
-                vmode_index = viafb_get_mode_index(set_hres, set_vres, 0);
        viafb_unlock_crt();
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index a0fec298216..72833f3334b 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -32,7 +32,6 @@ static u32 pseudo_pal[17];
 /* video mode */
 static char *viafb_mode = "640x480";
 static char *viafb_mode1 = "640x480";
-static int viafb_resMode = VIA_RES_640X480;
 /* Added for specifying active devices.*/
 char *viafb_active_dev = "";
@@ -56,47 +55,47 @@ static void viafb_get_video_device(u32 *video_dev_info);
 /* Mode information */
 static const struct viafb_modeinfo viafb_modentry[] = {
-        {480, 640, VIA_RES_480X640, "480x640"},
+        {480, 640, VIA_RES_480X640},
-        {640, 480, VIA_RES_640X480, "640x480"},
+        {640, 480, VIA_RES_640X480},
-        {800, 480, VIA_RES_800X480, "800x480"},
+        {800, 480, VIA_RES_800X480},
-        {800, 600, VIA_RES_800X600, "800x600"},
+        {800, 600, VIA_RES_800X600},
-        {1024, 768, VIA_RES_1024X768, "1024x768"},
+        {1024, 768, VIA_RES_1024X768},
-        {1152, 864, VIA_RES_1152X864, "1152x864"},
+        {1152, 864, VIA_RES_1152X864},
-        {1280, 1024, VIA_RES_1280X1024, "1280x1024"},
+        {1280, 1024, VIA_RES_1280X1024},
-        {1600, 1200, VIA_RES_1600X1200, "1600x1200"},
+        {1600, 1200, VIA_RES_1600X1200},
-        {1440, 1050, VIA_RES_1440X1050, "1440x1050"},
+        {1440, 1050, VIA_RES_1440X1050},
-        {1280, 768, VIA_RES_1280X768, "1280x768"},
+        {1280, 768, VIA_RES_1280X768,},
-        {1280, 800, VIA_RES_1280X800, "1280x800"},
+        {1280, 800, VIA_RES_1280X800},
-        {1280, 960, VIA_RES_1280X960, "1280x960"},
+        {1280, 960, VIA_RES_1280X960},
-        {1920, 1440, VIA_RES_1920X1440, "1920x1440"},
+        {1920, 1440, VIA_RES_1920X1440},
-        {848, 480, VIA_RES_848X480, "848x480"},
+        {848, 480, VIA_RES_848X480},
-        {1400, 1050, VIA_RES_1400X1050, "1400x1050"},
+        {1400, 1050, VIA_RES_1400X1050},
-        {720, 480, VIA_RES_720X480, "720x480"},
+        {720, 480, VIA_RES_720X480},
-        {720, 576, VIA_RES_720X576, "720x576"},
+        {720, 576, VIA_RES_720X576},
-        {1024, 512, VIA_RES_1024X512, "1024x512"},
+        {1024, 512, VIA_RES_1024X512},
-        {1024, 576, VIA_RES_1024X576, "1024x576"},
+        {1024, 576, VIA_RES_1024X576},
-        {1024, 600, VIA_RES_1024X600, "1024x600"},
+        {1024, 600, VIA_RES_1024X600},
-        {1280, 720, VIA_RES_1280X720, "1280x720"},
+        {1280, 720, VIA_RES_1280X720},
-        {1920, 1080, VIA_RES_1920X1080, "1920x1080"},
+        {1920, 1080, VIA_RES_1920X1080},
-        {1366, 768, VIA_RES_1368X768, "1368x768"},
+        {1366, 768, VIA_RES_1368X768},
-        {1680, 1050, VIA_RES_1680X1050, "1680x1050"},
+        {1680, 1050, VIA_RES_1680X1050},
-        {960, 600, VIA_RES_960X600, "960x600"},
+        {960, 600, VIA_RES_960X600},
-        {1000, 600, VIA_RES_1000X600, "1000x600"},
+        {1000, 600, VIA_RES_1000X600},
-        {1024, 576, VIA_RES_1024X576, "1024x576"},
+        {1024, 576, VIA_RES_1024X576},
-        {1024, 600, VIA_RES_1024X600, "1024x600"},
+        {1024, 600, VIA_RES_1024X600},
-        {1088, 612, VIA_RES_1088X612, "1088x612"},
+        {1088, 612, VIA_RES_1088X612},
-        {1152, 720, VIA_RES_1152X720, "1152x720"},
+        {1152, 720, VIA_RES_1152X720},
-        {1200, 720, VIA_RES_1200X720, "1200x720"},
+        {1200, 720, VIA_RES_1200X720},
-        {1280, 600, VIA_RES_1280X600, "1280x600"},
+        {1280, 600, VIA_RES_1280X600},
-        {1360, 768, VIA_RES_1360X768, "1360x768"},
+        {1360, 768, VIA_RES_1360X768},
-        {1440, 900, VIA_RES_1440X900, "1440x900"},
+        {1440, 900, VIA_RES_1440X900},
-        {1600, 900, VIA_RES_1600X900, "1600x900"},
+        {1600, 900, VIA_RES_1600X900},
-        {1600, 1024, VIA_RES_1600X1024, "1600x1024"},
+        {1600, 1024, VIA_RES_1600X1024},
-        {1792, 1344, VIA_RES_1792X1344, "1792x1344"},
+        {1792, 1344, VIA_RES_1792X1344},
-        {1856, 1392, VIA_RES_1856X1392, "1856x1392"},
+        {1856, 1392, VIA_RES_1856X1392},
-        {1920, 1200, VIA_RES_1920X1200, "1920x1200"},
+        {1920, 1200, VIA_RES_1920X1200},
-        {2048, 1536, VIA_RES_2048X1536, "2048x1536"},
+        {2048, 1536, VIA_RES_2048X1536},
-        {0, 0, VIA_RES_INVALID, "640x480"}
+        {0, 0, VIA_RES_INVALID}
 };
 static struct fb_ops viafb_ops;
@@ -177,7 +176,7 @@ static int viafb_check_var(struct fb_var_screeninfo *var,
        if (var->vmode & FB_VMODE_INTERLACED || var->vmode & FB_VMODE_DOUBLE)
                return -EINVAL;
-        vmode_index = viafb_get_mode_index(var->xres, var->yres, 0);
+        vmode_index = viafb_get_mode_index(var->xres, var->yres);
        if (vmode_index == VIA_RES_INVALID) {
                DEBUG_MSG(KERN_INFO
                          "viafb: Mode %dx%dx%d not supported!!\n",
@@ -233,14 +232,14 @@ static int viafb_set_par(struct fb_info *info)
        viafb_update_device_setting(info->var.xres, info->var.yres,
                              info->var.bits_per_pixel, viafb_refresh, 0);
-        vmode_index = viafb_get_mode_index(info->var.xres, info->var.yres, 0);
+        vmode_index = viafb_get_mode_index(info->var.xres, info->var.yres);
        if (viafb_SAMM_ON == 1) {
                DEBUG_MSG(KERN_INFO
                "viafb_second_xres = %d, viafb_second_yres = %d, bpp = %d\n",
                          viafb_second_xres, viafb_second_yres, viafb_bpp1);
                vmode_index1 = viafb_get_mode_index(viafb_second_xres,
-                        viafb_second_yres, 1);
+                        viafb_second_yres);
                DEBUG_MSG(KERN_INFO "->viafb_SAMM_ON: index=%d\n",
                        vmode_index1);
@@ -1262,7 +1261,7 @@ static int viafb_sync(struct fb_info *info)
        return 0;
 }
-int viafb_get_mode_index(int hres, int vres, int flag)
+int viafb_get_mode_index(int hres, int vres)
 {
        u32 i;
        DEBUG_MSG(KERN_INFO "viafb_get_mode_index!\n");
@@ -1272,13 +1271,7 @@ int viafb_get_mode_index(int hres, int vres, int flag)
                        viafb_modentry[i].yres == vres)
                        break;
-        viafb_resMode = viafb_modentry[i].mode_index;
+        return viafb_modentry[i].mode_index;
-        if (flag)
-                viafb_mode1 = viafb_modentry[i].mode_res;
-        else
-                viafb_mode = viafb_modentry[i].mode_res;
-        return viafb_resMode;
 }
 static void check_available_device_to_enable(int device_id)
@@ -2199,7 +2192,7 @@ static int __devinit via_pci_probe(void)
        strict_strtoul(tmpc, 0, &default_xres);
        strict_strtoul(tmpm, 0, &default_yres);
-        vmode_index = viafb_get_mode_index(default_xres, default_yres, 0);
+        vmode_index = viafb_get_mode_index(default_xres, default_yres);
        DEBUG_MSG(KERN_INFO "0->index=%d\n", vmode_index);
        if (viafb_SAMM_ON == 1) {
diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h
index a4158e87287..227b000feb3 100644
--- a/drivers/video/via/viafbdev.h
+++ b/drivers/video/via/viafbdev.h
@@ -81,7 +81,6 @@ struct viafb_modeinfo {
        u32 xres;
        u32 yres;
        int mode_index;
-        char *mode_res;
 };
 extern unsigned int viafb_second_virtual_yres;
 extern unsigned int viafb_second_virtual_xres;
@@ -102,7 +101,7 @@ extern int strict_strtoul(const char *cp, unsigned int base,
 void viafb_memory_pitch_patch(struct fb_info *info);
 void viafb_fill_var_timing_info(struct fb_var_screeninfo *var, int refresh,
                          int mode_index);
-int viafb_get_mode_index(int hres, int vres, int flag);
+int viafb_get_mode_index(int hres, int vres);
 u8 viafb_gpio_i2c_read_lvds(struct lvds_setting_information
        *plvds_setting_info, struct lvds_chip_information
        *plvds_chip_info, u8 index);
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index a7e3b706b9d..0d92969404c 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -687,6 +687,7 @@ static int omap_hdq_remove(struct platform_device *pdev)
        if (hdq_data->hdq_usecount) {
                dev_dbg(&pdev->dev, "removed when use count is not zero\n");
+                mutex_unlock(&hdq_data->hdq_mutex);
                return -EBUSY;
        }