34 files changed, 114 insertions, 180 deletions

diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
index 66c160b8547f..9d6122096fbe 100644
--- a/arch/arm/include/asm/cache.h
+++ b/arch/arm/include/asm/cache.h
@@ -14,7 +14,7 @@
  * cache before the transfer is done, causing old data to be seen by
  * the CPU.
  */
-#define ARCH_KMALLOC_MINALIGN   L1_CACHE_BYTES
+#define ARCH_DMA_MINALIGN       L1_CACHE_BYTES
 
 /*
  * With EABI on ARMv5 and above we must have 64-bit aligned slab pointers.
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index b5ccc6a993d5..c226fe10553e 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -144,16 +144,6 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
         return 0;
 }
 
-static inline int dma_get_cache_alignment(void)
-{
-        return 32;
-}
-
-static inline int dma_is_consistent(struct device *dev, dma_addr_t handle)
-{
-        return !!arch_is_coherent();
-}
-
 /*
  * DMA errors are defined by all-bits-set in the DMA address.
  */
diff --git a/arch/arm/include/asm/ioctls.h b/arch/arm/include/asm/ioctls.h
index 7f0b6d13296a..0b30894b5482 100644
--- a/arch/arm/include/asm/ioctls.h
+++ b/arch/arm/include/asm/ioctls.h
@@ -52,6 +52,7 @@
 #define TCSETSF2        _IOW('T',0x2D, struct termios2)
 #define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
 #define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
+#define TIOCSIG         _IOW('T',0x36, int)  /* Generate signal on Pty slave */
 
 #define TIOCGRS485      0x542E
 #define TIOCSRS485      0x542F
@@ -81,6 +82,7 @@
 #define TIOCPKT_START            8
 #define TIOCPKT_NOSTOP          16
 #define TIOCPKT_DOSTOP          32
+#define TIOCPKT_IOCTL           64
 
 #define TIOCSER_TEMT    0x01    /* Transmitter physically empty */
 
diff --git a/arch/arm/include/asm/termbits.h b/arch/arm/include/asm/termbits.h
index f784d11f40b5..704135d28d1d 100644
--- a/arch/arm/include/asm/termbits.h
+++ b/arch/arm/include/asm/termbits.h
@@ -177,6 +177,7 @@ struct ktermios {
 #define FLUSHO  0010000
 #define PENDIN  0040000
 #define IEXTEN  0100000
+#define EXTPROC 0200000
 
 /* tcflow() and TCXONC use these */
 #define TCOOFF          0
diff --git a/arch/arm/mach-mx3/mach-armadillo5x0.c b/arch/arm/mach-mx3/mach-armadillo5x0.c
index 96aadcadb4ff..68879c996a55 100644
--- a/arch/arm/mach-mx3/mach-armadillo5x0.c
+++ b/arch/arm/mach-mx3/mach-armadillo5x0.c
@@ -551,9 +551,9 @@ static void __init armadillo5x0_init(void)
         /* USB */
 #if defined(CONFIG_USB_ULPI)
         usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                        USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+                        ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
         usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                        USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+                        ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
 
         mxc_register_device(&mxc_otg_host, &usbotg_pdata);
         mxc_register_device(&mxc_usbh2, &usbh2_pdata);
diff --git a/arch/arm/mach-mx3/mach-mx31lilly.c b/arch/arm/mach-mx3/mach-mx31lilly.c
index 8f66f65e80e2..7c37daabb757 100644
--- a/arch/arm/mach-mx3/mach-mx31lilly.c
+++ b/arch/arm/mach-mx3/mach-mx31lilly.c
@@ -245,9 +245,9 @@ static struct mxc_usbh_platform_data usbh2_pdata = {
 static void lilly1131_usb_init(void)
 {
         usbotg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                                USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+                                ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
         usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                                USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+                                ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
 
         mxc_register_device(&mxc_usbh1, &usbh1_pdata);
         mxc_register_device(&mxc_usbh2, &usbh2_pdata);
diff --git a/arch/arm/mach-mx3/mach-mx31lite.c b/arch/arm/mach-mx3/mach-mx31lite.c
index da236c497d2a..f66a9576d8c2 100644
--- a/arch/arm/mach-mx3/mach-mx31lite.c
+++ b/arch/arm/mach-mx3/mach-mx31lite.c
@@ -256,7 +256,7 @@ static void __init mxc_board_init(void)
 #if defined(CONFIG_USB_ULPI)
         /* USB */
         usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                                USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+                                ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
 
         mxc_register_device(&mxc_usbh2, &usbh2_pdata);
 #endif
diff --git a/arch/arm/mach-mx3/mach-mx31moboard.c b/arch/arm/mach-mx3/mach-mx31moboard.c
index 67776bc61c33..7a075e8bf2d4 100644
--- a/arch/arm/mach-mx3/mach-mx31moboard.c
+++ b/arch/arm/mach-mx3/mach-mx31moboard.c
@@ -412,7 +412,7 @@ static struct mxc_usbh_platform_data usbh2_pdata = {
 static int __init moboard_usbh2_init(void)
 {
         usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                        USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+                        ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
 
         return mxc_register_device(&mxc_usbh2, &usbh2_pdata);
 }
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c
index 8a292dd1a714..214de11b20b9 100644
--- a/arch/arm/mach-mx3/mach-pcm037.c
+++ b/arch/arm/mach-mx3/mach-pcm037.c
@@ -654,13 +654,13 @@ static void __init mxc_board_init(void)
 #if defined(CONFIG_USB_ULPI)
         if (otg_mode_host) {
                 otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                                USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+                                ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
 
                 mxc_register_device(&mxc_otg_host, &otg_pdata);
         }
 
         usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                                USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+                                ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
 
         mxc_register_device(&mxc_usbh2, &usbh2_pdata);
 #endif
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c
index 47f5311b301a..28886f0e62f9 100644
--- a/arch/arm/mach-mx3/mach-pcm043.c
+++ b/arch/arm/mach-mx3/mach-pcm043.c
@@ -378,7 +378,7 @@ static void __init mxc_board_init(void)
 #if defined(CONFIG_USB_ULPI)
         if (otg_mode_host) {
                 otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                                USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+                                ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
 
                 mxc_register_device(&mxc_otg_host, &otg_pdata);
         }
diff --git a/arch/arm/mach-mx3/mx31moboard-smartbot.c b/arch/arm/mach-mx3/mx31moboard-smartbot.c
index 40c3e7564cb6..417757e78c65 100644
--- a/arch/arm/mach-mx3/mx31moboard-smartbot.c
+++ b/arch/arm/mach-mx3/mx31moboard-smartbot.c
@@ -134,7 +134,7 @@ static struct mxc_usbh_platform_data otg_host_pdata = {
 static int __init smartbot_otg_host_init(void)
 {
         otg_host_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
-                        USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);
+                        ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);
 
         return mxc_register_device(&mxc_otg_host, &otg_host_pdata);
 }
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 55836fa35060..dd3af2be13be 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -32,6 +32,7 @@
 #include <linux/input.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/gpio_keys.h>
+#include <linux/mmc/card.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -258,6 +259,20 @@ static struct platform_device pandora_dss_device = {
         },
 };
 
+static void pandora_wl1251_init_card(struct mmc_card *card)
+{
+        /*
+         * We have TI wl1251 attached to MMC3. Pass this information to
+         * SDIO core because it can't be probed by normal methods.
+         */
+        card->quirks |= MMC_QUIRK_NONSTD_SDIO;
+        card->cccr.wide_bus = 1;
+        card->cis.vendor = 0x104c;
+        card->cis.device = 0x9066;
+        card->cis.blksize = 512;
+        card->cis.max_dtr = 20000000;
+}
+
 static struct omap2_hsmmc_info omap3pandora_mmc[] = {
         {
                 .mmc            = 1,
@@ -279,6 +294,7 @@ static struct omap2_hsmmc_info omap3pandora_mmc[] = {
                 .wires          = 4,
                 .gpio_cd        = -EINVAL,
                 .gpio_wp        = -EINVAL,
+                .init_card      = pandora_wl1251_init_card,
         },
         {}      /* Terminator */
 };
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c
index 1ef54b036103..c8f647b6205e 100644
--- a/arch/arm/mach-omap2/hsmmc.c
+++ b/arch/arm/mach-omap2/hsmmc.c
@@ -268,6 +268,7 @@ void __init omap2_hsmmc_init(struct omap2_hsmmc_info *controllers)
                 mmc->slots[0].gpio_wp = c->gpio_wp;
 
                 mmc->slots[0].remux = c->remux;
+                mmc->slots[0].init_card = c->init_card;
 
                 if (c->cover_only)
                         mmc->slots[0].cover = 1;
diff --git a/arch/arm/mach-omap2/hsmmc.h b/arch/arm/mach-omap2/hsmmc.h
index 36f0ba8d89e2..1fe6f0187177 100644
--- a/arch/arm/mach-omap2/hsmmc.h
+++ b/arch/arm/mach-omap2/hsmmc.h
@@ -6,6 +6,8 @@
  * published by the Free Software Foundation.
  */
 
+struct mmc_card;
+
 struct omap2_hsmmc_info {
         u8      mmc;            /* controller 1/2/3 */
         u8      wires;          /* 1/4/8 wires */
@@ -23,6 +25,8 @@ struct omap2_hsmmc_info {
         int     ocr_mask;       /* temporary HACK */
         /* Remux (pad configuation) when powering on/off */
         void (*remux)(struct device *dev, int slot, int power_on);
+        /* init some special card */
+        void (*init_card)(struct mmc_card *card);
 };
 
 #if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
diff --git a/arch/arm/mach-s3c2416/s3c2416.c b/arch/arm/mach-s3c2416/s3c2416.c
index 35dabccd0ac2..bc30245e133b 100644
--- a/arch/arm/mach-s3c2416/s3c2416.c
+++ b/arch/arm/mach-s3c2416/s3c2416.c
@@ -55,6 +55,7 @@
 #include <plat/cpu.h>
 
 #include <plat/iic-core.h>
+#include <plat/fb-core.h>
 
 static struct map_desc s3c2416_iodesc[] __initdata = {
         IODESC_ENT(WATCHDOG),
@@ -90,7 +91,7 @@ int __init s3c2416_init(void)
         s3c_i2c0_setname("s3c2440-i2c");
         s3c_i2c1_setname("s3c2440-i2c");
 
-        s3c_device_fb.name = "s3c2443-fb";
+        s3c_fb_setname("s3c2443-fb");
 
         return sysdev_register(&s3c2416_sysdev);
 }
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index 9e39faa283b9..deaabe86741d 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -90,24 +90,17 @@
 static struct pcf50633 *gta02_pcf;
 
 /*
- * This gets called every 1ms when we paniced.
+ * This gets called frequently when we paniced.
  */
 
-static long gta02_panic_blink(long count)
+static long gta02_panic_blink(int state)
 {
         long delay = 0;
-        static long last_blink;
-        static char led;
+        char led;
 
-        /* Fast blink: 200ms period. */
-        if (count - last_blink < 100)
-                return 0;
-
-        led ^= 1;
+        led = (state) ? 1 : 0;
         gpio_direction_output(GTA02_GPIO_AUX_LED, led);
 
-        last_blink = count;
-
         return delay;
 }
 
@@ -556,7 +549,7 @@ static void gta02_poweroff(void)
 
 static void __init gta02_machine_init(void)
 {
-        /* Set the panic callback to make AUX LED blink at ~5Hz. */
+        /* Set the panic callback to turn AUX LED on or off. */
         panic_blink = gta02_panic_blink;
 
         s3c_pm_init();
diff --git a/arch/arm/mach-s3c2443/s3c2443.c b/arch/arm/mach-s3c2443/s3c2443.c
index ce2ec3298930..839b6b2ced74 100644
--- a/arch/arm/mach-s3c2443/s3c2443.c
+++ b/arch/arm/mach-s3c2443/s3c2443.c
@@ -35,6 +35,7 @@
 #include <plat/s3c2443.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
+#include <plat/fb-core.h>
 
 static struct map_desc s3c2443_iodesc[] __initdata = {
         IODESC_ENT(WATCHDOG),
@@ -62,6 +63,7 @@ int __init s3c2443_init(void)
         s3c24xx_reset_hook = s3c2443_hard_reset;
 
         s3c_device_nand.name = "s3c2412-nand";
+        s3c_fb_setname("s3c2443-fb");
 
         /* change WDT IRQ number */
         s3c_device_wdt.resource[1].start = IRQ_S3C2443_WDT;
diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-fb.h b/arch/arm/mach-s3c64xx/include/mach/regs-fb.h
index f56611526c63..a06ee0af9a4b 100644
--- a/arch/arm/mach-s3c64xx/include/mach/regs-fb.h
+++ b/arch/arm/mach-s3c64xx/include/mach/regs-fb.h
@@ -18,24 +18,4 @@
 
 #include <plat/regs-fb-v4.h>
 
-/* Palette registers */
-#define WIN2_PAL(_entry)                        (0x300 + ((_entry) * 2))
-#define WIN3_PAL(_entry)                        (0x320 + ((_entry) * 2))
-#define WIN4_PAL(_entry)                        (0x340 + ((_entry) * 2))
-#define WIN0_PAL(_entry)                        (0x400 + ((_entry) * 4))
-#define WIN1_PAL(_entry)                        (0x800 + ((_entry) * 4))
-
-static inline unsigned int s3c_fb_pal_reg(unsigned int window, int reg)
-{
-        switch (window) {
-        case 0: return WIN0_PAL(reg);
-        case 1: return WIN1_PAL(reg);
-        case 2: return WIN2_PAL(reg);
-        case 3: return WIN3_PAL(reg);
-        case 4: return WIN4_PAL(reg);
-        }
-
-        BUG();
-}
-
 #endif /* __ASM_ARCH_MACH_REGS_FB_H */
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c
index 4a0bb243d14a..742dc87bd9c1 100644
--- a/arch/arm/mach-s3c64xx/mach-anw6410.c
+++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
@@ -134,7 +134,6 @@ static struct platform_device anw6410_lcd_powerdev = {
 static struct s3c_fb_pd_win anw6410_fb_win0 = {
         /* this is to ensure we use win0 */
         .win_mode       = {
-                .pixclock       = 41094,
                 .left_margin    = 8,
                 .right_margin   = 13,
                 .upper_margin   = 7,
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c
index 187441a78dd5..fba90229f0df 100644
--- a/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/arch/arm/mach-s3c64xx/mach-hmt.c
@@ -128,7 +128,6 @@ static struct platform_device hmt_backlight_device = {
 
 static struct s3c_fb_pd_win hmt_fb_win0 = {
         .win_mode       = {
-                .pixclock       = 41094,
                 .left_margin    = 8,
                 .right_margin   = 13,
                 .upper_margin   = 7,
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c
index 1d0326ead90f..a065062ec2a4 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq5.c
@@ -134,8 +134,6 @@ static struct platform_device smartq5_buttons_device  = {
 
 static struct s3c_fb_pd_win smartq5_fb_win0 = {
         .win_mode       = {
-                .pixclock       = 1000000000000ULL /
-                                ((40+1+216+800)*(10+1+35+480)*80),
                 .left_margin    = 40,
                 .right_margin   = 216,
                 .upper_margin   = 10,
@@ -144,6 +142,7 @@ static struct s3c_fb_pd_win smartq5_fb_win0 = {
                 .vsync_len      = 1,
                 .xres           = 800,
                 .yres           = 480,
+                .refresh        = 80,
         },
         .max_bpp        = 32,
         .default_bpp    = 16,
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c
index e0bc78ecb156..0ecf45137546 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq7.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq7.c
@@ -150,8 +150,6 @@ static struct platform_device smartq7_buttons_device  = {
 
 static struct s3c_fb_pd_win smartq7_fb_win0 = {
         .win_mode       = {
-                .pixclock       = 1000000000000ULL /
-                                ((3+10+5+800)*(1+3+20+480)*80),
                 .left_margin    = 3,
                 .right_margin   = 5,
                 .upper_margin   = 1,
@@ -160,6 +158,7 @@ static struct s3c_fb_pd_win smartq7_fb_win0 = {
                 .vsync_len      = 3,
                 .xres           = 800,
                 .yres           = 480,
+                .refresh        = 80,
         },
         .max_bpp        = 32,
         .default_bpp    = 16,
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index b5d78616c774..2d43128f939f 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -144,7 +144,6 @@ static struct platform_device smdk6410_lcd_powerdev = {
 static struct s3c_fb_pd_win smdk6410_fb_win0 = {
         /* this is to ensure we use win0 */
         .win_mode       = {
-                .pixclock       = 41094,
                 .left_margin    = 8,
                 .right_margin   = 13,
                 .upper_margin   = 7,
diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c
index 799d22f41fcd..251c92ac5b22 100644
--- a/arch/arm/mach-s5pc100/cpu.c
+++ b/arch/arm/mach-s5pc100/cpu.c
@@ -43,6 +43,7 @@
 #include <plat/sdhci.h>
 #include <plat/adc-core.h>
 #include <plat/onenand-core.h>
+#include <plat/fb-core.h>
 
 #include <plat/s5pc100.h>
 
@@ -96,6 +97,7 @@ void __init s5pc100_map_io(void)
         s3c_i2c1_setname("s3c2440-i2c");
 
         s3c_onenand_setname("s5pc100-onenand");
+        s3c_fb_setname("s5pc100-fb");
         s3c_cfcon_setname("s5pc100-pata");
 }
 
diff --git a/arch/arm/mach-s5pc100/include/mach/regs-fb.h b/arch/arm/mach-s5pc100/include/mach/regs-fb.h
index 1732cd28c765..4be4cc9abf75 100644
--- a/arch/arm/mach-s5pc100/include/mach/regs-fb.h
+++ b/arch/arm/mach-s5pc100/include/mach/regs-fb.h
@@ -100,40 +100,6 @@
 #define BLENDCON                                        (0x260)
 #define BLENDCON_8BIT_ALPHA                             (1 << 0)
 
-/* Per-window palette base addresses (start of palette memory).
- * Each window palette area consists of 256 32-bit entries.
- * START is the first address (entry 0th), END is the address of 255th entry.
- */
-#define WIN0_PAL_BASE                                   (0x2400)
-#define WIN0_PAL_END                                    (0x27fc)
-#define WIN1_PAL_BASE                                   (0x2800)
-#define WIN1_PAL_END                                    (0x2bfc)
-#define WIN2_PAL_BASE                                   (0x2c00)
-#define WIN2_PAL_END                                    (0x2ffc)
-#define WIN3_PAL_BASE                                   (0x3000)
-#define WIN3_PAL_END                                    (0x33fc)
-#define WIN4_PAL_BASE                                   (0x3400)
-#define WIN4_PAL_END                                    (0x37fc)
-
-#define WIN0_PAL(_entry)                        (WIN0_PAL_BASE + ((_entry) * 4))
-#define WIN1_PAL(_entry)                        (WIN1_PAL_BASE + ((_entry) * 4))
-#define WIN2_PAL(_entry)                        (WIN2_PAL_BASE + ((_entry) * 4))
-#define WIN3_PAL(_entry)                        (WIN3_PAL_BASE + ((_entry) * 4))
-#define WIN4_PAL(_entry)                        (WIN4_PAL_BASE + ((_entry) * 4))
-
-static inline unsigned int s3c_fb_pal_reg(unsigned int window, int reg)
-{
-        switch (window) {
-        case 0: return WIN0_PAL(reg);
-        case 1: return WIN1_PAL(reg);
-        case 2: return WIN2_PAL(reg);
-        case 3: return WIN3_PAL(reg);
-        case 4: return WIN4_PAL(reg);
-        }
-
-        BUG();
-}
-
 
 #endif /* __ASM_ARCH_REGS_FB_H */
 
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c
index 2dc519c172ec..020c3f98f81f 100644
--- a/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -133,7 +133,6 @@ static struct platform_device smdkc100_lcd_powerdev = {
 static struct s3c_fb_pd_win smdkc100_fb_win0 = {
         /* this is to ensure we use win0 */
         .win_mode       = {
-                .pixclock = 1000000000000ULL / ((8+13+3+800)*(7+5+1+480)*80),
                 .left_margin    = 8,
                 .right_margin   = 13,
                 .upper_margin   = 7,
@@ -142,6 +141,7 @@ static struct s3c_fb_pd_win smdkc100_fb_win0 = {
                 .vsync_len      = 1,
                 .xres           = 800,
                 .yres           = 480,
+                .refresh        = 80,
         },
         .max_bpp        = 32,
         .default_bpp    = 16,
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index c7e0b8a65c4a..b9f4d677cf55 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -31,6 +31,7 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/clock.h>
+#include <plat/fb-core.h>
 #include <plat/s5pv210.h>
 #include <plat/adc-core.h>
 #include <plat/ata-core.h>
@@ -107,6 +108,8 @@ void __init s5pv210_map_io(void)
         s3c_i2c1_setname("s3c2440-i2c");
         s3c_i2c2_setname("s3c2440-i2c");
 
+        s3c_fb_setname("s5pv210-fb");
+
         /* Use s5pv210-keypad instead of samsung-keypad */
         samsung_keypad_setname("s5pv210-keypad");
 }
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index e41266419a3f..0dda8012d6b2 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -92,7 +92,6 @@ static struct s3c2410_uartcfg aquila_uartcfgs[] __initdata = {
 /* Frame Buffer */
 static struct s3c_fb_pd_win aquila_fb_win0 = {
         .win_mode = {
-                .pixclock = 1000000000000ULL / ((16+16+2+480)*(28+3+2+800)*60),
                 .left_margin = 16,
                 .right_margin = 16,
                 .upper_margin = 3,
@@ -108,7 +107,6 @@ static struct s3c_fb_pd_win aquila_fb_win0 = {
 
 static struct s3c_fb_pd_win aquila_fb_win1 = {
         .win_mode = {
-                .pixclock = 1000000000000ULL / ((16+16+2+480)*(28+3+2+800)*60),
                 .left_margin = 16,
                 .right_margin = 16,
                 .upper_margin = 3,
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h
index c835f1e994c6..9b89ec601ee2 100644
--- a/arch/arm/plat-omap/include/plat/mmc.h
+++ b/arch/arm/plat-omap/include/plat/mmc.h
@@ -122,6 +122,8 @@ struct omap_mmc_platform_data {
                 /* Call back after enabling / disabling regulators */
                 void (*after_set_reg)(struct device *dev, int slot,
                                       int power_on, int vdd);
+                /* if we have special card, init it using this callback */
+                void (*init_card)(struct mmc_card *card);
 
                 /* return MMC cover switch state, can be NULL if not supported.
                  *
diff --git a/arch/arm/plat-samsung/include/plat/fb-core.h b/arch/arm/plat-samsung/include/plat/fb-core.h
new file mode 100644
index 000000000000..bca383efcf6d
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/fb-core.h
@@ -0,0 +1,29 @@
+/*
+ * arch/arm/plat-samsung/include/plat/fb-core.h
+ *
+ * Copyright 2010 Samsung Electronics Co., Ltd.
+ *      Pawel Osciak <p.osciak@samsung.com>
+ *
+ * Samsung framebuffer driver core functions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __ASM_PLAT_FB_CORE_H
+#define __ASM_PLAT_FB_CORE_H __FILE__
+
+/*
+ * These functions are only for use with the core support code, such as
+ * the CPU-specific initialization code.
+ */
+
+/* Re-define device name depending on support. */
+static inline void s3c_fb_setname(char *name)
+{
+#ifdef CONFIG_S3C_DEV_FB
+        s3c_device_fb.name = name;
+#endif
+}
+
+#endif /* __ASM_PLAT_FB_CORE_H */
diff --git a/arch/arm/plat-samsung/include/plat/fb.h b/arch/arm/plat-samsung/include/plat/fb.h
index 27d3b497b55b..cb3ca3adc685 100644
--- a/arch/arm/plat-samsung/include/plat/fb.h
+++ b/arch/arm/plat-samsung/include/plat/fb.h
@@ -42,6 +42,7 @@ struct s3c_fb_pd_win {
  * @setup_gpio: Setup the external GPIO pins to the right state to transfer
  *              the data from the display system to the connected display
  *              device.
+ * @default_win: default window layer number to be used for UI layer.
  * @vidcon0: The base vidcon0 values to control the panel data format.
  * @vidcon1: The base vidcon1 values to control the panel data output.
  * @win: The setup data for each hardware window, or NULL for unused.
@@ -58,6 +59,8 @@ struct s3c_fb_platdata {
 
         struct s3c_fb_pd_win    *win[S3C_FB_MAX_WIN];
 
+        u32                      default_win;
+
         u32                      vidcon0;
         u32                      vidcon1;
 };
diff --git a/arch/arm/plat-samsung/include/plat/regs-fb-v4.h b/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
index 0f43599248ad..4c3647f80057 100644
--- a/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
+++ b/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
@@ -40,16 +40,10 @@
 
 /* OSD1 and OSD4 do not have register D */
 
-#define VIDOSD_A(_win)                          (0x40 + ((_win) * 16))
-#define VIDOSD_B(_win)                          (0x44 + ((_win) * 16))
-#define VIDOSD_C(_win)                          (0x48 + ((_win) * 16))
-#define VIDOSD_D(_win)                          (0x4C + ((_win) * 16))
-
+#define VIDOSD_BASE                             (0x40)
 
 #define VIDINTCON0                              (0x130)
 
-#define WxKEYCONy(_win, _con)                   ((0x140 + ((_win) * 8)) + ((_con) * 4))
-
 /* WINCONx */
 
 #define WINCONx_CSCWIDTH_MASK                   (0x3 << 26)
@@ -143,76 +137,6 @@
 #define WPALCON_W2PAL_16BPP_A555                (1 << 6)
 
 
-/* system specific implementation code for palette sizes, and other
- * information that changes depending on which architecture is being
- * compiled.
-*/
-
-/* return true if window _win has OSD register D */
-#define s3c_fb_has_osd_d(_win) ((_win) != 4 && (_win) != 0)
-
-static inline unsigned int s3c_fb_win_pal_size(unsigned int win)
-{
-        if (win < 2)
-                return 256;
-        if (win < 4)
-                return 16;
-        if (win == 4)
-                return 4;
-
-        BUG();  /* shouldn't get here */
-}
-
-static inline int s3c_fb_validate_win_bpp(unsigned int win, unsigned int bpp)
-{
-        /* all windows can do 1/2 bpp */
-
-        if ((bpp == 25 || bpp == 19) && win == 0)
-                return 0;       /* win 0 does not have 19 or 25bpp modes */
-
-        if (bpp == 4 && win == 4)
-                return 0;
-
-        if (bpp == 8 && (win >= 3))
-                return 0;       /* win 3/4 cannot do 8bpp in any mode */
-
-        return 1;
-}
-
-static inline int s3c_fb_pal_is16(unsigned int window)
-{
-        return window > 1;
-}
-
-struct s3c_fb_palette {
-        struct fb_bitfield      r;
-        struct fb_bitfield      g;
-        struct fb_bitfield      b;
-        struct fb_bitfield      a;
-};
-
-static inline void s3c_fb_init_palette(unsigned int window,
-                                       struct s3c_fb_palette *palette)
-{
-        if (window < 2) {
-                /* Windows 0/1 are 8/8/8 or A/8/8/8 */
-                palette->r.offset = 16;
-                palette->r.length = 8;
-                palette->g.offset = 8;
-                palette->g.length = 8;
-                palette->b.offset = 0;
-                palette->b.length = 8;
-        } else {
-                /* currently we assume RGB 5/6/5 */
-                palette->r.offset = 11;
-                palette->r.length = 5;
-                palette->g.offset = 5;
-                palette->g.length = 6;
-                palette->b.offset = 0;
-                palette->b.length = 5;
-        }
-}
-
 /* Notes on per-window bpp settings
  *
  * Value        Win0     Win1     Win2     Win3     Win 4
diff --git a/arch/arm/plat-samsung/include/plat/regs-fb.h b/arch/arm/plat-samsung/include/plat/regs-fb.h
index 0ef806e50344..8f39aa5b26ea 100644
--- a/arch/arm/plat-samsung/include/plat/regs-fb.h
+++ b/arch/arm/plat-samsung/include/plat/regs-fb.h
@@ -112,6 +112,13 @@
 #define VIDCON2_ORGYCbCr                        (1 << 8)
 #define VIDCON2_YUVORDCrCb                      (1 << 7)
 
+/* PRTCON (S3C6410, S5PC100)
+ * Might not be present in the S3C6410 documentation,
+ * but tests prove it's there almost for sure; shouldn't hurt in any case.
+ */
+#define PRTCON                                  (0x0c)
+#define PRTCON_PROTECT                          (1 << 11)
+
 /* VIDTCON0 */
 
 #define VIDTCON0_VBPDE_MASK                     (0xff << 24)
@@ -173,6 +180,7 @@
 #define WINCONx_BITSWP                          (1 << 18)
 #define WINCONx_BYTSWP                          (1 << 17)
 #define WINCONx_HAWSWP                          (1 << 16)
+#define WINCONx_WSWP                            (1 << 15)
 #define WINCONx_BURSTLEN_MASK                   (0x3 << 9)
 #define WINCONx_BURSTLEN_SHIFT                  (9)
 #define WINCONx_BURSTLEN_16WORD                 (0x0 << 9)
@@ -212,6 +220,13 @@
 #define WINCON1_BPPMODE_25BPP_A1888             (0xd << 2)
 #define WINCON1_BPPMODE_28BPP_A4888             (0xd << 2)
 
+/* S5PV210 */
+#define SHADOWCON                               (0x34)
+#define SHADOWCON_WINx_PROTECT(_win)            (1 << (10 + (_win)))
+/* DMA channels (all windows) */
+#define SHADOWCON_CHx_ENABLE(_win)              (1 << (_win))
+/* Local input channels (windows 0-2) */
+#define SHADOWCON_CHx_LOCAL_ENABLE(_win)        (1 << (5 + (_win)))
 
 #define VIDOSDxA_TOPLEFT_X_MASK                 (0x7ff << 11)
 #define VIDOSDxA_TOPLEFT_X_SHIFT                (11)
@@ -291,11 +306,12 @@
 #define VIDINTCON0_FRAMESEL0_ACTIVE             (0x2 << 15)
 #define VIDINTCON0_FRAMESEL0_FRONTPORCH         (0x3 << 15)
 
-#define VIDINTCON0_FRAMESEL1                    (1 << 14)
-#define VIDINTCON0_FRAMESEL1_NONE               (0x0 << 14)
-#define VIDINTCON0_FRAMESEL1_BACKPORCH          (0x1 << 14)
-#define VIDINTCON0_FRAMESEL1_VSYNC              (0x2 << 14)
-#define VIDINTCON0_FRAMESEL1_FRONTPORCH         (0x3 << 14)
+#define VIDINTCON0_FRAMESEL1                    (1 << 13)
+#define VIDINTCON0_FRAMESEL1_MASK               (0x3 << 13)
+#define VIDINTCON0_FRAMESEL1_NONE               (0x0 << 13)
+#define VIDINTCON0_FRAMESEL1_BACKPORCH          (0x1 << 13)
+#define VIDINTCON0_FRAMESEL1_VSYNC              (0x2 << 13)
+#define VIDINTCON0_FRAMESEL1_FRONTPORCH         (0x3 << 13)
 
 #define VIDINTCON0_INT_FRAME                    (1 << 12)
 #define VIDINTCON0_FIFIOSEL_MASK                (0x7f << 5)
@@ -321,6 +337,10 @@
 #define VIDINTCON1_INT_FIFO                     (1 << 0)
 
 /* Window colour-key control registers */
+#define WKEYCON                                 (0x140) /* 6410,V210 */
+
+#define WKEYCON0                                (0x00)
+#define WKEYCON1                                (0x04)
 
 #define WxKEYCON0_KEYBL_EN                      (1 << 26)
 #define WxKEYCON0_KEYEN_F                       (1 << 25)
diff --git a/arch/arm/plat-samsung/include/plat/regs-usb-hsotg.h b/arch/arm/plat-samsung/include/plat/regs-usb-hsotg.h
index 8d18d9d4d148..dc90f5ede88f 100644
--- a/arch/arm/plat-samsung/include/plat/regs-usb-hsotg.h
+++ b/arch/arm/plat-samsung/include/plat/regs-usb-hsotg.h
@@ -226,6 +226,7 @@
 
 #define S3C_DIEPMSK                             S3C_HSOTG_REG(0x810)
 
+#define S3C_DIEPMSK_TxFIFOEmpty                 (1 << 7)
 #define S3C_DIEPMSK_INEPNakEffMsk               (1 << 6)
 #define S3C_DIEPMSK_INTknEPMisMsk               (1 << 5)
 #define S3C_DIEPMSK_INTknTXFEmpMsk              (1 << 4)
@@ -371,6 +372,7 @@
 
 #define S3C_DIEPDMA(_a)                         S3C_HSOTG_REG(0x914 + ((_a) * 0x20))
 #define S3C_DOEPDMA(_a)                         S3C_HSOTG_REG(0xB14 + ((_a) * 0x20))
+#define S3C_DTXFSTS(_a)                         S3C_HSOTG_REG(0x918 + ((_a) * 0x20))
 
 #define S3C_EPFIFO(_a)                          S3C_HSOTG_REG(0x1000 + ((_a) * 0x1000))