2 files changed, 17 insertions, 66 deletions

diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index e5ceba54d22f..eac7c1ace7a5 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -49,7 +49,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
 #include <linux/pinctrl/consumer.h>
-#include <linux/mxsfb.h>
+#include <linux/fb.h>
 #include <video/videomode.h>
 
 #define REG_SET 4
@@ -109,7 +109,7 @@
 #define VDCTRL0_ENABLE_PRESENT          (1 << 28)
 #define VDCTRL0_VSYNC_ACT_HIGH          (1 << 27)
 #define VDCTRL0_HSYNC_ACT_HIGH          (1 << 26)
-#define VDCTRL0_DOTCLK_ACT_FAILING      (1 << 25)
+#define VDCTRL0_DOTCLK_ACT_FALLING      (1 << 25)
 #define VDCTRL0_ENABLE_ACT_HIGH         (1 << 24)
 #define VDCTRL0_VSYNC_PERIOD_UNIT       (1 << 21)
 #define VDCTRL0_VSYNC_PULSE_WIDTH_UNIT  (1 << 20)
@@ -144,6 +144,14 @@
 #define BLUE 2
 #define TRANSP 3
 
+#define STMLCDIF_8BIT  1 /** pixel data bus to the display is of 8 bit width */
+#define STMLCDIF_16BIT 0 /** pixel data bus to the display is of 16 bit width */
+#define STMLCDIF_18BIT 2 /** pixel data bus to the display is of 18 bit width */
+#define STMLCDIF_24BIT 3 /** pixel data bus to the display is of 24 bit width */
+
+#define MXSFB_SYNC_DATA_ENABLE_HIGH_ACT (1 << 6)
+#define MXSFB_SYNC_DOTCLK_FALLING_ACT   (1 << 7) /* negtive edge sampling */
+
 enum mxsfb_devtype {
         MXSFB_V3,
         MXSFB_V4,
@@ -460,8 +468,8 @@ static int mxsfb_set_par(struct fb_info *fb_info)
                 vdctrl0 |= VDCTRL0_VSYNC_ACT_HIGH;
         if (host->sync & MXSFB_SYNC_DATA_ENABLE_HIGH_ACT)
                 vdctrl0 |= VDCTRL0_ENABLE_ACT_HIGH;
-        if (host->sync & MXSFB_SYNC_DOTCLK_FAILING_ACT)
-                vdctrl0 |= VDCTRL0_DOTCLK_ACT_FAILING;
+        if (host->sync & MXSFB_SYNC_DOTCLK_FALLING_ACT)
+                vdctrl0 |= VDCTRL0_DOTCLK_ACT_FALLING;
 
         writel(vdctrl0, host->base + LCDC_VDCTRL0);
 
@@ -760,7 +768,7 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host)
                 if (vm.data_flags & DISPLAY_FLAGS_DE_HIGH)
                         host->sync |= MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;
                 if (vm.data_flags & DISPLAY_FLAGS_PIXDATA_NEGEDGE)
-                        host->sync |= MXSFB_SYNC_DOTCLK_FAILING_ACT;
+                        host->sync |= MXSFB_SYNC_DOTCLK_FALLING_ACT;
                 fb_add_videomode(&fb_vm, &fb_info->modelist);
         }
 
@@ -775,7 +783,6 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host)
 {
         struct fb_info *fb_info = &host->fb_info;
         struct fb_var_screeninfo *var = &fb_info->var;
-        struct mxsfb_platform_data *pdata = host->pdev->dev.platform_data;
         dma_addr_t fb_phys;
         void *fb_virt;
         unsigned fb_size;
@@ -789,15 +796,9 @@ static int mxsfb_init_fbinfo(struct mxsfb_info *host)
         fb_info->fix.visual = FB_VISUAL_TRUECOLOR,
         fb_info->fix.accel = FB_ACCEL_NONE;
 
-        if (pdata) {
-                host->ld_intf_width = pdata->ld_intf_width;
-                var->bits_per_pixel =
-                        pdata->default_bpp ? pdata->default_bpp : 16;
-        } else {
-                ret = mxsfb_init_fbinfo_dt(host);
-                if (ret)
-                        return ret;
-        }
+        ret = mxsfb_init_fbinfo_dt(host);
+        if (ret)
+                return ret;
 
         var->nonstd = 0;
         var->activate = FB_ACTIVATE_NOW;
@@ -853,7 +854,6 @@ static int mxsfb_probe(struct platform_device *pdev)
 {
         const struct of_device_id *of_id =
                         of_match_device(mxsfb_dt_ids, &pdev->dev);
-        struct mxsfb_platform_data *pdata = pdev->dev.platform_data;
         struct resource *res;
         struct mxsfb_info *host;
         struct fb_info *fb_info;
@@ -861,7 +861,7 @@ static int mxsfb_probe(struct platform_device *pdev)
         struct pinctrl *pinctrl;
         int panel_enable;
         enum of_gpio_flags flags;
-        int i, ret;
+        int ret;
 
         if (of_id)
                 pdev->id_entry = of_id->data;
@@ -933,13 +933,6 @@ static int mxsfb_probe(struct platform_device *pdev)
         if (ret != 0)
                 goto fb_release;
 
-        if (pdata) {
-                host->sync = pdata->sync;
-                for (i = 0; i < pdata->mode_count; i++)
-                        fb_add_videomode(&pdata->mode_list[i],
-                                         &fb_info->modelist);
-        }
-
         modelist = list_first_entry(&fb_info->modelist,
                         struct fb_modelist, list);
         fb_videomode_to_var(&fb_info->var, &modelist->mode);
diff --git a/include/linux/mxsfb.h b/include/linux/mxsfb.h
deleted file mode 100644
index b78465cdb26e..000000000000
--- a/include/linux/mxsfb.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; 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., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef __LINUX_MXSFB_H
-#define __LINUX_MXSFB_H
-
-#include <linux/fb.h>
-
-#define STMLCDIF_8BIT 1 /** pixel data bus to the display is of 8 bit width */
-#define STMLCDIF_16BIT 0 /** pixel data bus to the display is of 16 bit width */
-#define STMLCDIF_18BIT 2 /** pixel data bus to the display is of 18 bit width */
-#define STMLCDIF_24BIT 3 /** pixel data bus to the display is of 24 bit width */
-
-#define MXSFB_SYNC_DATA_ENABLE_HIGH_ACT (1 << 6)
-#define MXSFB_SYNC_DOTCLK_FAILING_ACT   (1 << 7) /* failing/negtive edge sampling */
-
-struct mxsfb_platform_data {
-        struct fb_videomode *mode_list;
-        unsigned mode_count;
-
-        unsigned default_bpp;
-
-        unsigned ld_intf_width; /* refer STMLCDIF_* macros */
-        u32 sync;               /* sync mask, contains MXSFB specifics not
-                                 * carried in fb_info->var.sync
-                                 */
-};
-
-#endif /* __LINUX_MXSFB_H */