diff options
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/exynos_dp.c | 76 | ||||
| -rw-r--r-- | drivers/video/exynos_dp_lowlevel.c | 69 | ||||
| -rw-r--r-- | drivers/video/exynos_dp_lowlevel.h | 1 | ||||
| -rw-r--r-- | drivers/video/exynos_fb.c | 228 | ||||
| -rw-r--r-- | drivers/video/exynos_fimd.c | 44 | 
5 files changed, 330 insertions, 88 deletions
| diff --git a/drivers/video/exynos_dp.c b/drivers/video/exynos_dp.c index d72fa565a..87bb90777 100644 --- a/drivers/video/exynos_dp.c +++ b/drivers/video/exynos_dp.c @@ -27,11 +27,21 @@  #include <asm/arch/cpu.h>  #include <asm/arch/dp_info.h>  #include <asm/arch/dp.h> +#include <fdtdec.h> +#include <libfdt.h>  #include "exynos_dp_lowlevel.h" +DECLARE_GLOBAL_DATA_PTR; +  static struct exynos_dp_platform_data *dp_pd; +void __exynos_set_dp_phy(unsigned int onoff) +{ +} +void exynos_set_dp_phy(unsigned int onoff) +	__attribute__((weak, alias("__exynos_set_dp_phy"))); +  static void exynos_dp_disp_info(struct edp_disp_info *disp_info)  {  	disp_info->h_total = disp_info->h_res + disp_info->h_sync_width + @@ -853,6 +863,62 @@ static unsigned int exynos_dp_config_video(struct edp_device_info *edp_info)  	return ret;  } +#ifdef CONFIG_OF_CONTROL +int exynos_dp_parse_dt(const void *blob, struct edp_device_info *edp_info) +{ +	unsigned int node = fdtdec_next_compatible(blob, 0, +						COMPAT_SAMSUNG_EXYNOS5_DP); +	if (node <= 0) { +		debug("exynos_dp: Can't get device node for dp\n"); +		return -ENODEV; +	} + +	edp_info->disp_info.h_res = fdtdec_get_int(blob, node, +							"samsung,h-res", 0); +	edp_info->disp_info.h_sync_width = fdtdec_get_int(blob, node, +						"samsung,h-sync-width", 0); +	edp_info->disp_info.h_back_porch = fdtdec_get_int(blob, node, +						"samsung,h-back-porch", 0); +	edp_info->disp_info.h_front_porch = fdtdec_get_int(blob, node, +						"samsung,h-front-porch", 0); +	edp_info->disp_info.v_res = fdtdec_get_int(blob, node, +						"samsung,v-res", 0); +	edp_info->disp_info.v_sync_width = fdtdec_get_int(blob, node, +						"samsung,v-sync-width", 0); +	edp_info->disp_info.v_back_porch = fdtdec_get_int(blob, node, +						"samsung,v-back-porch", 0); +	edp_info->disp_info.v_front_porch = fdtdec_get_int(blob, node, +						"samsung,v-front-porch", 0); +	edp_info->disp_info.v_sync_rate = fdtdec_get_int(blob, node, +						"samsung,v-sync-rate", 0); + +	edp_info->lt_info.lt_status = fdtdec_get_int(blob, node, +						"samsung,lt-status", 0); + +	edp_info->video_info.master_mode = fdtdec_get_int(blob, node, +						"samsung,master-mode", 0); +	edp_info->video_info.bist_mode = fdtdec_get_int(blob, node, +						"samsung,bist-mode", 0); +	edp_info->video_info.bist_pattern = fdtdec_get_int(blob, node, +						"samsung,bist-pattern", 0); +	edp_info->video_info.h_sync_polarity = fdtdec_get_int(blob, node, +						"samsung,h-sync-polarity", 0); +	edp_info->video_info.v_sync_polarity = fdtdec_get_int(blob, node, +						"samsung,v-sync-polarity", 0); +	edp_info->video_info.interlaced = fdtdec_get_int(blob, node, +						"samsung,interlaced", 0); +	edp_info->video_info.color_space = fdtdec_get_int(blob, node, +						"samsung,color-space", 0); +	edp_info->video_info.dynamic_range = fdtdec_get_int(blob, node, +						"samsung,dynamic-range", 0); +	edp_info->video_info.ycbcr_coeff = fdtdec_get_int(blob, node, +						"samsung,ycbcr-coeff", 0); +	edp_info->video_info.color_depth = fdtdec_get_int(blob, node, +						"samsung,color-depth", 0); +	return 0; +} +#endif +  unsigned int exynos_init_dp(void)  {  	unsigned int ret; @@ -864,16 +930,22 @@ unsigned int exynos_init_dp(void)  		return -EFAULT;  	} +#ifdef CONFIG_OF_CONTROL +	if (exynos_dp_parse_dt(gd->fdt_blob, edp_info)) +		debug("unable to parse DP DT node\n"); +#else  	edp_info = dp_pd->edp_dev_info;  	if (edp_info == NULL) {  		debug("failed to get edp_info data.\n");  		return -EFAULT;  	} +#endif + +	exynos_dp_set_base_addr();  	exynos_dp_disp_info(&edp_info->disp_info); -	if (dp_pd->phy_enable) -		dp_pd->phy_enable(1); +	exynos_set_dp_phy(1);  	ret = exynos_dp_init_dp();  	if (ret != EXYNOS_DP_SUCCESS) { diff --git a/drivers/video/exynos_dp_lowlevel.c b/drivers/video/exynos_dp_lowlevel.c index 7b54c8084..748d9b8b3 100644 --- a/drivers/video/exynos_dp_lowlevel.c +++ b/drivers/video/exynos_dp_lowlevel.c @@ -25,11 +25,34 @@  #include <asm/arch/cpu.h>  #include <asm/arch/dp_info.h>  #include <asm/arch/dp.h> +#include <fdtdec.h> +#include <libfdt.h> + +/* Declare global data pointer */ +DECLARE_GLOBAL_DATA_PTR; + +struct exynos_dp *dp_regs; + +void exynos_dp_set_base_addr(void) +{ +#ifdef CONFIG_OF_CONTROL +	unsigned int node = fdtdec_next_compatible(gd->fdt_blob, +					0, COMPAT_SAMSUNG_EXYNOS5_DP); +	if (node <= 0) +		debug("exynos_dp: Can't get device node for dp\n"); + +	dp_regs = (struct exynos_dp *)fdtdec_get_addr(gd->fdt_blob, +								node, "reg"); +	if (dp_regs == NULL) +		debug("Can't get the DP base address\n"); +#else +	dp_regs = (struct exynos_dp *)samsung_get_base_dp(); +#endif +}  static void exynos_dp_enable_video_input(unsigned int enable)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->video_ctl1);  	reg &= ~VIDEO_EN_MASK; @@ -47,7 +70,6 @@ void exynos_dp_enable_video_bist(unsigned int enable)  {  	/*enable video bist*/  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->video_ctl4);  	reg &= ~VIDEO_BIST_MASK; @@ -64,7 +86,6 @@ void exynos_dp_enable_video_bist(unsigned int enable)  void exynos_dp_enable_video_mute(unsigned int enable)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->video_ctl1);  	reg &= ~(VIDEO_MUTE_MASK); @@ -80,7 +101,6 @@ void exynos_dp_enable_video_mute(unsigned int enable)  static void exynos_dp_init_analog_param(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/*  	 * Set termination @@ -129,7 +149,6 @@ static void exynos_dp_init_analog_param(void)  static void exynos_dp_init_interrupt(void)  { -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Set interrupt registers to initial states */  	/* @@ -158,7 +177,6 @@ static void exynos_dp_init_interrupt(void)  void exynos_dp_reset(void)  {  	unsigned int reg_func_1; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/*dp tx sw reset*/  	writel(RESET_DP_TX, &dp_regs->tx_sw_reset); @@ -186,7 +204,6 @@ void exynos_dp_reset(void)  void exynos_dp_enable_sw_func(unsigned int enable)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->func_en1);  	reg &= ~(SW_FUNC_EN_N); @@ -202,7 +219,6 @@ void exynos_dp_enable_sw_func(unsigned int enable)  unsigned int exynos_dp_set_analog_power_down(unsigned int block, u32 enable)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->phy_pd);  	switch (block) { @@ -256,7 +272,6 @@ unsigned int exynos_dp_set_analog_power_down(unsigned int block, u32 enable)  unsigned int exynos_dp_get_pll_lock_status(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->debug_ctl); @@ -269,7 +284,6 @@ unsigned int exynos_dp_get_pll_lock_status(void)  static void exynos_dp_set_pll_power(unsigned int enable)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->pll_ctl);  	reg &= ~(DP_PLL_PD); @@ -285,7 +299,6 @@ int exynos_dp_init_analog_func(void)  	int ret = EXYNOS_DP_SUCCESS;  	unsigned int retry_cnt = 10;  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/*Power On All Analog block */  	exynos_dp_set_analog_power_down(POWER_ALL, DP_DISABLE); @@ -335,7 +348,6 @@ int exynos_dp_init_analog_func(void)  void exynos_dp_init_hpd(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Clear interrupts releated to Hot Plug Dectect */  	reg = HOTPLUG_CHG | HPD_LOST | PLUG; @@ -354,7 +366,6 @@ void exynos_dp_init_hpd(void)  static inline void exynos_dp_reset_aux(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Disable AUX channel module */  	reg = readl(&dp_regs->func_en2); @@ -367,7 +378,6 @@ static inline void exynos_dp_reset_aux(void)  void exynos_dp_init_aux(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Clear inerrupts related to AUX channel */  	reg = RPLY_RECEIV | AUX_ERR; @@ -395,7 +405,6 @@ void exynos_dp_init_aux(void)  void exynos_dp_config_interrupt(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* 0: mask, 1: unmask */  	reg = COMMON_INT_MASK_1; @@ -419,7 +428,6 @@ void exynos_dp_config_interrupt(void)  unsigned int exynos_dp_get_plug_in_status(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->sys_ctl3);  	if (reg & HPD_STATUS) @@ -449,7 +457,6 @@ unsigned int exynos_dp_start_aux_transaction(void)  	unsigned int reg;  	unsigned int ret = 0;  	unsigned int retry_cnt; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Enable AUX CH operation */  	reg = readl(&dp_regs->aux_ch_ctl2); @@ -498,7 +505,6 @@ unsigned int exynos_dp_write_byte_to_dpcd(unsigned int reg_addr,  				unsigned char data)  {  	unsigned int reg, ret; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Clear AUX CH data buffer */  	reg = BUF_CLR; @@ -539,7 +545,6 @@ unsigned int exynos_dp_read_byte_from_dpcd(unsigned int reg_addr,  {  	unsigned int reg;  	int retval; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Clear AUX CH data buffer */  	reg = BUF_CLR; @@ -583,7 +588,6 @@ unsigned int exynos_dp_write_bytes_to_dpcd(unsigned int reg_addr,  	unsigned int cur_data_idx;  	unsigned int retry_cnt;  	unsigned int ret = 0; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Clear AUX CH data buffer */  	reg = BUF_CLR; @@ -649,7 +653,6 @@ unsigned int exynos_dp_read_bytes_from_dpcd(unsigned int reg_addr,  	unsigned int cur_data_idx;  	unsigned int retry_cnt;  	unsigned int ret = 0; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Clear AUX CH data buffer */  	reg = BUF_CLR; @@ -711,7 +714,6 @@ int exynos_dp_select_i2c_device(unsigned int device_addr,  {  	unsigned int reg;  	int retval; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Set EDID device address */  	reg = device_addr; @@ -746,7 +748,6 @@ int exynos_dp_read_byte_from_i2c(unsigned int device_addr,  	unsigned int reg;  	int i;  	int retval; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	for (i = 0; i < 10; i++) {  		/* Clear AUX CH data buffer */ @@ -790,7 +791,6 @@ int exynos_dp_read_bytes_from_i2c(unsigned int device_addr,  	unsigned int cur_data_idx;  	unsigned int defer = 0;  	int retval = 0; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	for (i = 0; i < count; i += 16) { /* use 16 burst */  		for (j = 0; j < 100; j++) { @@ -854,7 +854,6 @@ int exynos_dp_read_bytes_from_i2c(unsigned int device_addr,  void exynos_dp_reset_macro(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->phy_test);  	reg |= MACRO_RST; @@ -870,7 +869,6 @@ void exynos_dp_reset_macro(void)  void exynos_dp_set_link_bandwidth(unsigned char bwtype)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = (unsigned int)bwtype; @@ -883,7 +881,6 @@ unsigned char exynos_dp_get_link_bandwidth(void)  {  	unsigned char ret;  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->link_bw_set);  	ret = (unsigned char)reg; @@ -894,7 +891,6 @@ unsigned char exynos_dp_get_link_bandwidth(void)  void exynos_dp_set_lane_count(unsigned char count)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = (unsigned int)count; @@ -906,7 +902,6 @@ void exynos_dp_set_lane_count(unsigned char count)  unsigned int exynos_dp_get_lane_count(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->lane_count_set); @@ -915,7 +910,6 @@ unsigned int exynos_dp_get_lane_count(void)  unsigned char exynos_dp_get_lanex_pre_emphasis(unsigned char lanecnt)  { -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	unsigned int reg_list[DP_LANE_CNT_4] = {  		(unsigned int)&dp_regs->ln0_link_training_ctl,  		(unsigned int)&dp_regs->ln1_link_training_ctl, @@ -929,7 +923,6 @@ unsigned char exynos_dp_get_lanex_pre_emphasis(unsigned char lanecnt)  void exynos_dp_set_lanex_pre_emphasis(unsigned char request_val,  		unsigned char lanecnt)  { -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	unsigned int reg_list[DP_LANE_CNT_4] = {  		(unsigned int)&dp_regs->ln0_link_training_ctl,  		(unsigned int)&dp_regs->ln1_link_training_ctl, @@ -944,7 +937,6 @@ void exynos_dp_set_lane_pre_emphasis(unsigned int level, unsigned char lanecnt)  {  	unsigned char i;  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	unsigned int reg_list[DP_LANE_CNT_4] = {  		(unsigned int)&dp_regs->ln0_link_training_ctl,  		(unsigned int)&dp_regs->ln1_link_training_ctl, @@ -967,7 +959,6 @@ void exynos_dp_set_lane_pre_emphasis(unsigned int level, unsigned char lanecnt)  void exynos_dp_set_training_pattern(unsigned int pattern)  {  	unsigned int reg = 0; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	switch (pattern) {  	case PRBS7: @@ -996,7 +987,6 @@ void exynos_dp_set_training_pattern(unsigned int pattern)  void exynos_dp_enable_enhanced_mode(unsigned char enable)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->sys_ctl4);  	reg &= ~ENHANCED; @@ -1010,7 +1000,6 @@ void exynos_dp_enable_enhanced_mode(unsigned char enable)  void exynos_dp_enable_scrambling(unsigned int enable)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->training_ptn_set);  	reg &= ~(SCRAMBLING_DISABLE); @@ -1024,7 +1013,6 @@ void exynos_dp_enable_scrambling(unsigned int enable)  int exynos_dp_init_video(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Clear VID_CLK_CHG[1] and VID_FORMAT_CHG[3] and VSYNC_DET[7] */  	reg = VSYNC_DET | VID_FORMAT_CHG | VID_CLK_CHG; @@ -1040,7 +1028,6 @@ int exynos_dp_init_video(void)  void exynos_dp_config_video_slave_mode(struct edp_video_info *video_info)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Video Slave mode setting */  	reg = readl(&dp_regs->func_en1); @@ -1074,7 +1061,6 @@ void exynos_dp_config_video_slave_mode(struct edp_video_info *video_info)  void exynos_dp_set_video_color_format(struct edp_video_info *video_info)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Configure the input color depth, color space, dynamic range */  	reg = (video_info->dynamic_range << IN_D_RANGE_SHIFT) | @@ -1097,7 +1083,6 @@ int exynos_dp_config_video_bist(struct edp_device_info *edp_info)  	unsigned int reg;  	unsigned int bist_type = 0;  	struct edp_video_info video_info = edp_info->video_info; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* For master mode, you don't need to set the video format */  	if (video_info.master_mode == 0) { @@ -1186,7 +1171,6 @@ int exynos_dp_config_video_bist(struct edp_device_info *edp_info)  unsigned int exynos_dp_is_slave_video_stream_clock_on(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Update Video stream clk detect status */  	reg = readl(&dp_regs->sys_ctl1); @@ -1206,7 +1190,6 @@ void exynos_dp_set_video_cr_mn(unsigned int type, unsigned int m_value,  		unsigned int n_value)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	if (type == REGISTER_M) {  		reg = readl(&dp_regs->sys_ctl4); @@ -1235,7 +1218,6 @@ void exynos_dp_set_video_cr_mn(unsigned int type, unsigned int m_value,  void exynos_dp_set_video_timing_mode(unsigned int type)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->video_ctl10);  	reg &= ~FORMAT_SEL; @@ -1249,7 +1231,6 @@ void exynos_dp_set_video_timing_mode(unsigned int type)  void exynos_dp_enable_video_master(unsigned int enable)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	reg = readl(&dp_regs->soc_general_ctl);  	if (enable) { @@ -1266,7 +1247,6 @@ void exynos_dp_enable_video_master(unsigned int enable)  void exynos_dp_start_video(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Enable Video input and disable Mute */  	reg = readl(&dp_regs->video_ctl1); @@ -1277,7 +1257,6 @@ void exynos_dp_start_video(void)  unsigned int exynos_dp_is_video_stream_on(void)  {  	unsigned int reg; -	struct exynos_dp *dp_regs = (struct exynos_dp *)samsung_get_base_dp();  	/* Update STRM_VALID */  	reg = readl(&dp_regs->sys_ctl3); diff --git a/drivers/video/exynos_dp_lowlevel.h b/drivers/video/exynos_dp_lowlevel.h index a041a7ab5..2c0ae12db 100644 --- a/drivers/video/exynos_dp_lowlevel.h +++ b/drivers/video/exynos_dp_lowlevel.h @@ -76,5 +76,6 @@ void exynos_dp_set_video_timing_mode(unsigned int type);  void exynos_dp_enable_video_master(unsigned int enable);  void exynos_dp_start_video(void);  unsigned int exynos_dp_is_video_stream_on(void); +void exynos_dp_set_base_addr(void);  #endif /* _EXYNOS_DP_LOWLEVEL_H */ diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c index c0f1830dc..ed0823bf9 100644 --- a/drivers/video/exynos_fb.c +++ b/drivers/video/exynos_fb.c @@ -23,6 +23,8 @@  #include <config.h>  #include <common.h>  #include <lcd.h> +#include <fdtdec.h> +#include <libfdt.h>  #include <asm/io.h>  #include <asm/arch/cpu.h>  #include <asm/arch/clock.h> @@ -30,6 +32,7 @@  #include <asm/arch/mipi_dsim.h>  #include <asm/arch/dp_info.h>  #include <asm/arch/system.h> +#include <asm-generic/errno.h>  #include "exynos_fb.h" @@ -37,6 +40,20 @@ DECLARE_GLOBAL_DATA_PTR;  static unsigned int panel_width, panel_height; +/* + * board_init_f(arch/arm/lib/board.c) calls lcd_setmem() which needs + * panel_info.vl_col, panel_info.vl_row and panel_info.vl_bpix to reserve + * FB memory at a very early stage, i.e even before exynos_fimd_parse_dt() + * is called. So, we are forced to statically assign it. + */ +#ifdef CONFIG_OF_CONTROL +vidinfo_t panel_info  = { +	.vl_col = LCD_XRES, +	.vl_row = LCD_YRES, +	.vl_bpix = LCD_COLOR16, +}; +#endif +  static void exynos_lcd_init_mem(void *lcdbase, vidinfo_t *vid)  {  	unsigned long palette_size; @@ -83,47 +100,226 @@ static void draw_logo(void)  }  #endif +void __exynos_cfg_lcd_gpio(void) +{ +} +void exynos_cfg_lcd_gpio(void) +	__attribute__((weak, alias("__exynos_cfg_lcd_gpio"))); + +void __exynos_backlight_on(unsigned int onoff) +{ +} +void exynos_backlight_on(unsigned int onoff) +	__attribute__((weak, alias("__exynos_cfg_lcd_gpio"))); + +void __exynos_reset_lcd(void) +{ +} +void exynos_reset_lcd(void) +	__attribute__((weak, alias("__exynos_reset_lcd"))); + +void __exynos_lcd_power_on(void) +{ +} +void exynos_lcd_power_on(void) +	__attribute__((weak, alias("__exynos_lcd_power_on"))); + +void __exynos_cfg_ldo(void) +{ +} +void exynos_cfg_ldo(void) +	__attribute__((weak, alias("__exynos_cfg_ldo"))); + +void __exynos_enable_ldo(unsigned int onoff) +{ +} +void exynos_enable_ldo(unsigned int onoff) +	__attribute__((weak, alias("__exynos_enable_ldo"))); + +void __exynos_backlight_reset(void) +{ +} +void exynos_backlight_reset(void) +	__attribute__((weak, alias("__exynos_backlight_reset"))); +  static void lcd_panel_on(vidinfo_t *vid)  {  	udelay(vid->init_delay); -	if (vid->backlight_reset) -		vid->backlight_reset(); +	exynos_backlight_reset(); -	if (vid->cfg_gpio) -		vid->cfg_gpio(); +	exynos_cfg_lcd_gpio(); -	if (vid->lcd_power_on) -		vid->lcd_power_on(); +	exynos_lcd_power_on();  	udelay(vid->power_on_delay);  	if (vid->dp_enabled)  		exynos_init_dp(); -	if (vid->reset_lcd) { -		vid->reset_lcd(); -		udelay(vid->reset_delay); -	} +	exynos_reset_lcd(); -	if (vid->backlight_on) -		vid->backlight_on(1); +	udelay(vid->reset_delay); -	if (vid->cfg_ldo) -		vid->cfg_ldo(); +	exynos_backlight_on(1); -	if (vid->enable_ldo) -		vid->enable_ldo(1); +	exynos_cfg_ldo(); + +	exynos_enable_ldo(1);  	if (vid->mipi_enabled)  		exynos_mipi_dsi_init();  } +#ifdef CONFIG_OF_CONTROL +int exynos_fimd_parse_dt(const void *blob) +{ +	unsigned int node; +	node = fdtdec_next_compatible(blob, 0, COMPAT_SAMSUNG_EXYNOS_FIMD); +	if (node <= 0) { +		debug("exynos_fb: Can't get device node for fimd\n"); +		return -ENODEV; +	} + +	panel_info.vl_col = fdtdec_get_int(blob, node, "samsung,vl-col", 0); +	if (panel_info.vl_col == 0) { +		debug("Can't get XRES\n"); +		return -ENXIO; +	} + +	panel_info.vl_row = fdtdec_get_int(blob, node, "samsung,vl-row", 0); +	if (panel_info.vl_row == 0) { +		debug("Can't get YRES\n"); +		return -ENXIO; +	} + +	panel_info.vl_width = fdtdec_get_int(blob, node, +						"samsung,vl-width", 0); + +	panel_info.vl_height = fdtdec_get_int(blob, node, +						"samsung,vl-height", 0); + +	panel_info.vl_freq = fdtdec_get_int(blob, node, "samsung,vl-freq", 0); +	if (panel_info.vl_freq == 0) { +		debug("Can't get refresh rate\n"); +		return -ENXIO; +	} + +	if (fdtdec_get_bool(blob, node, "samsung,vl-clkp")) +		panel_info.vl_clkp = CONFIG_SYS_LOW; + +	if (fdtdec_get_bool(blob, node, "samsung,vl-oep")) +		panel_info.vl_oep = CONFIG_SYS_LOW; + +	if (fdtdec_get_bool(blob, node, "samsung,vl-hsp")) +		panel_info.vl_hsp = CONFIG_SYS_LOW; + +	if (fdtdec_get_bool(blob, node, "samsung,vl-vsp")) +		panel_info.vl_vsp = CONFIG_SYS_LOW; + +	if (fdtdec_get_bool(blob, node, "samsung,vl-dp")) +		panel_info.vl_dp = CONFIG_SYS_LOW; + +	panel_info.vl_bpix = fdtdec_get_int(blob, node, "samsung,vl-bpix", 0); +	if (panel_info.vl_bpix == 0) { +		debug("Can't get bits per pixel\n"); +		return -ENXIO; +	} + +	panel_info.vl_hspw = fdtdec_get_int(blob, node, "samsung,vl-hspw", 0); +	if (panel_info.vl_hspw == 0) { +		debug("Can't get hsync width\n"); +		return -ENXIO; +	} + +	panel_info.vl_hfpd = fdtdec_get_int(blob, node, "samsung,vl-hfpd", 0); +	if (panel_info.vl_hfpd == 0) { +		debug("Can't get right margin\n"); +		return -ENXIO; +	} + +	panel_info.vl_hbpd = (u_char)fdtdec_get_int(blob, node, +							"samsung,vl-hbpd", 0); +	if (panel_info.vl_hbpd == 0) { +		debug("Can't get left margin\n"); +		return -ENXIO; +	} + +	panel_info.vl_vspw = (u_char)fdtdec_get_int(blob, node, +							"samsung,vl-vspw", 0); +	if (panel_info.vl_vspw == 0) { +		debug("Can't get vsync width\n"); +		return -ENXIO; +	} + +	panel_info.vl_vfpd = fdtdec_get_int(blob, node, +							"samsung,vl-vfpd", 0); +	if (panel_info.vl_vfpd == 0) { +		debug("Can't get lower margin\n"); +		return -ENXIO; +	} + +	panel_info.vl_vbpd = fdtdec_get_int(blob, node, "samsung,vl-vbpd", 0); +	if (panel_info.vl_vbpd == 0) { +		debug("Can't get upper margin\n"); +		return -ENXIO; +	} + +	panel_info.vl_cmd_allow_len = fdtdec_get_int(blob, node, +						"samsung,vl-cmd-allow-len", 0); + +	panel_info.win_id = fdtdec_get_int(blob, node, "samsung,winid", 0); +	panel_info.init_delay = fdtdec_get_int(blob, node, +						"samsung,init-delay", 0); +	panel_info.power_on_delay = fdtdec_get_int(blob, node, +						"samsung,power-on-delay", 0); +	panel_info.reset_delay = fdtdec_get_int(blob, node, +						"samsung,reset-delay", 0); +	panel_info.interface_mode = fdtdec_get_int(blob, node, +						"samsung,interface-mode", 0); +	panel_info.mipi_enabled = fdtdec_get_int(blob, node, +						"samsung,mipi-enabled", 0); +	panel_info.dp_enabled = fdtdec_get_int(blob, node, +						"samsung,dp-enabled", 0); +	panel_info.cs_setup = fdtdec_get_int(blob, node, +						"samsung,cs-setup", 0); +	panel_info.wr_setup = fdtdec_get_int(blob, node, +						"samsung,wr-setup", 0); +	panel_info.wr_act = fdtdec_get_int(blob, node, "samsung,wr-act", 0); +	panel_info.wr_hold = fdtdec_get_int(blob, node, "samsung,wr-hold", 0); + +	panel_info.logo_on = fdtdec_get_int(blob, node, "samsung,logo-on", 0); +	if (panel_info.logo_on) { +		panel_info.logo_width = fdtdec_get_int(blob, node, +						"samsung,logo-width", 0); +		panel_info.logo_height = fdtdec_get_int(blob, node, +						"samsung,logo-height", 0); +		panel_info.logo_addr = fdtdec_get_int(blob, node, +						"samsung,logo-addr", 0); +	} + +	panel_info.rgb_mode = fdtdec_get_int(blob, node, +						"samsung,rgb-mode", 0); +	panel_info.pclk_name = fdtdec_get_int(blob, node, +						"samsung,pclk-name", 0); +	panel_info.sclk_div = fdtdec_get_int(blob, node, +						"samsung,sclk-div", 0); +	panel_info.dual_lcd_enabled = fdtdec_get_int(blob, node, +						"samsung,dual-lcd-enabled", 0); + +	return 0; +} +#endif +  void lcd_ctrl_init(void *lcdbase)  {  	set_system_display_ctrl();  	set_lcd_clk(); +#ifdef CONFIG_OF_CONTROL +	if (exynos_fimd_parse_dt(gd->fdt_blob)) +		debug("Can't get proper panel info\n"); +#endif  	/* initialize parameters which is specific to panel. */  	init_panel_info(&panel_info); diff --git a/drivers/video/exynos_fimd.c b/drivers/video/exynos_fimd.c index 2efe6a61c..33599499e 100644 --- a/drivers/video/exynos_fimd.c +++ b/drivers/video/exynos_fimd.c @@ -25,13 +25,18 @@  #include <asm/io.h>  #include <lcd.h>  #include <div64.h> +#include <fdtdec.h> +#include <libfdt.h>  #include <asm/arch/clk.h>  #include <asm/arch/clock.h>  #include <asm/arch/cpu.h>  #include "exynos_fb.h" +DECLARE_GLOBAL_DATA_PTR; +  static unsigned long *lcd_base_addr;  static vidinfo_t *pvid; +static struct exynos_fb *fimd_ctrl;  void exynos_fimd_lcd_init_mem(u_long screen_base, u_long fb_size,  		u_long palette_size) @@ -41,8 +46,6 @@ void exynos_fimd_lcd_init_mem(u_long screen_base, u_long fb_size,  static void exynos_fimd_set_dualrgb(unsigned int enabled)  { -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd();  	unsigned int cfg = 0;  	if (enabled) { @@ -59,9 +62,6 @@ static void exynos_fimd_set_dualrgb(unsigned int enabled)  static void exynos_fimd_set_dp_clkcon(unsigned int enabled)  { - -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd();  	unsigned int cfg = 0;  	if (enabled) @@ -73,8 +73,6 @@ static void exynos_fimd_set_dp_clkcon(unsigned int enabled)  static void exynos_fimd_set_par(unsigned int win_id)  {  	unsigned int cfg = 0; -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd();  	/* set window control */  	cfg = readl((unsigned int)&fimd_ctrl->wincon0 + @@ -126,8 +124,6 @@ static void exynos_fimd_set_par(unsigned int win_id)  static void exynos_fimd_set_buffer_address(unsigned int win_id)  {  	unsigned long start_addr, end_addr; -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd();  	start_addr = (unsigned long)lcd_base_addr;  	end_addr = start_addr + ((pvid->vl_col * (NBITS(pvid->vl_bpix) / 8)) * @@ -144,8 +140,6 @@ static void exynos_fimd_set_clock(vidinfo_t *pvid)  	unsigned int cfg = 0, div = 0, remainder, remainder_div;  	unsigned long pixel_clock;  	unsigned long long src_clock; -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd();  	if (pvid->dual_lcd_enabled) {  		pixel_clock = pvid->vl_freq * @@ -197,8 +191,6 @@ static void exynos_fimd_set_clock(vidinfo_t *pvid)  void exynos_set_trigger(void)  {  	unsigned int cfg = 0; -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd();  	cfg = readl(&fimd_ctrl->trigcon); @@ -211,8 +203,6 @@ int exynos_is_i80_frame_done(void)  {  	unsigned int cfg = 0;  	int status; -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd();  	cfg = readl(&fimd_ctrl->trigcon); @@ -226,8 +216,6 @@ int exynos_is_i80_frame_done(void)  static void exynos_fimd_lcd_on(void)  {  	unsigned int cfg = 0; -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd();  	/* display on */  	cfg = readl(&fimd_ctrl->vidcon0); @@ -238,8 +226,6 @@ static void exynos_fimd_lcd_on(void)  static void exynos_fimd_window_on(unsigned int win_id)  {  	unsigned int cfg = 0; -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd();  	/* enable window */  	cfg = readl((unsigned int)&fimd_ctrl->wincon0 + @@ -256,8 +242,6 @@ static void exynos_fimd_window_on(unsigned int win_id)  void exynos_fimd_lcd_off(void)  {  	unsigned int cfg = 0; -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd();  	cfg = readl(&fimd_ctrl->vidcon0);  	cfg &= (EXYNOS_VIDCON0_ENVID_DISABLE | EXYNOS_VIDCON0_ENVID_F_DISABLE); @@ -267,8 +251,6 @@ void exynos_fimd_lcd_off(void)  void exynos_fimd_window_off(unsigned int win_id)  {  	unsigned int cfg = 0; -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd();  	cfg = readl((unsigned int)&fimd_ctrl->wincon0 +  			EXYNOS_WINCON(win_id)); @@ -286,8 +268,20 @@ void exynos_fimd_lcd_init(vidinfo_t *vid)  {  	unsigned int cfg = 0, rgb_mode;  	unsigned int offset; -	struct exynos_fb *fimd_ctrl = -		(struct exynos_fb *)samsung_get_base_fimd(); +#ifdef CONFIG_OF_CONTROL +	unsigned int node; + +	node = fdtdec_next_compatible(gd->fdt_blob, +					0, COMPAT_SAMSUNG_EXYNOS_FIMD); +	if (node <= 0) +		debug("exynos_fb: Can't get device node for fimd\n"); + +	fimd_ctrl = (struct exynos_fb *)fdtdec_get_addr(gd->fdt_blob, +								node, "reg"); +	if (fimd_ctrl == NULL) +		debug("Can't get the FIMD base address\n"); +#endif +	fimd_ctrl = (struct exynos_fb *)samsung_get_base_fimd();  	offset = exynos_fimd_get_base_offset(); |