Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6

Pull fbdev updates for 3.4 from Florian Tobias Schandinat:
 - drivers for Samsung Exynos MIPI DSI and display port
 - i740fb to support those old Intel chips
 - large updates to OMAP, viafb and sh_mobile_lcdcfb
 - some updates to s3c-fb and udlfb, few patches to others

Fix up conflicts in drivers/video/udlfb.c due to Key Sievers' fix making
it in twice.

* tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6: (156 commits)
  Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page"
  OMAPDSS: register dss drivers in module init
  video: pxafb: add clk_prepare/clk_unprepare calls
  fbdev: bfin_adv7393fb: Drop needless include
  fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
  fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC
  Revert "MAINTAINERS: add entry for exynos mipi display drivers"
  fbdev: da8xx: add support for SP10Q010 display
  fbdev: da8xx:: fix reporting of the display timing info
  drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
  OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update
  fbdev: sh_mobile_meram: Implement system suspend/resume
  fbdev: sh_mobile_meram: Remove unneeded sanity checks
  fbdev: sh_mobile_meram: Don't perform update in register operation
  arm: mach-shmobile: Constify sh_mobile_meram_cfg structures
  fbdev: sh_mobile_lcdc: Don't store copy of platform data
  fbdev: sh_mobile_meram: Remove unused sh_mobile_meram_icb_cfg fields
  arm: mach-shmobile: Don't set MERAM ICB numbers in platform data
  fbdev: sh_mobile_meram: Allocate ICBs automatically
  fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation
  ...

1 files changed, 88 insertions, 0 deletions

diff --git a/drivers/video/via/via_aux.c b/drivers/video/via/via_aux.c
new file mode 100644
index 000000000000..4a0a55cdac3d
--- /dev/null
+++ b/drivers/video/via/via_aux.c
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2011 Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE.See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+/*
+ * infrastructure for devices connected via I2C
+ */
+
+#include <linux/slab.h>
+#include "via_aux.h"
+
+
+struct via_aux_bus *via_aux_probe(struct i2c_adapter *adap)
+{
+        struct via_aux_bus *bus;
+
+        if (!adap)
+                return NULL;
+
+        bus = kmalloc(sizeof(*bus), GFP_KERNEL);
+        if (!bus)
+                return NULL;
+
+        bus->adap = adap;
+        INIT_LIST_HEAD(&bus->drivers);
+
+        via_aux_edid_probe(bus);
+        via_aux_vt1636_probe(bus);
+        via_aux_vt1632_probe(bus);
+        via_aux_vt1631_probe(bus);
+        via_aux_vt1625_probe(bus);
+        via_aux_vt1622_probe(bus);
+        via_aux_vt1621_probe(bus);
+        via_aux_sii164_probe(bus);
+        via_aux_ch7301_probe(bus);
+
+        return bus;
+}
+
+void via_aux_free(struct via_aux_bus *bus)
+{
+        struct via_aux_drv *pos, *n;
+
+        if (!bus)
+                return;
+
+        list_for_each_entry_safe(pos, n, &bus->drivers, chain) {
+                if (pos->cleanup)
+                        pos->cleanup(pos);
+
+                list_del(&pos->chain);
+                kfree(pos->data);
+                kfree(pos);
+        }
+
+        kfree(bus);
+}
+
+const struct fb_videomode *via_aux_get_preferred_mode(struct via_aux_bus *bus)
+{
+        struct via_aux_drv *pos;
+        const struct fb_videomode *mode = NULL;
+
+        if (!bus)
+                return NULL;
+
+        list_for_each_entry(pos, &bus->drivers, chain) {
+                if (pos->get_preferred_mode)
+                        mode = pos->get_preferred_mode(pos);
+        }
+
+        return mode;
+}