OMAP4: DSS2: HDMI: Move HDMI IP independent generic header

Some of the header file definitions that are there in the hdmi.h are generic
and can be used across OMAP's, Thus moving generic definition to new file.

Signed-off-by: Mythri P K <mythripk@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

4 files changed, 95 insertions, 71 deletions

diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 6aeb1f5505d0..d790580a6a3b 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -155,24 +155,6 @@ struct dsi_clock_info {
         bool use_sys_clk;
 };
 
-enum hdmi_clk_refsel {
-        HDMI_REFSEL_PCLK = 0,
-        HDMI_REFSEL_REF1 = 1,
-        HDMI_REFSEL_REF2 = 2,
-        HDMI_REFSEL_SYSCLK = 3
-};
-
-/* HDMI PLL structure */
-struct hdmi_pll_info {
-        u16 regn;
-        u16 regm;
-        u32 regmf;
-        u16 regm2;
-        u16 regsd;
-        u16 dcofreq;
-        enum hdmi_clk_refsel refsel;
-};
-
 struct seq_file;
 struct platform_device;
 
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index c387bf47ee0e..bf76c87024b2 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -39,6 +39,7 @@
 #include <sound/pcm_params.h>
 #endif
 
+#include "ti_hdmi.h"
 #include "dss.h"
 #include "hdmi.h"
 #include "dss_features.h"
diff --git a/drivers/video/omap2/dss/hdmi.h b/drivers/video/omap2/dss/hdmi.h
index 02342f6395c2..cb50f6a3ad09 100644
--- a/drivers/video/omap2/dss/hdmi.h
+++ b/drivers/video/omap2/dss/hdmi.h
@@ -198,39 +198,12 @@ struct hdmi_reg { u16 idx; };
 #define REG_GET(base, idx, start, end) \
         FLD_GET(hdmi_read_reg(base, idx), start, end)
 
-struct hdmi_video_timings {
-        u16 x_res;
-        u16 y_res;
-        /* Unit: KHz */
-        u32 pixel_clock;
-        u16 hsw;
-        u16 hfp;
-        u16 hbp;
-        u16 vsw;
-        u16 vfp;
-        u16 vbp;
-};
-
-/* HDMI timing structure */
-struct hdmi_timings {
-        struct hdmi_video_timings timings;
-        int vsync_pol;
-        int hsync_pol;
-};
-
 enum hdmi_phy_pwr {
         HDMI_PHYPWRCMD_OFF = 0,
         HDMI_PHYPWRCMD_LDOON = 1,
         HDMI_PHYPWRCMD_TXON = 2
 };
 
-enum hdmi_pll_pwr {
-        HDMI_PLLPWRCMD_ALLOFF = 0,
-        HDMI_PLLPWRCMD_PLLONLY = 1,
-        HDMI_PLLPWRCMD_BOTHON_ALLCLKS = 2,
-        HDMI_PLLPWRCMD_BOTHON_NOPHYCLK = 3
-};
-
 enum hdmi_core_inputbus_width {
         HDMI_INPUT_8BIT = 0,
         HDMI_INPUT_10BIT = 1,
@@ -259,11 +232,6 @@ enum hdmi_core_packet_mode {
         HDMI_PACKETMODE48BITPERPIXEL = 7
 };
 
-enum hdmi_core_hdmi_dvi {
-        HDMI_DVI = 0,
-        HDMI_HDMI = 1
-};
-
 enum hdmi_core_tclkselclkmult {
         HDMI_FPLL05IDCK = 0,
         HDMI_FPLL10IDCK = 1,
@@ -564,27 +532,6 @@ struct hdmi_video_interface {
         int     tm;     /* Timing mode */
 };
 
-struct hdmi_cm {
-        int     code;
-        int     mode;
-};
-
-struct hdmi_config {
-        struct hdmi_timings timings;
-        u16     interlace;
-        struct hdmi_cm cm;
-};
-
-struct hdmi_ip_data {
-        void __iomem    *base_wp;       /* HDMI wrapper */
-        unsigned long   core_sys_offset;
-        unsigned long   core_av_offset;
-        unsigned long   pll_offset;
-        unsigned long   phy_offset;
-        struct hdmi_config cfg;
-        struct hdmi_pll_info pll_data;
-};
-
 struct hdmi_audio_format {
         enum hdmi_stereo_channels               stereo_channels;
         u8                                      active_chnnls_msk;
diff --git a/drivers/video/omap2/dss/ti_hdmi.h b/drivers/video/omap2/dss/ti_hdmi.h
new file mode 100644
index 000000000000..f0e508ec28d1
--- /dev/null
+++ b/drivers/video/omap2/dss/ti_hdmi.h
@@ -0,0 +1,94 @@
+/*
+ * ti_hdmi.h
+ *
+ * HDMI driver definition for TI OMAP4, DM81xx, DM38xx  Processor.
+ *
+ * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * 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/>.
+ */
+
+#ifndef _TI_HDMI_H
+#define _TI_HDMI_H
+
+enum hdmi_pll_pwr {
+        HDMI_PLLPWRCMD_ALLOFF = 0,
+        HDMI_PLLPWRCMD_PLLONLY = 1,
+        HDMI_PLLPWRCMD_BOTHON_ALLCLKS = 2,
+        HDMI_PLLPWRCMD_BOTHON_NOPHYCLK = 3
+};
+
+enum hdmi_core_hdmi_dvi {
+        HDMI_DVI = 0,
+        HDMI_HDMI = 1
+};
+
+enum hdmi_clk_refsel {
+        HDMI_REFSEL_PCLK = 0,
+        HDMI_REFSEL_REF1 = 1,
+        HDMI_REFSEL_REF2 = 2,
+        HDMI_REFSEL_SYSCLK = 3
+};
+
+struct hdmi_video_timings {
+        u16 x_res;
+        u16 y_res;
+        /* Unit: KHz */
+        u32 pixel_clock;
+        u16 hsw;
+        u16 hfp;
+        u16 hbp;
+        u16 vsw;
+        u16 vfp;
+        u16 vbp;
+};
+
+/* HDMI timing structure */
+struct hdmi_timings {
+        struct hdmi_video_timings timings;
+        int vsync_pol;
+        int hsync_pol;
+};
+
+struct hdmi_cm {
+        int     code;
+        int     mode;
+};
+
+struct hdmi_config {
+        struct hdmi_timings timings;
+        u16     interlace;
+        struct hdmi_cm cm;
+};
+
+/* HDMI PLL structure */
+struct hdmi_pll_info {
+        u16 regn;
+        u16 regm;
+        u32 regmf;
+        u16 regm2;
+        u16 regsd;
+        u16 dcofreq;
+        enum hdmi_clk_refsel refsel;
+};
+
+struct hdmi_ip_data {
+        void __iomem    *base_wp;       /* HDMI wrapper */
+        unsigned long   core_sys_offset;
+        unsigned long   core_av_offset;
+        unsigned long   pll_offset;
+        unsigned long   phy_offset;
+        struct hdmi_config cfg;
+        struct hdmi_pll_info pll_data;
+};
+#endif