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

Commit 088962c2 authored by Andrew de Quincey's avatar Andrew de Quincey Committed by Tony Lindgren
Browse files

ARM: OMAP1: Make 770 LCD work 



Make 770 LCD work by adding clk_add_alias().
Also remove the old unused functions.

Note that the clk_add_alias() could probably be moved
to arch/arm/clkdev.c later on.

Cc: linux-fbdev-devel@lists.sourceforge.net
Signed-off-by: default avatarAndrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: default avatarImre Deak <imre.deak@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent f5525786

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

+12 −0
Original line number Diff line number Diff line
@@ -33,9 +33,11 @@ 
#include <mach/common.h>

#include <mach/dsp_common.h>

#include <mach/omapfb.h>

#include <mach/hwa742.h>

#include <mach/lcd_mipid.h>

#include <mach/mmc.h>

#include <mach/usb.h>

#include <mach/clock.h>



#define ADS7846_PENDOWN_GPIO	15
@@ -163,6 +165,15 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = { 
	},

};



static struct hwa742_platform_data nokia770_hwa742_platform_data = {

	.te_connected		= 1,

};



static void 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 */
@@ -371,6 +382,7 @@ static void __init omap_nokia770_init(void) 
	omap_serial_init();

	omap_register_i2c_bus(1, 100, NULL, 0);

	omap_dsp_init();

	hwa742_dev_init();

	ads7846_dev_init();

	mipid_dev_init();

	omap_usb_init(&nokia770_usb_config);

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

+0 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ 
#define _HWA742_H



struct hwa742_platform_data {

	void		(*power_up)(struct device *dev);

	void		(*power_down)(struct device *dev);

	unsigned long	(*get_clock_rate)(struct device *dev);



	unsigned	te_connected:1;

};

drivers/video/omap/hwa742.c

+10 −16
Original line number Diff line number Diff line
@@ -133,8 +133,7 @@ struct { 
	struct lcd_ctrl_extif	*extif;

	struct lcd_ctrl		*int_ctrl;



	void			(*power_up)(struct device *dev);

	void			(*power_down)(struct device *dev);

	struct clk		*sys_ck;

} hwa742;



struct lcd_ctrl hwa742_ctrl;
@@ -915,14 +914,13 @@ static void hwa742_suspend(void) 
	hwa742_set_update_mode(OMAPFB_UPDATE_DISABLED);

	/* Enable sleep mode */

	hwa742_write_reg(HWA742_POWER_SAVE, 1 << 1);

	if (hwa742.power_down != NULL)

		hwa742.power_down(hwa742.fbdev->dev);

	clk_disable(hwa742.sys_ck);

}



static void hwa742_resume(void)

{

	if (hwa742.power_up != NULL)

		hwa742.power_up(hwa742.fbdev->dev);

	clk_enable(hwa742.sys_ck);



	/* Disable sleep mode */

	hwa742_write_reg(HWA742_POWER_SAVE, 0);

	while (1) {
@@ -955,14 +953,13 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode, 
	omapfb_conf = fbdev->dev->platform_data;

	ctrl_conf = omapfb_conf->ctrl_platform_data;



	if (ctrl_conf == NULL || ctrl_conf->get_clock_rate == NULL) {

	if (ctrl_conf == NULL) {

		dev_err(fbdev->dev, "HWA742: missing platform data\n");

		r = -ENOENT;

		goto err1;

	}



	hwa742.power_down = ctrl_conf->power_down;

	hwa742.power_up = ctrl_conf->power_up;

	hwa742.sys_ck = clk_get(NULL, "hwa_sys_ck");



	spin_lock_init(&hwa742.req_lock);
@@ -972,12 +969,11 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode, 
	if ((r = hwa742.extif->init(fbdev)) < 0)

		goto err2;



	ext_clk = ctrl_conf->get_clock_rate(fbdev->dev);

	ext_clk = clk_get_rate(hwa742.sys_ck);

	if ((r = calc_extif_timings(ext_clk, &extif_mem_div)) < 0)

		goto err3;

	hwa742.extif->set_timings(&hwa742.reg_timings);

	if (hwa742.power_up != NULL)

		hwa742.power_up(fbdev->dev);

	clk_enable(hwa742.sys_ck);



	calc_hwa742_clk_rates(ext_clk, &sys_clk, &pix_clk);

	if ((r = calc_extif_timings(sys_clk, &extif_mem_div)) < 0)
@@ -1040,8 +1036,7 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode, 


	return 0;

err4:

	if (hwa742.power_down != NULL)

		hwa742.power_down(fbdev->dev);

	clk_disable(hwa742.sys_ck);

err3:

	hwa742.extif->cleanup();

err2:
@@ -1055,8 +1050,7 @@ static void hwa742_cleanup(void) 
	hwa742_set_update_mode(OMAPFB_UPDATE_DISABLED);

	hwa742.extif->cleanup();

	hwa742.int_ctrl->cleanup();

	if (hwa742.power_down != NULL)

		hwa742.power_down(hwa742.fbdev->dev);

	clk_disable(hwa742.sys_ck);

}



struct lcd_ctrl hwa742_ctrl = {