OMAP: Revert DSS DRM patches

Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>

10 files changed, 9 insertions, 284 deletions

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 126f036bf4c..2430531b223 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -190,7 +190,6 @@ static struct panel_generic_dpi_data dvi_panel = {
 	.name			= "generic",
 	.platform_enable	= sdp3430_panel_enable_dvi,
 	.platform_disable	= sdp3430_panel_disable_dvi,
-	.i2c_bus_num		= 3,
 };
 
 static struct omap_dss_device sdp3430_dvi_device = {
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 158a1010449..93e0570baf5 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -655,6 +655,15 @@ static struct omap_dss_device sdp4430_hdmi_device = {
 	.name = "hdmi",
 	.driver_name = "hdmi_panel",
 	.type = OMAP_DISPLAY_TYPE_HDMI,
+	.clocks	= {
+		.dispc	= {
+			.dispc_fclk_src	= OMAP_DSS_CLK_SRC_FCK,
+		},
+		.hdmi	= {
+			.regn	= 15,
+			.regm2	= 1,
+		},
+	},
 	.platform_enable = sdp4430_panel_enable_hdmi,
 	.platform_disable = sdp4430_panel_disable_hdmi,
 	.channel = OMAP_DSS_CHANNEL_DIGIT,
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index 73ec9fb8960..1325085e453 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -289,7 +289,6 @@ static struct panel_generic_dpi_data lcd_panel = {
 	.name			= "sharp_lq",
 	.platform_enable	= am3517_evm_panel_enable_lcd,
 	.platform_disable	= am3517_evm_panel_disable_lcd,
-	.i2c_bus_num		= 3,
 };
 
 static struct omap_dss_device am3517_evm_lcd_device = {
@@ -338,7 +337,6 @@ static struct panel_generic_dpi_data dvi_panel = {
 	.name			= "generic",
 	.platform_enable	= am3517_evm_panel_enable_dvi,
 	.platform_disable	= am3517_evm_panel_disable_dvi,
-	.i2c_bus_num		= 3,
 };
 
 static struct omap_dss_device am3517_evm_dvi_device = {
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index 32e1f6a4e35..38179c17550 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -232,7 +232,6 @@ static struct panel_generic_dpi_data lcd_panel = {
 	.name			= "toppoly_tdo35s",
 	.platform_enable	= cm_t35_panel_enable_lcd,
 	.platform_disable	= cm_t35_panel_disable_lcd,
-	.i2c_bus_num		= 3,
 };
 
 static struct omap_dss_device cm_t35_lcd_device = {
@@ -247,7 +246,6 @@ static struct panel_generic_dpi_data dvi_panel = {
 	.name			= "generic",
 	.platform_enable	= cm_t35_panel_enable_dvi,
 	.platform_disable	= cm_t35_panel_disable_dvi,
-	.i2c_bus_num		= 3,
 };
 
 static struct omap_dss_device cm_t35_dvi_device = {
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 41f1a6a0717..99a42432ac9 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -142,7 +142,6 @@ static struct panel_generic_dpi_data lcd_panel = {
 	.name			= "generic",
 	.platform_enable        = devkit8000_panel_enable_lcd,
 	.platform_disable       = devkit8000_panel_disable_lcd,
-	.i2c_bus_num		= 3,
 };
 
 static struct omap_dss_device devkit8000_lcd_device = {
@@ -157,7 +156,6 @@ static struct panel_generic_dpi_data dvi_panel = {
 	.name			= "generic",
 	.platform_enable        = devkit8000_panel_enable_dvi,
 	.platform_disable       = devkit8000_panel_disable_dvi,
-	.i2c_bus_num		= 3,
 };
 
 static struct omap_dss_device devkit8000_dvi_device = {
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 4899f828712..cfa2870df34 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -459,7 +459,6 @@ static struct panel_generic_dpi_data dvi_panel = {
 	.name			= "generic",
 	.platform_enable	= igep2_enable_dvi,
 	.platform_disable	= igep2_disable_dvi,
-	.i2c_bus_num		= 3,
 };
 
 static struct omap_dss_device igep2_dvi_device = {
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index c48b0b65b7c..d73ec628f83 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -207,7 +207,6 @@ static struct panel_generic_dpi_data dvi_panel = {
 	.name = "generic",
 	.platform_enable = beagle_enable_dvi,
 	.platform_disable = beagle_disable_dvi,
-	.i2c_bus_num = 3,
 };
 
 static struct omap_dss_device beagle_dvi_device = {
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 78345d0d955..15c69a0c1ce 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -251,7 +251,6 @@ static struct panel_generic_dpi_data dvi_panel = {
 	.name			= "generic",
 	.platform_enable	= omap3_evm_enable_dvi,
 	.platform_disable	= omap3_evm_disable_dvi,
-	.i2c_bus_num		= 3,
 };
 
 static struct omap_dss_device omap3_evm_dvi_device = {
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index f40f496c636..ba13e1d5d0a 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -130,7 +130,6 @@ static struct panel_generic_dpi_data lcd_panel = {
 	.name			= "generic",
 	.platform_enable	= omap3_stalker_enable_lcd,
 	.platform_disable	= omap3_stalker_disable_lcd,
-	.i2c_bus_num		= 3,
 };
 
 static struct omap_dss_device omap3_stalker_lcd_device = {
@@ -184,7 +183,6 @@ static struct panel_generic_dpi_data dvi_panel = {
 	.name			= "generic",
 	.platform_enable	= omap3_stalker_enable_dvi,
 	.platform_disable	= omap3_stalker_disable_dvi,
-	.i2c_bus_num		= 3,
 };
 
 static struct omap_dss_device omap3_stalker_dvi_device = {
diff --git a/arch/arm/plat-omap/include/plat/edid.h b/arch/arm/plat-omap/include/plat/edid.h
deleted file mode 100644
index 896b98dc038..00000000000
--- a/arch/arm/plat-omap/include/plat/edid.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * linux/drivers/video/omap2/dss/edid.c
- *
- * Copyright (C) 2009 Texas Instruments
- * Author: Mythri P K <mythripk@ti.com>
- *		with some of the ENUM's and structure derived from Yong Zhi's
- *		hdmi.h(Now obsolete)
- *
- * EDID.c to read the EDID content , given the 256 Bytes EDID.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- * History:
- */
-
-#ifndef _EDID_H_
-#define _EDID_H_
-
-/* HDMI EDID Extension Data Block Tags  */
-#define HDMI_EDID_EX_DATABLOCK_TAG_MASK		0xE0
-#define HDMI_EDID_EX_DATABLOCK_LEN_MASK		0x1F
-#define HDMI_EDID_EX_SUPPORTS_AI_MASK			0x80
-
-#define EDID_TIMING_DESCRIPTOR_SIZE		0x12
-#define EDID_DESCRIPTOR_BLOCK0_ADDRESS		0x36
-#define EDID_DESCRIPTOR_BLOCK1_ADDRESS		0x80
-#define EDID_SIZE_BLOCK0_TIMING_DESCRIPTOR	4
-#define EDID_SIZE_BLOCK1_TIMING_DESCRIPTOR	4
-
-/* EDID Detailed Timing	Info 0 begin offset */
-#define HDMI_EDID_DETAILED_TIMING_OFFSET	0x36
-
-#define HDMI_EDID_PIX_CLK_OFFSET		0
-#define HDMI_EDID_H_ACTIVE_OFFSET		2
-#define HDMI_EDID_H_BLANKING_OFFSET		3
-#define HDMI_EDID_V_ACTIVE_OFFSET		5
-#define HDMI_EDID_V_BLANKING_OFFSET		6
-#define HDMI_EDID_H_SYNC_OFFSET			8
-#define HDMI_EDID_H_SYNC_PW_OFFSET		9
-#define HDMI_EDID_V_SYNC_OFFSET			10
-#define HDMI_EDID_V_SYNC_PW_OFFSET		11
-#define HDMI_EDID_H_IMAGE_SIZE_OFFSET		12
-#define HDMI_EDID_V_IMAGE_SIZE_OFFSET		13
-#define HDMI_EDID_H_BORDER_OFFSET		15
-#define HDMI_EDID_V_BORDER_OFFSET		16
-#define HDMI_EDID_FLAGS_OFFSET			17
-
-#define HDMI_IEEE_REGISTRATION_ID		0x000c03
-
-/* HDMI Connected States */
-#define HDMI_STATE_NOMONITOR	0 /* No HDMI monitor connected*/
-#define HDMI_STATE_CONNECTED	1 /* HDMI monitor connected but powered off */
-#define HDMI_STATE_ON		2 /* HDMI monitor connected and powered on*/
-
-/* HDMI EDID Length */
-#define HDMI_EDID_MAX_LENGTH			512
-
-/* HDMI EDID DTDs */
-#define HDMI_EDID_MAX_DTDS			4
-
-/* HDMI EDID DTD Tags */
-#define HDMI_EDID_DTD_TAG_MONITOR_NAME		0xFC
-#define HDMI_EDID_DTD_TAG_MONITOR_SERIALNUM	0xFF
-#define HDMI_EDID_DTD_TAG_MONITOR_LIMITS	0xFD
-#define HDMI_EDID_DTD_TAG_STANDARD_TIMING_DATA	0xFA
-#define HDMI_EDID_DTD_TAG_COLOR_POINT_DATA	0xFB
-#define HDMI_EDID_DTD_TAG_ASCII_STRING		0xFE
-
-#define HDMI_IMG_FORMAT_MAX_LENGTH		20
-#define HDMI_VIDEO_NATIVE_DTDS_MASK		0x0f
-#define HDMI_AUDIO_FORMAT_MAX_LENGTH		10
-#define HDMI_AUDIO_BASIC_MASK			0x40
-
-/* HDMI EDID Extenion Data Block Values: Video */
-#define HDMI_EDID_EX_VIDEO_NATIVE		0x80
-#define HDMI_EDID_EX_VIDEO_MASK			0x7F
-#define HDMI_EDID_EX_VIDEO_MAX			35
-
-#define HDMI_EDID_EX_VIDEO_640x480p_60Hz_4_3	1
-#define HDMI_EDID_EX_VIDEO_720x480p_60Hz_4_3	2
-#define HDMI_EDID_EX_VIDEO_720x480p_60Hz_16_9	3
-#define HDMI_EDID_EX_VIDEO_1280x720p_60Hz_16_9	4
-#define HDMI_EDID_EX_VIDEO_1920x1080i_60Hz_16_9	5
-#define HDMI_EDID_EX_VIDEO_720x480i_60Hz_4_3	6
-#define HDMI_EDID_EX_VIDEO_720x480i_60Hz_16_9	7
-#define HDMI_EDID_EX_VIDEO_720x240p_60Hz_4_3	8
-#define HDMI_EDID_EX_VIDEO_720x240p_60Hz_16_9	9
-#define HDMI_EDID_EX_VIDEO_2880x480i_60Hz_4_3	10
-#define HDMI_EDID_EX_VIDEO_2880x480i_60Hz_16_9	11
-#define HDMI_EDID_EX_VIDEO_2880x480p_60Hz_4_3	12
-#define HDMI_EDID_EX_VIDEO_2880x480p_60Hz_16_9	13
-#define HDMI_EDID_EX_VIDEO_1440x480p_60Hz_4_3	14
-#define HDMI_EDID_EX_VIDEO_1440x480p_60Hz_16_9	15
-#define HDMI_EDID_EX_VIDEO_1920x1080p_60Hz_16_9	16
-#define HDMI_EDID_EX_VIDEO_720x576p_50Hz_4_3	17
-#define HDMI_EDID_EX_VIDEO_720x576p_50Hz_16_9	18
-#define HDMI_EDID_EX_VIDEO_1280x720p_50Hz_16_9	19
-#define HDMI_EDID_EX_VIDEO_1920x1080i_50Hz_16_9	20
-#define HDMI_EDID_EX_VIDEO_720x576i_50Hz_4_3	21
-#define HDMI_EDID_EX_VIDEO_720x576i_50Hz_16_9	22
-#define HDMI_EDID_EX_VIDEO_720x288p_50Hz_4_3	23
-#define HDMI_EDID_EX_VIDEO_720x288p_50Hz_16_9	24
-#define HDMI_EDID_EX_VIDEO_2880x576i_50Hz_4_3	25
-#define HDMI_EDID_EX_VIDEO_2880x576i_50Hz_16_9	26
-#define HDMI_EDID_EX_VIDEO_2880x288p_50Hz_4_3	27
-#define HDMI_EDID_EX_VIDEO_2880x288p_50Hz_16_9	28
-#define HDMI_EDID_EX_VIDEO_1440x576p_50Hz_4_3	29
-#define HDMI_EDID_EX_VIDEO_1440x576p_50Hz_16_9	30
-#define HDMI_EDID_EX_VIDEO_1920x1080p_50Hz_16_9	31
-#define HDMI_EDID_EX_VIDEO_1920x1080p_24Hz_16_9	32
-#define HDMI_EDID_EX_VIDEO_1920x1080p_25Hz_16_9	33
-#define HDMI_EDID_EX_VIDEO_1920x1080p_30Hz_16_9	34
-
-#define OMAP_HDMI_TIMINGS_NB			34
-#define OMAP_HDMI_TIMINGS_VESA_START		15
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum extension_edid_db {
-	DATABLOCK_AUDIO	= 1,
-	DATABLOCK_VIDEO	= 2,
-	DATABLOCK_VENDOR = 3,
-	DATABLOCK_SPEAKERS = 4,
-};
-
-struct img_edid {
-	bool pref;
-	int code;
-};
-
-struct image_format {
-	int length;
-	struct img_edid fmt[HDMI_IMG_FORMAT_MAX_LENGTH];
-};
-
-struct audio_edid {
-	int num_of_ch;
-	int format;
-};
-
-struct audio_format {
-	int length;
-	struct audio_edid fmt[HDMI_AUDIO_FORMAT_MAX_LENGTH];
-};
-
-struct latency {
-	/* vid: if indicated, value=1+ms/2 with a max of 251 meaning 500ms */
-	int vid_latency;
-
-	int aud_latency;
-	int int_vid_latency;
-	int int_aud_latency;
-};
-
-struct deep_color {
-	bool bit_30;
-	bool bit_36;
-	int max_tmds_freq;
-};
-
-/*  Video Descriptor Block  */
-struct HDMI_EDID_DTD_VIDEO {
-	u16	pixel_clock;		/* 54-55 */
-	u8	horiz_active;		/* 56 */
-	u8	horiz_blanking;		/* 57 */
-	u8	horiz_high;		/* 58 */
-	u8	vert_active;		/* 59 */
-	u8	vert_blanking;		/* 60 */
-	u8	vert_high;		/* 61 */
-	u8	horiz_sync_offset;	/* 62 */
-	u8	horiz_sync_pulse;	/* 63 */
-	u8	vert_sync_pulse;	/* 64 */
-	u8	sync_pulse_high;	/* 65 */
-	u8	horiz_image_size;	/* 66 */
-	u8	vert_image_size;	/* 67 */
-	u8	image_size_high;	/* 68 */
-	u8	horiz_border;		/* 69 */
-	u8	vert_border;		/* 70 */
-	u8	misc_settings;		/* 71 */
-};
-
-/*	Monitor Limits Descriptor Block	*/
-struct HDMI_EDID_DTD_MONITOR {
-	u16	pixel_clock;		/* 54-55*/
-	u8	_reserved1;		/* 56 */
-	u8	block_type;		/* 57 */
-	u8	_reserved2;		/* 58 */
-	u8	min_vert_freq;		/* 59 */
-	u8	max_vert_freq;		/* 60 */
-	u8	min_horiz_freq;		/* 61 */
-	u8	max_horiz_freq;		/* 62 */
-	u8	pixel_clock_mhz;	/* 63 */
-	u8	GTF[2];			/* 64 -65 */
-	u8	start_horiz_freq;	/* 66	*/
-	u8	C;			/* 67 */
-	u8	M[2];			/* 68-69 */
-	u8	K;			/* 70 */
-	u8	J;			/* 71 */
-
-} __packed;
-
-/* Text Descriptor Block */
-struct HDMI_EDID_DTD_TEXT {
-	u16	pixel_clock;		/* 54-55 */
-	u8	_reserved1;		/* 56 */
-	u8	block_type;		/* 57 */
-	u8	_reserved2;		/* 58 */
-	u8	text[13];		/* 59-71 */
-} __packed;
-
-/* DTD Union */
-union HDMI_EDID_DTD {
-	struct HDMI_EDID_DTD_VIDEO	video;
-	struct HDMI_EDID_DTD_TEXT	monitor_name;
-	struct HDMI_EDID_DTD_TEXT	monitor_serial_number;
-	struct HDMI_EDID_DTD_TEXT	ascii;
-	struct HDMI_EDID_DTD_MONITOR	monitor_limits;
-} __packed;
-
-/*	EDID struct	*/
-struct HDMI_EDID {
-	u8	header[8];		/* 00-07 */
-	u16	manufacturerID;		/* 08-09 */
-	u16	product_id;		/* 10-11 */
-	u32	serial_number;		/* 12-15 */
-	u8	week_manufactured;	/* 16 */
-	u8	year_manufactured;	/* 17 */
-	u8	edid_version;		/* 18 */
-	u8	edid_revision;		/* 19 */
-	u8	video_in_definition;	/* 20 */
-	u8	max_horiz_image_size;	/* 21 */
-	u8	max_vert_image_size;	/* 22 */
-	u8	display_gamma;		/* 23 */
-	u8	power_features;		/* 24 */
-	u8	chroma_info[10];	/* 25-34 */
-	u8	timing_1;		/* 35 */
-	u8	timing_2;		/* 36 */
-	u8	timing_3;		/* 37 */
-	u8	std_timings[16];	/* 38-53 */
-
-	union HDMI_EDID_DTD DTD[4];	/* 54-125 */
-
-	u8	extension_edid;		/* 126 */
-	u8	checksum;		/* 127 */
-	u8	extension_tag;		/* 00 (extensions follow EDID) */
-	u8	extention_rev;		/* 01 */
-	u8	offset_dtd;		/* 02 */
-	u8	num_dtd;		/* 03 */
-
-	u8	data_block[123];	/* 04 - 126 */
-	u8	extension_checksum;	/* 127 */
-
-	u8	ext_datablock[256];
-} __packed;
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif
-