diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2012-03-16 05:47:14 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-20 05:41:45 -0400 |
| commit | 590f418a5c26897f3626f961bf7422fde6fb9ec6 (patch) | |
| tree | d0802cf766cf0bc4640734eda5075dfa072f4624 | |
| parent | a31f6ecf3581574445878350e8c44ec2c8d547dd (diff) | |
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>
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_hdmi.c | 36 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_hdmi.h | 42 | ||||
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 1 |
3 files changed, 36 insertions, 43 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 3fe5b2e72f1e..3583a7bdac24 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c | |||
| @@ -45,6 +45,42 @@ | |||
| 45 | #define MAX_HEIGHT 1080 | 45 | #define MAX_HEIGHT 1080 |
| 46 | #define get_hdmi_context(dev) platform_get_drvdata(to_platform_device(dev)) | 46 | #define get_hdmi_context(dev) platform_get_drvdata(to_platform_device(dev)) |
| 47 | 47 | ||
| 48 | struct hdmi_resources { | ||
| 49 | struct clk *hdmi; | ||
| 50 | struct clk *sclk_hdmi; | ||
| 51 | struct clk *sclk_pixel; | ||
| 52 | struct clk *sclk_hdmiphy; | ||
| 53 | struct clk *hdmiphy; | ||
| 54 | struct regulator_bulk_data *regul_bulk; | ||
| 55 | int regul_count; | ||
| 56 | }; | ||
| 57 | |||
| 58 | struct hdmi_context { | ||
| 59 | struct device *dev; | ||
| 60 | struct drm_device *drm_dev; | ||
| 61 | struct fb_videomode *default_timing; | ||
| 62 | unsigned int is_v13:1; | ||
| 63 | unsigned int default_win; | ||
| 64 | unsigned int default_bpp; | ||
| 65 | bool hpd_handle; | ||
| 66 | bool enabled; | ||
| 67 | |||
| 68 | struct resource *regs_res; | ||
| 69 | void __iomem *regs; | ||
| 70 | unsigned int irq; | ||
| 71 | struct workqueue_struct *wq; | ||
| 72 | struct work_struct hotplug_work; | ||
| 73 | |||
| 74 | struct i2c_client *ddc_port; | ||
| 75 | struct i2c_client *hdmiphy_port; | ||
| 76 | |||
| 77 | /* current hdmiphy conf index */ | ||
| 78 | int cur_conf; | ||
| 79 | |||
| 80 | struct hdmi_resources res; | ||
| 81 | void *parent_ctx; | ||
| 82 | }; | ||
| 83 | |||
| 48 | /* HDMI Version 1.3 */ | 84 | /* HDMI Version 1.3 */ |
| 49 | static const u8 hdmiphy_v13_conf27[32] = { | 85 | static const u8 hdmiphy_v13_conf27[32] = { |
| 50 | 0x01, 0x05, 0x00, 0xD8, 0x10, 0x1C, 0x30, 0x40, | 86 | 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 040ecadb912e..1c3b6d8f1fe7 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.h +++ b/drivers/gpu/drm/exynos/exynos_hdmi.h | |||
| @@ -28,48 +28,6 @@ | |||
| 28 | #ifndef _EXYNOS_HDMI_H_ | 28 | #ifndef _EXYNOS_HDMI_H_ |
| 29 | #define _EXYNOS_HDMI_H_ | 29 | #define _EXYNOS_HDMI_H_ |
| 30 | 30 | ||
| 31 | struct hdmi_resources { | ||
| 32 | struct clk *hdmi; | ||
| 33 | struct clk *sclk_hdmi; | ||
| 34 | struct clk *sclk_pixel; | ||
| 35 | struct clk *sclk_hdmiphy; | ||
| 36 | struct clk *hdmiphy; | ||
| 37 | struct regulator_bulk_data *regul_bulk; | ||
| 38 | int regul_count; | ||
| 39 | }; | ||
| 40 | |||
| 41 | struct hdmi_context { | ||
| 42 | struct device *dev; | ||
| 43 | struct drm_device *drm_dev; | ||
| 44 | struct fb_videomode *default_timing; | ||
| 45 | unsigned int is_v13:1; | ||
| 46 | unsigned int default_win; | ||
| 47 | unsigned int default_bpp; | ||
| 48 | bool hpd_handle; | ||
| 49 | bool enabled; | ||
| 50 | |||
| 51 | struct resource *regs_res; | ||
| 52 | /** base address of HDMI registers */ | ||
| 53 | void __iomem *regs; | ||
| 54 | /** HDMI hotplug interrupt */ | ||
| 55 | unsigned int irq; | ||
| 56 | /** workqueue for delayed work */ | ||
| 57 | struct workqueue_struct *wq; | ||
| 58 | /** hotplug handling work */ | ||
| 59 | struct work_struct hotplug_work; | ||
| 60 | |||
| 61 | struct i2c_client *ddc_port; | ||
| 62 | struct i2c_client *hdmiphy_port; | ||
| 63 | |||
| 64 | /** current hdmiphy conf index */ | ||
| 65 | int cur_conf; | ||
| 66 | /** other resources */ | ||
| 67 | struct hdmi_resources res; | ||
| 68 | |||
| 69 | void *parent_ctx; | ||
| 70 | }; | ||
| 71 | |||
| 72 | |||
| 73 | void hdmi_attach_ddc_client(struct i2c_client *ddc); | 31 | void hdmi_attach_ddc_client(struct i2c_client *ddc); |
| 74 | void hdmi_attach_hdmiphy_client(struct i2c_client *hdmiphy); | 32 | void hdmi_attach_hdmiphy_client(struct i2c_client *hdmiphy); |
| 75 | 33 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index f42c43741b6d..4d5f41e19527 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | 36 | ||
| 37 | #include "exynos_drm_drv.h" | 37 | #include "exynos_drm_drv.h" |
| 38 | #include "exynos_drm_hdmi.h" | 38 | #include "exynos_drm_hdmi.h" |
| 39 | #include "exynos_hdmi.h" | ||
| 40 | 39 | ||
| 41 | #define HDMI_OVERLAY_NUMBER 3 | 40 | #define HDMI_OVERLAY_NUMBER 3 |
| 42 | 41 | ||