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

Commit 590f418a authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Dave Airlie
Browse files

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: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a31f6ecf

drivers/gpu/drm/exynos/exynos_hdmi.c

+36 −0
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/exynos/exynos_hdmi.h

+0 −42
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/exynos/exynos_mixer.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 


#include "exynos_drm_drv.h"

#include "exynos_drm_hdmi.h"

#include "exynos_hdmi.h"



#define HDMI_OVERLAY_NUMBER	3