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

Commit 6cd05430 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

Merge miscellaneous omapdss changes 

Most important changes:

* Remove OMAP4 HDMI gpio handling from board files
* Add vdda_hdmi_dac supply for HDMI to twl-common.c
* Calculate DSI clocks dynamically
* Remove DSS clock dividers from 4430sdp board file
* vram.c no longer uses OMAP's sDMA to clear the memory
* Fifomerge has been reverted
* Swap GFX and WB fifos to avoid underflows
parents c50e86ce b2f5976c

arch/arm/mach-omap2/board-4430sdp.c

+2 −71
Original line number Diff line number Diff line
@@ -601,29 +601,6 @@ static void __init omap_sfh7741prox_init(void) 
			__func__, OMAP4_SFH7741_ENABLE_GPIO, error);

}



static struct gpio sdp4430_hdmi_gpios[] = {

	{ HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },

	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH,	"hdmi_gpio_ls_oe" },

	{ HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },

};



static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)

{

	int status;



	status = gpio_request_array(sdp4430_hdmi_gpios,

				    ARRAY_SIZE(sdp4430_hdmi_gpios));

	if (status)

		pr_err("%s: Cannot request HDMI GPIOs\n", __func__);



	return status;

}



static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)

{

	gpio_free_array(sdp4430_hdmi_gpios, ARRAY_SIZE(sdp4430_hdmi_gpios));

}



static struct nokia_dsi_panel_data dsi1_panel = {

		.name		= "taal",

		.reset_gpio	= 102,
@@ -644,29 +621,6 @@ static struct omap_dss_device sdp4430_lcd_device = { 
	.phy.dsi		= {

		.module		= 0,

	},



	.clocks = {

		.dispc = {

			.channel = {

				/* Logic Clock = 172.8 MHz */

				.lck_div	= 1,

				/* Pixel Clock = 34.56 MHz */

				.pck_div	= 5,

				.lcd_clk_src	= OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC,

			},

			.dispc_fclk_src	= OMAP_DSS_CLK_SRC_FCK,

		},



		.dsi = {

			.regn		= 16,	/* Fint = 2.4 MHz */

			.regm		= 180,	/* DDR Clock = 216 MHz */

			.regm_dispc	= 5,	/* PLL1_CLK1 = 172.8 MHz */

			.regm_dsi	= 5,	/* PLL1_CLK2 = 172.8 MHz */



			.lp_clk_div	= 10,	/* LP Clock = 8.64 MHz */

			.dsi_fclk_src	= OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI,

		},

	},

	.channel		= OMAP_DSS_CHANNEL_LCD,

};
@@ -691,33 +645,12 @@ static struct omap_dss_device sdp4430_lcd2_device = { 


		.module		= 1,

	},



	.clocks = {

		.dispc = {

			.channel = {

				/* Logic Clock = 172.8 MHz */

				.lck_div	= 1,

				/* Pixel Clock = 34.56 MHz */

				.pck_div	= 5,

				.lcd_clk_src	= OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC,

			},

			.dispc_fclk_src	= OMAP_DSS_CLK_SRC_FCK,

		},



		.dsi = {

			.regn		= 16,	/* Fint = 2.4 MHz */

			.regm		= 180,	/* DDR Clock = 216 MHz */

			.regm_dispc	= 5,	/* PLL1_CLK1 = 172.8 MHz */

			.regm_dsi	= 5,	/* PLL1_CLK2 = 172.8 MHz */



			.lp_clk_div	= 10,	/* LP Clock = 8.64 MHz */

			.dsi_fclk_src	= OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI,

		},

	},

	.channel		= OMAP_DSS_CHANNEL_LCD2,

};



static struct omap_dss_hdmi_data sdp4430_hdmi_data = {

	.ct_cp_hpd_gpio = HDMI_GPIO_CT_CP_HPD,

	.ls_oe_gpio = HDMI_GPIO_LS_OE,

	.hpd_gpio = HDMI_GPIO_HPD,

};
@@ -725,8 +658,6 @@ static struct omap_dss_device sdp4430_hdmi_device = { 
	.name = "hdmi",

	.driver_name = "hdmi_panel",

	.type = OMAP_DISPLAY_TYPE_HDMI,

	.platform_enable = sdp4430_panel_enable_hdmi,

	.platform_disable = sdp4430_panel_disable_hdmi,

	.channel = OMAP_DSS_CHANNEL_DIGIT,

	.data = &sdp4430_hdmi_data,

};

arch/arm/mach-omap2/board-omap4panda.c

+2 −25
Original line number Diff line number Diff line
@@ -408,30 +408,9 @@ static struct omap_dss_device omap4_panda_dvi_device = { 
	.channel		= OMAP_DSS_CHANNEL_LCD2,

};



static struct gpio panda_hdmi_gpios[] = {

	{ HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },

	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },

	{ HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },

};



static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)

{

	int status;



	status = gpio_request_array(panda_hdmi_gpios,

				    ARRAY_SIZE(panda_hdmi_gpios));

	if (status)

		pr_err("Cannot request HDMI GPIOs\n");



	return status;

}



static void omap4_panda_panel_disable_hdmi(struct omap_dss_device *dssdev)

{

	gpio_free_array(panda_hdmi_gpios, ARRAY_SIZE(panda_hdmi_gpios));

}



static struct omap_dss_hdmi_data omap4_panda_hdmi_data = {

	.ct_cp_hpd_gpio = HDMI_GPIO_CT_CP_HPD,

	.ls_oe_gpio = HDMI_GPIO_LS_OE,

	.hpd_gpio = HDMI_GPIO_HPD,

};
@@ -439,8 +418,6 @@ static struct omap_dss_device omap4_panda_hdmi_device = { 
	.name = "hdmi",

	.driver_name = "hdmi_panel",

	.type = OMAP_DISPLAY_TYPE_HDMI,

	.platform_enable = omap4_panda_panel_enable_hdmi,

	.platform_disable = omap4_panda_panel_disable_hdmi,

	.channel = OMAP_DSS_CHANNEL_DIGIT,

	.data = &omap4_panda_hdmi_data,

};

arch/arm/mach-omap2/twl-common.c

+6 −0
Original line number Diff line number Diff line
@@ -258,6 +258,10 @@ static struct twl4030_usb_data omap4_usb_pdata = { 
	.phy_suspend	= omap4430_phy_suspend,

};



static struct regulator_consumer_supply omap4_vdda_hdmi_dac_supplies[] = {

	REGULATOR_SUPPLY("vdda_hdmi_dac", "omapdss_hdmi"),

};



static struct regulator_init_data omap4_vdac_idata = {

	.constraints = {

		.min_uV			= 1800000,
@@ -267,6 +271,8 @@ static struct regulator_init_data omap4_vdac_idata = { 
		.valid_ops_mask		= REGULATOR_CHANGE_MODE

					| REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies	= ARRAY_SIZE(omap4_vdda_hdmi_dac_supplies),

	.consumer_supplies	= omap4_vdda_hdmi_dac_supplies,

	.supply_regulator	= "V2V1",

};

drivers/video/omap/hwa742.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/clk.h>

#include <linux/interrupt.h>



#include <plat/dma.h>

#include "omapfb.h"



#define HWA742_REV_CODE_REG       0x0

drivers/video/omap/lcd_ams_delta.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/gpio.h>



#include <plat/board-ams-delta.h>

#include <mach/hardware.h>



#include "omapfb.h"