OMAP: N770: remove HWA742 platform data

In an effort to clean up the old omapfb driver, this patch removes
HWA742 (the display chip used in N770) platform data. This can be done
as N770 is the only user of HWA742, and the platform data contains only
one field, te_connected, which we can just presume to be true in the
HWA742 driver.

This allows us to remove omapfb_set_ctrl_platform_data(), and the
mechanism to pass the platform data, in a later patch.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index f9efc036ba96d3cfbbe669e397aa5dfb5be7eeb3..7155d8ce516a32e1247c4c3b74d51989fc38f149 100644 (file)
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -31,7 +31,6 @@
 #include <plat/board.h>
 #include <plat/keypad.h>
 #include "common.h"
-#include <plat/hwa742.h>
 #include <plat/lcd_mipid.h>
 #include <plat/mmc.h>
 #include <plat/clock.h>
@@ -150,14 +149,9 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = {
        },
 };
 
-static struct hwa742_platform_data nokia770_hwa742_platform_data = {
-       .te_connected           = 1,
-};
-
 static void __init hwa742_dev_init(void)
 {
        clk_add_alias("hwa_sys_ck", NULL, "bclk", NULL);
-       omapfb_set_ctrl_platform_data(&nokia770_hwa742_platform_data);
 }
 
 /* assume no Mini-AB port */

diff --git a/arch/arm/plat-omap/include/plat/hwa742.h b/arch/arm/plat-omap/include/plat/hwa742.h
deleted file mode 100644 (file)
index 886248d..0000000
--- a/arch/arm/plat-omap/include/plat/hwa742.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _HWA742_H
-#define _HWA742_H
-
-struct hwa742_platform_data {
-       unsigned        te_connected:1;
-};
-
-#endif

diff --git a/drivers/video/omap/hwa742.c b/drivers/video/omap/hwa742.c
index 084aa0ac562b022d66343d245be79e69d763dd78..9f1d23c319cb0bb8b920fbd11b39ede3fe4f68d4 100644 (file)
--- a/drivers/video/omap/hwa742.c
+++ b/drivers/video/omap/hwa742.c
@@ -28,7 +28,6 @@
 #include <linux/interrupt.h>
 
 #include <plat/dma.h>
-#include <plat/hwa742.h>
 #include "omapfb.h"
 
 #define HWA742_REV_CODE_REG       0x0
@@ -942,7 +941,6 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,
        unsigned long sys_clk, pix_clk;
        int extif_mem_div;
        struct omapfb_platform_data *omapfb_conf;
-       struct hwa742_platform_data *ctrl_conf;
 
        BUG_ON(!fbdev->ext_if || !fbdev->int_ctrl);
 
@@ -951,13 +949,6 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,
        hwa742.int_ctrl = fbdev->int_ctrl;
 
        omapfb_conf = fbdev->dev->platform_data;
-       ctrl_conf = omapfb_conf->ctrl_platform_data;
-
-       if (ctrl_conf == NULL) {
-               dev_err(fbdev->dev, "HWA742: missing platform data\n");
-               r = -ENOENT;
-               goto err1;
-       }
 
        hwa742.sys_ck = clk_get(NULL, "hwa_sys_ck");
 
@@ -995,14 +986,12 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,
                goto err4;
        }
 
-       if (ctrl_conf->te_connected) {
-               if ((r = setup_tearsync(pix_clk, extif_mem_div)) < 0) {
-                       dev_err(hwa742.fbdev->dev,
-                              "HWA742: can't setup tearing synchronization\n");
-                       goto err4;
-               }
-               hwa742.te_connected = 1;
+       if ((r = setup_tearsync(pix_clk, extif_mem_div)) < 0) {
+               dev_err(hwa742.fbdev->dev,
+                       "HWA742: can't setup tearing synchronization\n");
+               goto err4;
        }
+       hwa742.te_connected = 1;
 
        hwa742.max_transmit_size = hwa742.extif->max_transmit_size;