Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58e0d6ab authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
parent f0e41ab5

arch/arm/mach-omap1/board-nokia770.c

+0 −6
Original line number Diff line number Diff line
@@ -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 */

arch/arm/plat-omap/include/plat/hwa742.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#ifndef _HWA742_H

#define _HWA742_H



struct hwa742_platform_data {

	unsigned	te_connected:1;

};



#endif

drivers/video/omap/hwa742.c

+5 −16
Original line number Diff line number Diff line
@@ -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;

	}



	hwa742.max_transmit_size = hwa742.extif->max_transmit_size;