Clean up more warnings
Change-Id: I8fc1a0a55a421ee3dbdcb484fbea71192359471d
diff --git a/include/platform/timer.h b/include/platform/timer.h
index f2085c0..b868b18 100644
--- a/include/platform/timer.h
+++ b/include/platform/timer.h
@@ -30,6 +30,8 @@
void mdelay(unsigned msecs);
void udelay(unsigned usecs);
+uint32_t platform_tick_rate(void);
+
#endif
diff --git a/platform/msm8960/platform.c b/platform/msm8960/platform.c
index d20af34..b931bbf 100644
--- a/platform/msm8960/platform.c
+++ b/platform/msm8960/platform.c
@@ -38,12 +38,15 @@
#include <arch/arm/mmu.h>
extern void platform_init_timer(void);
+extern void platform_panel_backlight_on(void);
+extern void platform_uninit_timer(void);
extern void mipi_panel_reset(void);
extern void mipi_dsi_panel_power_on(void);
extern void mdp_clock_init(void);
extern void mmss_clock_init(void);
extern struct fbcon_config *mipi_init(void);
extern void mipi_dsi_shutdown(void);
+extern uint8_t target_uart_gsbi(void);
static uint32_t ticks_per_sec = 0;
diff --git a/platform/msm_shared/hsusb.c b/platform/msm_shared/hsusb.c
index 355f5de..26c4f66 100644
--- a/platform/msm_shared/hsusb.c
+++ b/platform/msm_shared/hsusb.c
@@ -268,11 +268,11 @@
ept->head->info = 0;
ept->req = req;
- arch_clean_invalidate_cache_range(ept, sizeof(struct udc_endpoint));
- arch_clean_invalidate_cache_range(ept->head, sizeof(struct ept_queue_head));
- arch_clean_invalidate_cache_range(ept->req, sizeof(struct usb_request));
- arch_clean_invalidate_cache_range(req->req.buf, req->req.length);
- arch_clean_invalidate_cache_range(ept->req->item, sizeof(struct ept_queue_item));
+ arch_clean_invalidate_cache_range((addr_t) ept, sizeof(struct udc_endpoint));
+ arch_clean_invalidate_cache_range((addr_t) ept->head, sizeof(struct ept_queue_head));
+ arch_clean_invalidate_cache_range((addr_t) ept->req, sizeof(struct usb_request));
+ arch_clean_invalidate_cache_range((addr_t) req->req.buf, req->req.length);
+ arch_clean_invalidate_cache_range((addr_t) ept->req->item, sizeof(struct ept_queue_item));
DBG("ept%d %s queue req=%p\n",
ept->num, ept->in ? "in" : "out", req);
@@ -292,8 +292,8 @@
DBG("ept%d %s complete req=%p\n",
ept->num, ept->in ? "in" : "out", ept->req);
- arch_clean_invalidate_cache_range(ept, sizeof(struct udc_endpoint));
- arch_clean_invalidate_cache_range(ept->req, sizeof(struct usb_request));
+ arch_clean_invalidate_cache_range((addr_t) ept, sizeof(struct udc_endpoint));
+ arch_clean_invalidate_cache_range((addr_t) ept->req, sizeof(struct usb_request));
req = ept->req;
if(req) {
@@ -310,10 +310,10 @@
/* Must clean/invalidate cached item data before checking
* the status every time.
*/
- arch_clean_invalidate_cache_range(item, sizeof(struct ept_queue_item));
+ arch_clean_invalidate_cache_range((addr_t) item, sizeof(struct ept_queue_item));
} while (readl(&(item->info)) & INFO_ACTIVE);
- arch_clean_invalidate_cache_range(req->req.buf, req->req.length);
+ arch_clean_invalidate_cache_range((addr_t) req->req.buf, req->req.length);
if(item->info & 0xff) {
actual = 0;
@@ -394,7 +394,7 @@
{
struct setup_packet s;
- arch_clean_invalidate_cache_range(ept->head->setup_data, sizeof(struct ept_queue_head));
+ arch_clean_invalidate_cache_range((addr_t) ept->head->setup_data, sizeof(struct ept_queue_head));
memcpy(&s, ept->head->setup_data, sizeof(s));
writel(ept->bit, USB_ENDPTSETUPSTAT);
@@ -555,7 +555,7 @@
dprintf(INFO, "USB init ept @ %p\n", epts);
memset(epts, 0, 32 * sizeof(struct ept_queue_head));
- arch_clean_invalidate_cache_range(epts, 32 * sizeof(struct ept_queue_head));
+ arch_clean_invalidate_cache_range((addr_t) epts, 32 * sizeof(struct ept_queue_head));
//dprintf(INFO, "USB ID %08x\n", readl(USB_ID));
// board_usb_init();
diff --git a/platform/msm_shared/include/mipi_dsi.h b/platform/msm_shared/include/mipi_dsi.h
index 53a3b78..39f0fa6 100644
--- a/platform/msm_shared/include/mipi_dsi.h
+++ b/platform/msm_shared/include/mipi_dsi.h
@@ -484,20 +484,20 @@
};
static struct mipi_dsi_cmd toshiba_panel_video_mode_cmds[] = {
- {sizeof(toshiba_panel_mcap_off), toshiba_panel_mcap_off},
- {sizeof(toshiba_panel_ena_test_reg), toshiba_panel_ena_test_reg},
- {sizeof(toshiba_panel_num_of_1lane), toshiba_panel_num_of_1lane},
- {sizeof(toshiba_panel_non_burst_sync_pulse), toshiba_panel_non_burst_sync_pulse},
- {sizeof(toshiba_panel_set_DMODE_WVGA), toshiba_panel_set_DMODE_WVGA},
- {sizeof(toshiba_panel_set_intern_WR_clk1_wvga), toshiba_panel_set_intern_WR_clk1_wvga},
- {sizeof(toshiba_panel_set_intern_WR_clk2_wvga), toshiba_panel_set_intern_WR_clk2_wvga},
- {sizeof(toshiba_panel_set_hor_addr_2A_wvga), toshiba_panel_set_hor_addr_2A_wvga},
- {sizeof(toshiba_panel_set_hor_addr_2B_wvga), toshiba_panel_set_hor_addr_2B_wvga},
- {sizeof(toshiba_panel_IFSEL), toshiba_panel_IFSEL},
- {sizeof(toshiba_panel_exit_sleep), toshiba_panel_exit_sleep},
- {sizeof(toshiba_panel_display_on), toshiba_panel_display_on},
- {sizeof(dsi_display_config_color_mode_on), dsi_display_config_color_mode_on},
- {sizeof(dsi_display_config_color_mode_off), dsi_display_config_color_mode_off},
+ {sizeof(toshiba_panel_mcap_off), (char *) toshiba_panel_mcap_off},
+ {sizeof(toshiba_panel_ena_test_reg), (char *) toshiba_panel_ena_test_reg},
+ {sizeof(toshiba_panel_num_of_1lane), (char *) toshiba_panel_num_of_1lane},
+ {sizeof(toshiba_panel_non_burst_sync_pulse), (char *) toshiba_panel_non_burst_sync_pulse},
+ {sizeof(toshiba_panel_set_DMODE_WVGA), (char *) toshiba_panel_set_DMODE_WVGA},
+ {sizeof(toshiba_panel_set_intern_WR_clk1_wvga), (char *) toshiba_panel_set_intern_WR_clk1_wvga},
+ {sizeof(toshiba_panel_set_intern_WR_clk2_wvga), (char *) toshiba_panel_set_intern_WR_clk2_wvga},
+ {sizeof(toshiba_panel_set_hor_addr_2A_wvga), (char *) toshiba_panel_set_hor_addr_2A_wvga},
+ {sizeof(toshiba_panel_set_hor_addr_2B_wvga), (char *) toshiba_panel_set_hor_addr_2B_wvga},
+ {sizeof(toshiba_panel_IFSEL), (char *) toshiba_panel_IFSEL},
+ {sizeof(toshiba_panel_exit_sleep), (char *) toshiba_panel_exit_sleep},
+ {sizeof(toshiba_panel_display_on), (char *) toshiba_panel_display_on},
+ {sizeof(dsi_display_config_color_mode_on), (char *) dsi_display_config_color_mode_on},
+ {sizeof(dsi_display_config_color_mode_off), (char *) dsi_display_config_color_mode_off},
};
static struct mipi_dsi_phy_ctrl mipi_dsi_toshiba_panel_phy_ctrl = {
@@ -531,41 +531,41 @@
static struct mipi_dsi_cmd toshiba_mdt61_video_mode_cmds[] = {
- {sizeof(toshiba_mdt61_mcap_start), toshiba_mdt61_mcap_start},
- {sizeof(toshiba_mdt61_num_out_pixelform),toshiba_mdt61_num_out_pixelform},
- {sizeof(toshiba_mdt61_dsi_ctrl), toshiba_mdt61_dsi_ctrl},
- {sizeof(toshiba_mdt61_panel_driving), toshiba_mdt61_panel_driving},
- {sizeof(toshiba_mdt61_dispV_timing), toshiba_mdt61_dispV_timing},
- {sizeof(toshiba_mdt61_dispCtrl), toshiba_mdt61_dispCtrl},
- {sizeof(toshiba_mdt61_test_mode_c4), toshiba_mdt61_test_mode_c4},
- {sizeof(toshiba_mdt61_dispH_timing), toshiba_mdt61_dispH_timing},
- {sizeof(toshiba_mdt61_test_mode_c6), toshiba_mdt61_test_mode_c6},
- {sizeof(toshiba_mdt61_gamma_setA), toshiba_mdt61_gamma_setA},
- {sizeof(toshiba_mdt61_gamma_setB), toshiba_mdt61_gamma_setB},
- {sizeof(toshiba_mdt61_gamma_setC), toshiba_mdt61_gamma_setC},
- {sizeof(toshiba_mdt61_powerSet_ChrgPmp),toshiba_mdt61_powerSet_ChrgPmp},
- {sizeof(toshiba_mdt61_testMode_d1), toshiba_mdt61_testMode_d1},
- {sizeof(toshiba_mdt61_powerSet_SrcAmp),toshiba_mdt61_powerSet_SrcAmp},
- {sizeof(toshiba_mdt61_powerInt_PS), toshiba_mdt61_powerInt_PS},
- {sizeof(toshiba_mdt61_vreg), toshiba_mdt61_vreg},
- {sizeof(toshiba_mdt61_test_mode_d6), toshiba_mdt61_test_mode_d6},
- {sizeof(toshiba_mdt61_timingCtrl_d7), toshiba_mdt61_timingCtrl_d7},
- {sizeof(toshiba_mdt61_timingCtrl_d8), toshiba_mdt61_timingCtrl_d8},
- {sizeof(toshiba_mdt61_timingCtrl_d9), toshiba_mdt61_timingCtrl_d9},
- {sizeof(toshiba_mdt61_white_balance), toshiba_mdt61_white_balance},
- {sizeof(toshiba_mdt61_vcs_settings), toshiba_mdt61_vcs_settings},
- {sizeof(toshiba_mdt61_vcom_dc_settings), toshiba_mdt61_vcom_dc_settings},
- {sizeof(toshiba_mdt61_testMode_e3), toshiba_mdt61_testMode_e3},
- {sizeof(toshiba_mdt61_testMode_e4), toshiba_mdt61_testMode_e4},
- {sizeof(toshiba_mdt61_testMode_e5), toshiba_mdt61_testMode_e5},
- {sizeof(toshiba_mdt61_testMode_fa), toshiba_mdt61_testMode_fa},
- {sizeof(toshiba_mdt61_testMode_fd), toshiba_mdt61_testMode_fd},
- {sizeof(toshiba_mdt61_testMode_fe), toshiba_mdt61_testMode_fe},
- {sizeof(toshiba_mdt61_mcap_end), toshiba_mdt61_mcap_end},
- {sizeof(toshiba_mdt61_set_add_mode), toshiba_mdt61_set_add_mode},
- {sizeof(toshiba_mdt61_set_pixel_format), toshiba_mdt61_set_pixel_format},
- {sizeof(dsi_display_exit_sleep), dsi_display_exit_sleep},
- {sizeof(dsi_display_display_on), dsi_display_display_on},
+ {sizeof(toshiba_mdt61_mcap_start), (char *) toshiba_mdt61_mcap_start},
+ {sizeof(toshiba_mdt61_num_out_pixelform), (char *) toshiba_mdt61_num_out_pixelform},
+ {sizeof(toshiba_mdt61_dsi_ctrl), (char *) toshiba_mdt61_dsi_ctrl},
+ {sizeof(toshiba_mdt61_panel_driving), (char *) toshiba_mdt61_panel_driving},
+ {sizeof(toshiba_mdt61_dispV_timing), (char *) toshiba_mdt61_dispV_timing},
+ {sizeof(toshiba_mdt61_dispCtrl), (char *) toshiba_mdt61_dispCtrl},
+ {sizeof(toshiba_mdt61_test_mode_c4), (char *) toshiba_mdt61_test_mode_c4},
+ {sizeof(toshiba_mdt61_dispH_timing), (char *) toshiba_mdt61_dispH_timing},
+ {sizeof(toshiba_mdt61_test_mode_c6), (char *) toshiba_mdt61_test_mode_c6},
+ {sizeof(toshiba_mdt61_gamma_setA), (char *) toshiba_mdt61_gamma_setA},
+ {sizeof(toshiba_mdt61_gamma_setB), (char *) toshiba_mdt61_gamma_setB},
+ {sizeof(toshiba_mdt61_gamma_setC), (char *) toshiba_mdt61_gamma_setC},
+ {sizeof(toshiba_mdt61_powerSet_ChrgPmp), (char *) toshiba_mdt61_powerSet_ChrgPmp},
+ {sizeof(toshiba_mdt61_testMode_d1), (char *) toshiba_mdt61_testMode_d1},
+ {sizeof(toshiba_mdt61_powerSet_SrcAmp), (char * )toshiba_mdt61_powerSet_SrcAmp},
+ {sizeof(toshiba_mdt61_powerInt_PS), (char *) toshiba_mdt61_powerInt_PS},
+ {sizeof(toshiba_mdt61_vreg), (char *) toshiba_mdt61_vreg},
+ {sizeof(toshiba_mdt61_test_mode_d6), (char *) toshiba_mdt61_test_mode_d6},
+ {sizeof(toshiba_mdt61_timingCtrl_d7), (char *) toshiba_mdt61_timingCtrl_d7},
+ {sizeof(toshiba_mdt61_timingCtrl_d8), (char *) toshiba_mdt61_timingCtrl_d8},
+ {sizeof(toshiba_mdt61_timingCtrl_d9), (char *) toshiba_mdt61_timingCtrl_d9},
+ {sizeof(toshiba_mdt61_white_balance), (char *) toshiba_mdt61_white_balance},
+ {sizeof(toshiba_mdt61_vcs_settings), (char *) toshiba_mdt61_vcs_settings},
+ {sizeof(toshiba_mdt61_vcom_dc_settings), (char *) toshiba_mdt61_vcom_dc_settings},
+ {sizeof(toshiba_mdt61_testMode_e3), (char *) toshiba_mdt61_testMode_e3},
+ {sizeof(toshiba_mdt61_testMode_e4), (char *) toshiba_mdt61_testMode_e4},
+ {sizeof(toshiba_mdt61_testMode_e5), (char *) toshiba_mdt61_testMode_e5},
+ {sizeof(toshiba_mdt61_testMode_fa), (char *) toshiba_mdt61_testMode_fa},
+ {sizeof(toshiba_mdt61_testMode_fd), (char *) toshiba_mdt61_testMode_fd},
+ {sizeof(toshiba_mdt61_testMode_fe), (char *) toshiba_mdt61_testMode_fe},
+ {sizeof(toshiba_mdt61_mcap_end), (char *) toshiba_mdt61_mcap_end},
+ {sizeof(toshiba_mdt61_set_add_mode), (char *) toshiba_mdt61_set_add_mode},
+ {sizeof(toshiba_mdt61_set_pixel_format), (char *) toshiba_mdt61_set_pixel_format},
+ {sizeof(dsi_display_exit_sleep), (char *) dsi_display_exit_sleep},
+ {sizeof(dsi_display_display_on), (char *) dsi_display_display_on},
};
static struct mipi_dsi_phy_ctrl mipi_dsi_toshiba_mdt61_panel_phy_ctrl = {
diff --git a/platform/msm_shared/mipi_dsi.c b/platform/msm_shared/mipi_dsi.c
index 9dd4a49..7057996 100644
--- a/platform/msm_shared/mipi_dsi.c
+++ b/platform/msm_shared/mipi_dsi.c
@@ -32,10 +32,12 @@
#include <mipi_dsi.h>
#include <dev/fbcon.h>
#include <stdlib.h>
+#include <string.h>
#include <debug.h>
#include <target/display.h>
#include <platform/iomap.h>
#include <platform/clock.h>
+#include <platform/timer.h>
extern void mdp_disable(void);
extern int mipi_dsi_cmd_config(struct fbcon_config mipi_fb_cfg, unsigned short num_of_lanes);
@@ -229,7 +231,7 @@
cm = cmds;
for (i = 0; i < count; i++) {
- memcpy(DSI_CMD_DMA_MEM_START_ADDR_PANEL, (cm->payload), cm->size);
+ memcpy((void *) DSI_CMD_DMA_MEM_START_ADDR_PANEL, (cm->payload), cm->size);
writel(DSI_CMD_DMA_MEM_START_ADDR_PANEL, DSI_DMA_CMD_OFFSET);
writel(cm->size, DSI_DMA_CMD_LENGTH); // reg 0x48 for this build
ret += dsi_cmd_dma_trigger_for_panel();
@@ -545,10 +547,11 @@
unsigned char eof_bllp_pwr = 0x9; // bit 12, 15, 1:low power stop mode or
// let cmd mode eng send packets in hs
// or lp mode
- unsigned short display_wd = mipi_fb_cfg.width;
- unsigned short display_ht = mipi_fb_cfg.height;
unsigned short image_wd = mipi_fb_cfg.width;
unsigned short image_ht = mipi_fb_cfg.height;
+#if !DISPLAY_MIPI_PANEL_TOSHIBA_MDT61
+ unsigned short display_wd = mipi_fb_cfg.width;
+ unsigned short display_ht = mipi_fb_cfg.height;
unsigned short hsync_porch_fp = MIPI_HSYNC_FRONT_PORCH_DCLK;
unsigned short hsync_porch_bp = MIPI_HSYNC_BACK_PORCH_DCLK;
unsigned short vsync_porch_fp = MIPI_VSYNC_FRONT_PORCH_LINES;
@@ -557,6 +560,7 @@
unsigned short vsync_width = MIPI_VSYNC_PULSE_WIDTH;
unsigned short dst_format = 0;
unsigned short traffic_mode = 0;
+#endif
unsigned short pack_pattern = 0x12; //BGR
unsigned char ystride = 3;
diff --git a/target/msm8960/init.c b/target/msm8960/init.c
index dc2115d..4267381 100644
--- a/target/msm8960/init.c
+++ b/target/msm8960/init.c
@@ -42,6 +42,7 @@
#include <dev/gpio_keypad.h>
#include <gsbi.h>
#include <target.h>
+#include <platform.h>
#define LINUX_MACHTYPE_8960_SIM 3230
#define LINUX_MACHTYPE_8960_RUMI3 3231
diff --git a/target/msm8960/panel.c b/target/msm8960/panel.c
index 328dcce..abdf2d1 100644
--- a/target/msm8960/panel.c
+++ b/target/msm8960/panel.c
@@ -86,7 +86,7 @@
static void mipi_dsi_calibration(void)
{
- int32_t i = 0;
+ uint32_t i = 0;
uint32_t term_cnt = 5000;
int32_t cal_busy = readl(MIPI_DSI_BASE + 0x550);