From: Seung-Woo Kim Date: Wed, 3 Jan 2018 06:22:16 +0000 (+0900) Subject: video: sprd: remove build warnings X-Git-Tag: accepted/tizen/5.0/unified/20181106.201708^0 X-Git-Url: http://review.tizen.org/git/?p=profile%2Fmobile%2Fplatform%2Fkernel%2Fu-boot-tm1.git;a=commitdiff_plain;h=3f98b0827c777c7e00493d75df1bbbef233e2dab video: sprd: remove build warnings Remove build warnings. Change-Id: I211276db4d2f8472a5ad2df584877828c4b56338 Signed-off-by: Seung-Woo Kim --- diff --git a/drivers/video/sprdfb/dsi_1_21a/mipi_dsih_dphy.c b/drivers/video/sprdfb/dsi_1_21a/mipi_dsih_dphy.c index 1dd8619..fd41856 100644 --- a/drivers/video/sprdfb/dsi_1_21a/mipi_dsih_dphy.c +++ b/drivers/video/sprdfb/dsi_1_21a/mipi_dsih_dphy.c @@ -26,7 +26,7 @@ uint8_t mipi_dsih_dphy_calibration(dphy_t * phy)// tianci need check with thomas { - uint8_t rd_data[3],sv_data[3]; + uint8_t rd_data[3],sv_data[3] = {0,}; uint8_t data[3]; uint8_t i = 0; /* iterator */ int8_t j = 0; diff --git a/drivers/video/sprdfb/lcd/lcd_s6e8aa5x01_mipi.c b/drivers/video/sprdfb/lcd/lcd_s6e8aa5x01_mipi.c index 9226bff..ac89902 100644 --- a/drivers/video/sprdfb/lcd/lcd_s6e8aa5x01_mipi.c +++ b/drivers/video/sprdfb/lcd/lcd_s6e8aa5x01_mipi.c @@ -52,6 +52,10 @@ typedef struct LCM_force_cmd_code_tag{ #define MTP_LEN 0x21 #define ELVSS_ADDR 0xB6 +extern void save_mtp_offset_to_kernel(uint8_t *mtp); +extern void save_elvss_offset_to_kernel(uint8_t elvss); +extern void save_hbm_offset_to_kernel(uint8_t *hbm); + static LCM_Init_Code init_data[] = { {LCM_SEND(5), {3, 0x00, 0xF0, 0x5A, 0x5A} }, {LCM_SEND(5), {3, 0x00, 0xF1, 0x5A, 0x5A} }, @@ -69,8 +73,6 @@ static LCM_Init_Code init_data[] = { {LCM_SEND(1), {0x29}}, }; -static LCM_Init_Code disp_on = {LCM_SEND(1), {0x29}}; - static LCM_Init_Code sleep_in[] = { {LCM_SEND(1), {0x28}}, {LCM_SLEEP(150)}, //>150ms @@ -131,7 +133,6 @@ static uint32_t s6e8aa5x01_readid(struct panel_spec *self) { uint8_t j =0; uint8_t read_data[4] = {0}; - int32_t read_rtn = 0; uint8_t param[2] = {0}; mipi_set_cmd_mode_t mipi_set_cmd_mode = self->info.mipi->ops->mipi_set_cmd_mode; mipi_force_write_t mipi_force_write = self->info.mipi->ops->mipi_force_write; @@ -147,7 +148,7 @@ static uint32_t s6e8aa5x01_readid(struct panel_spec *self) param[0] = 0x03; param[1] = 0x00; mipi_force_write(0x37, param, 2); - read_rtn = mipi_force_read(0x04, 3, read_data); + mipi_force_read(0x04, 3, read_data); LCD_PRINT("lcd_s6e8aa5x01_mipi read id 0xda, 0xdb,0xdc is 0x%x,0x%x,0x%x!\n", read_data[0], read_data[1], read_data[2]); if ((0x40 == read_data[0]) && (0x00 == read_data[1]) @@ -248,18 +249,13 @@ static void s6e8aa5x01_test_key(struct panel_spec *self, uint8_t enable) static int32_t s6e8aa5x01_check_mtp(struct panel_spec *self) { - LCM_Init_Code *g_para = NULL; uint8_t i = 0; uint8_t mtp_offset[MTP_LEN + 6] = {0}; - int32_t read_rtn = 0; uint8_t param[2] = {0}; - int32_t size = 0; mipi_force_write_t mipi_force_write = self->info.mipi->ops->mipi_force_write; mipi_force_read_t mipi_force_read = self->info.mipi->ops->mipi_force_read; - mipi_dcs_write_t mipi_dcs_write = - self->info.mipi->ops->mipi_dcs_write; mipi_set_cmd_mode_t mipi_set_cmd_mode = self->info.mipi->ops->mipi_set_cmd_mode; @@ -279,7 +275,7 @@ static int32_t s6e8aa5x01_check_mtp(struct panel_spec *self) for (i = 0; i < 3; i++) { mipi_force_write(0x37, param, 2); - read_rtn = mipi_force_read(MTP_ADDR, MTP_LEN + 6, mtp_offset); + mipi_force_read(MTP_ADDR, MTP_LEN + 6, mtp_offset); if (mtp_offset[30] != 2 || mtp_offset[31] != 3 || mtp_offset[32] != 2) @@ -301,12 +297,10 @@ static int32_t s6e8aa5x01_check_mtp(struct panel_spec *self) static int32_t s6e8aa5x01_check_elvss(struct panel_spec *self) { LCM_Init_Code *g_para = NULL; - LCM_Init_Code *hbm = NULL; uint8_t i = 0; uint8_t elvss_offset = 0; int32_t read_rtn = 0; uint8_t param[2] = {0}; - int32_t size = 0; mipi_force_write_t mipi_force_write = self->info.mipi->ops->mipi_force_write; mipi_force_read_t mipi_force_read = @@ -328,7 +322,6 @@ static int32_t s6e8aa5x01_check_elvss(struct panel_spec *self) /* ELVSS OFFSET */ for (i = 0; i < 3; i++) { g_para = global_para; - size = ARRAY_SIZE(global_para); param[0] = 0x1; param[1] = 0x00; mipi_force_write(0x37, param, 2); @@ -352,12 +345,10 @@ static int32_t s6e8aa5x01_check_elvss(struct panel_spec *self) static int32_t s6e8aa5x01_check_hbm(struct panel_spec *self) { LCM_Init_Code *g_para = NULL; - LCM_Init_Code *hbm = NULL; uint8_t i = 0; uint8_t hbm_g[15] = {0}; int32_t read_rtn = 0; uint8_t param[2] = {0}; - int32_t size = 0; mipi_force_write_t mipi_force_write = self->info.mipi->ops->mipi_force_write; mipi_force_read_t mipi_force_read = @@ -379,7 +370,6 @@ static int32_t s6e8aa5x01_check_hbm(struct panel_spec *self) /* HBM GAMMA */ for (i = 0; i < 3; i++) { g_para = global_para; - size = ARRAY_SIZE(global_para); param[0] = 0xf; param[1] = 0x00; mipi_force_write(0x37, param, 2); diff --git a/drivers/video/sprdfb/sprdfb.h b/drivers/video/sprdfb/sprdfb.h index 61947ea..b07e52c 100644 --- a/drivers/video/sprdfb/sprdfb.h +++ b/drivers/video/sprdfb/sprdfb.h @@ -37,6 +37,7 @@ enum{ }; struct sprdfb_device; +struct panel_spec; struct panel_if_ctrl{ diff --git a/drivers/video/sprdfb/sprdfb_chip_common.h b/drivers/video/sprdfb/sprdfb_chip_common.h index 9e23596..061b9c9 100644 --- a/drivers/video/sprdfb/sprdfb_chip_common.h +++ b/drivers/video/sprdfb/sprdfb_chip_common.h @@ -47,6 +47,8 @@ #define SPRDFB_SUPPORT_LVDS_PANEL #endif +void __raw_bits_and(unsigned int v, unsigned int a); + void __raw_bits_or(unsigned int v, unsigned int a); void __raw_bits_set_value(unsigned int reg, unsigned int value, unsigned int bit, unsigned int mask); diff --git a/drivers/video/sprdfb/sprdfb_dispc.c b/drivers/video/sprdfb/sprdfb_dispc.c index 59b3181..97a8787 100644 --- a/drivers/video/sprdfb/sprdfb_dispc.c +++ b/drivers/video/sprdfb/sprdfb_dispc.c @@ -28,11 +28,6 @@ extern void sprdfb_panel_invalidate_rect(struct panel_spec *self, uint16_t left, uint16_t top, uint16_t right, uint16_t bottom); -static void __raw_bits_and(unsigned int v, unsigned int a) -{ - __raw_writel((__raw_readl(a) & v), a); -} - /* dispc soft reset */ static void dispc_reset(void) { diff --git a/drivers/video/sprdfb/sprdfb_dsi.c b/drivers/video/sprdfb/sprdfb_dsi.c index 5f83e18..c944c25 100644 --- a/drivers/video/sprdfb/sprdfb_dsi.c +++ b/drivers/video/sprdfb/sprdfb_dsi.c @@ -35,11 +35,6 @@ struct sprdfb_dsi_context { static struct sprdfb_dsi_context dsi_ctx; -static void __raw_bits_and(unsigned int v, unsigned int a) -{ - __raw_writel((__raw_readl(a) & v), a); -} - static uint32_t dsi_core_read_function(uint32_t addr, uint32_t offset) { return __raw_readl(addr + offset); @@ -371,7 +366,9 @@ int32_t sprdfb_dsi_ready(struct sprdfb_device *dev) static int32_t sprdfb_dsi_set_lp_mode(void) { +#ifndef CONFIG_DSIH_VERSION_1P21A uint32_t reg_val; +#endif FB_PRINT("sprdfb:[%s]\n", __FUNCTION__); mipi_dsih_cmd_mode(&(dsi_ctx.dsi_inst), 1); @@ -445,7 +442,6 @@ void backlight_control(int brigtness) printf("%s : %d\n", __func__, brigtness); sprdfb_dsi_gen_write(set_bl_seq, LCM_SEND(2) & LCM_TAG_MASK); } -EXPORT_SYMBOL(backlight_control); static int32_t sprdfb_dsi_gen_read(uint8_t *param, uint16_t param_length, uint8_t bytes_to_read, uint8_t *read_buffer) { diff --git a/drivers/video/sprdfb/sprdfb_i2c.c b/drivers/video/sprdfb/sprdfb_i2c.c index 37bdba4..ea89933 100644 --- a/drivers/video/sprdfb/sprdfb_i2c.c +++ b/drivers/video/sprdfb/sprdfb_i2c.c @@ -76,7 +76,7 @@ static int32_t sprdfb_i2c_read_8bits(uint8 addr, uint8_t reg, uint8_t *val) } for (i = 0; i < SPRDFB_I2C_TRY_NUM; i++) { - ret = I2C_ReadCmd(addr, *val, TRUE); + ret = I2C_ReadCmd(addr, (void*)(unsigned long)*val, TRUE); if (ret != ERR_I2C_NONE) { printf("sprdfb:[%s]: read i2c reg fail(2), ret: %d, I2C r addr: 0x%x \n", __FUNCTION__, ret, addr); diff --git a/drivers/video/sprdfb/sprdfb_main.c b/drivers/video/sprdfb/sprdfb_main.c index 59d794c..7afa52e 100644 --- a/drivers/video/sprdfb/sprdfb_main.c +++ b/drivers/video/sprdfb/sprdfb_main.c @@ -43,7 +43,10 @@ int lcd_color_bg; short console_col; short console_row; - +struct gpio_chip; +extern int sprd_gpio_request(struct gpio_chip *chip, unsigned offset); +extern int sprd_gpio_direction_output(struct gpio_chip *chip, unsigned offset, int value); +extern void sprd_gpio_set(struct gpio_chip *chip, unsigned offset, int value); extern int sprdfb_panel_probe(struct sprdfb_device *dev); extern void sprdfb_panel_remove(struct sprdfb_device *dev); @@ -64,11 +67,6 @@ static unsigned char hbm_g[(15 * 2) + 1] = {0}; #define WHTLED_V_SHIFT 2 #define WHTLED_V_MSK (0x1F << WHTLED_V_SHIFT) -static void __raw_bits_and(unsigned int v, unsigned int a) -{ - __raw_writel((__raw_readl(a) & v), a); -} - static void __raw_bits_or(unsigned int v, unsigned int a) { __raw_writel((__raw_readl(a) | v), a); @@ -105,6 +103,7 @@ void LCD_SetBackLightBrightness( unsigned long value) LCD_SetPwmRatio(duty_mod); } +#if defined(CONFIG_SPX15) && defined(CONFIG_EMMC_BOOT) static uint32 get_adie_chipid(void) { uint32 chip_id; @@ -112,6 +111,7 @@ static uint32 get_adie_chipid(void) chip_id |= ANA_REG_GET(ANA_REG_GLB_CHIP_ID_LOW) & 0xffff; return chip_id; } +#endif void sprd_white_led_init(void) { @@ -391,7 +391,9 @@ static char byte2hex(unsigned char b) return '0' + b; if (b >= 10 && b <= 15) return 'a' + (b - 10); -/* return '0'; */ + + /* should not be here */ + return '0'; } static void hex_encoder(unsigned char *in, char *out, int sz) @@ -408,7 +410,7 @@ static void hex_encoder(unsigned char *in, char *out, int sz) void save_mtp_offset_to_kernel(uint8_t *mtp) { - hex_encoder((unsigned char *)mtp, mtp_offset, (MTP_LEN + 6)); + hex_encoder((unsigned char *)mtp, (char *)mtp_offset, (MTP_LEN + 6)); mtp_offset[(MTP_LEN + 6) * 2] = '\0'; } @@ -429,7 +431,7 @@ uint8_t load_elvss_offset_to_kernel(void) void save_hbm_offset_to_kernel(uint8_t *hbm) { - hex_encoder((unsigned char *)hbm, hbm_g, 15); + hex_encoder((unsigned char *)hbm, (char *)hbm_g, 15); hbm_g[15 * 2] = '\0'; } diff --git a/drivers/video/sprdfb/sprdfb_panel.c b/drivers/video/sprdfb/sprdfb_panel.c index cb9a977..452aff7 100644 --- a/drivers/video/sprdfb/sprdfb_panel.c +++ b/drivers/video/sprdfb/sprdfb_panel.c @@ -56,6 +56,13 @@ extern struct panel_spec lcd_s6d77a1_mipi_spec; extern struct panel_spec lcd_nt51017_mipi_spec; extern struct panel_spec lcd_hx8394d_mipi_spec; +struct gpio_chip; + +extern void save_lcd_id_to_kernel(uint32_t id); +extern int sprd_gpio_request(struct gpio_chip *chip, unsigned offset); +extern int sprd_gpio_direction_output(struct gpio_chip *chip, unsigned offset, int value); +extern void sprd_gpio_set(struct gpio_chip *chip, unsigned offset, int value); + void sprdfb_panel_remove(struct sprdfb_device *dev); static ushort colormap[256]; diff --git a/drivers/video/sprdfb/sprdfb_rgb.c b/drivers/video/sprdfb/sprdfb_rgb.c index 386808a..26f31ce 100644 --- a/drivers/video/sprdfb/sprdfb_rgb.c +++ b/drivers/video/sprdfb/sprdfb_rgb.c @@ -25,7 +25,7 @@ static uint32_t rgb_readid(struct panel_spec *self) /* default id reg is 0 */ if(SPRDFB_RGB_BUS_TYPE_I2C == rgb->cmd_bus_mode){ - rgb->bus_info.i2c->ops->i2c_read_16bits(rgb->bus_info.i2c->i2c_addr , 0x0, FALSE, &id, FALSE); + rgb->bus_info.i2c->ops->i2c_read_16bits(rgb->bus_info.i2c->i2c_addr , 0x0, FALSE, (void *)&id, FALSE); }else{ rgb->bus_info.spi->ops->spi_send_cmd(0x0); rgb->bus_info.spi->ops->spi_read(&id);