drm/exynos: cleanup exynos_hdmi.h

The some contents of the exynos_hdmi.h are used only in exynos_hdmi.c,
so move them to exynos_hdmi.c.

Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 3fe5b2e72f1e1331363574bb919f85a2ad315b99..3583a7bdac247a48011fb1a1c90cbd0e842d7f04 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -45,6 +45,42 @@
 #define MAX_HEIGHT             1080
 #define get_hdmi_context(dev)  platform_get_drvdata(to_platform_device(dev))
 
+struct hdmi_resources {
+       struct clk                      *hdmi;
+       struct clk                      *sclk_hdmi;
+       struct clk                      *sclk_pixel;
+       struct clk                      *sclk_hdmiphy;
+       struct clk                      *hdmiphy;
+       struct regulator_bulk_data      *regul_bulk;
+       int                             regul_count;
+};
+
+struct hdmi_context {
+       struct device                   *dev;
+       struct drm_device               *drm_dev;
+       struct fb_videomode             *default_timing;
+       unsigned int                    is_v13:1;
+       unsigned int                    default_win;
+       unsigned int                    default_bpp;
+       bool                            hpd_handle;
+       bool                            enabled;
+
+       struct resource                 *regs_res;
+       void __iomem                    *regs;
+       unsigned int                    irq;
+       struct workqueue_struct         *wq;
+       struct work_struct              hotplug_work;
+
+       struct i2c_client               *ddc_port;
+       struct i2c_client               *hdmiphy_port;
+
+       /* current hdmiphy conf index */
+       int cur_conf;
+
+       struct hdmi_resources           res;
+       void                            *parent_ctx;
+};
+
 /* HDMI Version 1.3 */
 static const u8 hdmiphy_v13_conf27[32] = {
        0x01, 0x05, 0x00, 0xD8, 0x10, 0x1C, 0x30, 0x40,

diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.h b/drivers/gpu/drm/exynos/exynos_hdmi.h
index 040ecadb912eb07cc36924dfc0a9f2fd1a801e0d..1c3b6d8f1fe796fac9d9b37bd341f703e740861f 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_hdmi.h
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.h
@@ -28,48 +28,6 @@
 #ifndef _EXYNOS_HDMI_H_
 #define _EXYNOS_HDMI_H_
 
-struct hdmi_resources {
-       struct clk *hdmi;
-       struct clk *sclk_hdmi;
-       struct clk *sclk_pixel;
-       struct clk *sclk_hdmiphy;
-       struct clk *hdmiphy;
-       struct regulator_bulk_data *regul_bulk;
-       int regul_count;
-};
-
-struct hdmi_context {
-       struct device                   *dev;
-       struct drm_device               *drm_dev;
-       struct fb_videomode             *default_timing;
-       unsigned int                    is_v13:1;
-       unsigned int                    default_win;
-       unsigned int                    default_bpp;
-       bool                            hpd_handle;
-       bool                            enabled;
-
-       struct resource                 *regs_res;
-       /** base address of HDMI registers */
-       void __iomem *regs;
-       /** HDMI hotplug interrupt */
-       unsigned int irq;
-       /** workqueue for delayed work */
-       struct workqueue_struct *wq;
-       /** hotplug handling work */
-       struct work_struct hotplug_work;
-
-       struct i2c_client *ddc_port;
-       struct i2c_client *hdmiphy_port;
-
-       /** current hdmiphy conf index */
-       int cur_conf;
-       /** other resources */
-       struct hdmi_resources res;
-
-       void *parent_ctx;
-};
-
-
 void hdmi_attach_ddc_client(struct i2c_client *ddc);
 void hdmi_attach_hdmiphy_client(struct i2c_client *hdmiphy);
 

diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index f42c43741b6d714f0c27474641b41aa421693371..4d5f41e19527f0514fd63d4d46fb958701247462 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -36,7 +36,6 @@
 
 #include "exynos_drm_drv.h"
 #include "exynos_drm_hdmi.h"
-#include "exynos_hdmi.h"
 
 #define HDMI_OVERLAY_NUMBER    3