Merge tag 'fbdev-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

Pull fbdev changes from Tomi Valkeinen:
 "Nothing particularly stands out in this pull request.  The biggest
  part of the changes are cleanups.

  Maybe one fix to mention is the "fb: reorder the lock sequence to fix
  potential dead lock" which hopefully fixes the fb locking issues
  reported by multiple persons.

  There are also a few commits that have changes to arch/arm/mach-at91
  and arch/avr32, which have been acked by the maintainers"

* tag 'fbdev-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (143 commits)
  fb: reorder the lock sequence to fix potential dead lock
  fbdev: shmobile-lcdcfb: Convert to clk_prepare/unprepare
  fbdev: shmobile-hdmi: Convert to clk_prepare/unprepare
  omapdss: Add new panel driver for Topolly td028ttec1 LCD.
  video: exynos_mipi_dsi: Unlock the mutex before returning
  video: da8xx-fb: remove unwanted define
  video: Remove unnecessary semicolons
  simplefb: use write-combined remapping
  simplefb: fix unmapping fb during destruction
  OMAPDSS: connector-dvi: fix releasing i2c_adapter
  OMAPDSS: DSI: fix perf measuring ifdefs
  framebuffer: Use fb_<level>
  framebuffer: Add fb_<level> convenience logging macros
  efifb: prevent null-deref when iterating dmi_list
  fbdev: fix error return code in metronomefb_probe()
  video: xilinxfb: Fix for "Use standard variable name convention"
  OMAPDSS: Fix de_level in videomode_to_omap_video_timings()
  video: xilinxfb: Simplify error path
  video: xilinxfb: Use devm_kzalloc instead of kzalloc
  video: xilinxfb: Use standard variable name convention
  ...

3 files changed, 22 insertions, 22 deletions

diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h
index 0f5a2fc69af9..c79f38131926 100644
--- a/include/video/atmel_lcdc.h
+++ b/include/video/atmel_lcdc.h
@@ -31,39 +31,20 @@
 #define ATMEL_LCDC_WIRING_BGR   0
 #define ATMEL_LCDC_WIRING_RGB   1
 
-struct atmel_lcdfb_config;
 
  /* LCD Controller info data structure, stored in device platform_data */
-struct atmel_lcdfb_info {
-        spinlock_t              lock;
-        struct fb_info          *info;
-        void __iomem            *mmio;
-        int                     irq_base;
-        struct work_struct      task;
-
+struct atmel_lcdfb_pdata {
         unsigned int            guard_time;
-        unsigned int            smem_len;
-        struct platform_device  *pdev;
-        struct clk              *bus_clk;
-        struct clk              *lcdc_clk;
-
-#ifdef CONFIG_BACKLIGHT_ATMEL_LCDC
-        struct backlight_device *backlight;
-        u8                      bl_power;
-#endif
         bool                    lcdcon_is_backlight;
         bool                    lcdcon_pol_negative;
-        u8                      saved_lcdcon;
-
         u8                      default_bpp;
         u8                      lcd_wiring_mode;
         unsigned int            default_lcdcon2;
         unsigned int            default_dmacon;
-        void (*atmel_lcdfb_power_control)(int on);
+        void (*atmel_lcdfb_power_control)(struct atmel_lcdfb_pdata *pdata, int on);
         struct fb_monspecs      *default_monspecs;
-        u32                     pseudo_palette[16];
 
-        struct atmel_lcdfb_config *config;
+        struct list_head        pwr_gpios;
 };
 
 #define ATMEL_LCDC_DMABADDR1    0x00
diff --git a/include/video/mmp_disp.h b/include/video/mmp_disp.h
index b9dd1fbb0082..9fd9398368d5 100644
--- a/include/video/mmp_disp.h
+++ b/include/video/mmp_disp.h
@@ -91,6 +91,11 @@ struct mmp_win {
         u16     up_crop;
         u16     bottom_crop;
         int     pix_fmt;
+        /*
+         * pitch[0]: graphics/video layer line length or y pitch
+         * pitch[1]/pitch[2]: video u/v pitch if non-zero
+         */
+        u32     pitch[3];
 };
 
 struct mmp_addr {
@@ -334,6 +339,7 @@ struct mmp_mach_path_config {
         int output_type;
         u32 path_config;
         u32 link_config;
+        u32 dsi_rbswap;
 };
 
 struct mmp_mach_plat_info {
diff --git a/include/video/omap-panel-data.h b/include/video/omap-panel-data.h
index f7ac8d972af0..69279c013ac4 100644
--- a/include/video/omap-panel-data.h
+++ b/include/video/omap-panel-data.h
@@ -238,4 +238,17 @@ struct panel_nec_nl8048hl11_platform_data {
         int qvga_gpio;
 };
 
+/**
+ * panel-tpo-td028ttec1 platform data
+ * @name: name for display entity
+ * @source: name of the display entity used as a video source
+ * @data_lines: number of DPI datalines
+ */
+struct panel_tpo_td028ttec1_platform_data {
+        const char *name;
+        const char *source;
+
+        int data_lines;
+};
+
 #endif /* __OMAP_PANEL_DATA_H */