redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

video: fbdev: mmp: fix sparse warnings about using incorrect types 

Use ->screen_buffer instead of ->screen_base in mmpfb driver.

[ Please see commit 17a7b0b4d9 ("fb.h: Provide alternate screen_base
  pointer") for details. ]

Also fix all other sparse warnings about using incorrect types in
mmp display subsystem.

Reviewed-by: Andrzej Hajda <a.hajda@samsung.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ee796b43-f200-d41a-b18c-ae3d6bcaaa67@samsung.com
alistair/sensors
Bartlomiej Zolnierkiewicz 2019-06-27 16:08:43 +02:00
parent dd90e9ae55
commit e41f6b17ab
4 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/fbdev/mmp/fb/mmpfb.c
View File

@ -522,7 +522,7 @@ static int fb_info_setup(struct fb_info *info,
info->var.bits_per_pixel / 8; info->var.bits_per_pixel / 8;
info->fbops = &mmpfb_ops; info->fbops = &mmpfb_ops;
info->pseudo_palette = fbi->pseudo_palette; info->pseudo_palette = fbi->pseudo_palette;
info->screen_base = fbi->fb_start; info->screen_buffer = fbi->fb_start;
info->screen_size = fbi->fb_size; info->screen_size = fbi->fb_size;
/* For FB framework: Allocate color map and Register framebuffer*/ /* For FB framework: Allocate color map and Register framebuffer*/

53
drivers/video/fbdev/mmp/hw/mmp_ctrl.c
View File

@ -136,19 +136,26 @@ static void overlay_set_win(struct mmp_overlay *overlay, struct mmp_win *win)
mutex_lock(&overlay->access_ok); mutex_lock(&overlay->access_ok);
if (overlay_is_vid(overlay)) { if (overlay_is_vid(overlay)) {
writel_relaxed(win->pitch[0], &regs->v_pitch_yc); writel_relaxed(win->pitch[0],
writel_relaxed(win->pitch[2] << 16 | (void __iomem *)&regs->v_pitch_yc);
win->pitch[1], &regs->v_pitch_uv); writel_relaxed(win->pitch[2] << 16 | win->pitch[1],
(void __iomem *)&regs->v_pitch_uv);
writel_relaxed((win->ysrc << 16) | win->xsrc, &regs->v_size); writel_relaxed((win->ysrc << 16) | win->xsrc,
writel_relaxed((win->ydst << 16) | win->xdst, &regs->v_size_z); (void __iomem *)&regs->v_size);
writel_relaxed(win->ypos << 16 | win->xpos, &regs->v_start); writel_relaxed((win->ydst << 16) | win->xdst,
(void __iomem *)&regs->v_size_z);
writel_relaxed(win->ypos << 16 | win->xpos,
(void __iomem *)&regs->v_start);
} else { } else {
writel_relaxed(win->pitch[0], &regs->g_pitch); writel_relaxed(win->pitch[0], (void __iomem *)&regs->g_pitch);
writel_relaxed((win->ysrc << 16) | win->xsrc, &regs->g_size); writel_relaxed((win->ysrc << 16) | win->xsrc,
writel_relaxed((win->ydst << 16) | win->xdst, &regs->g_size_z); (void __iomem *)&regs->g_size);
writel_relaxed(win->ypos << 16 | win->xpos, &regs->g_start); writel_relaxed((win->ydst << 16) | win->xdst,
(void __iomem *)&regs->g_size_z);
writel_relaxed(win->ypos << 16 | win->xpos,
(void __iomem *)&regs->g_start);
} }
dmafetch_set_fmt(overlay); dmafetch_set_fmt(overlay);
@ -233,11 +240,11 @@ static int overlay_set_addr(struct mmp_overlay *overlay, struct mmp_addr *addr)
memcpy(&overlay->addr, addr, sizeof(struct mmp_addr)); memcpy(&overlay->addr, addr, sizeof(struct mmp_addr));
if (overlay_is_vid(overlay)) { if (overlay_is_vid(overlay)) {
writel_relaxed(addr->phys[0], &regs->v_y0); writel_relaxed(addr->phys[0], (void __iomem *)&regs->v_y0);
writel_relaxed(addr->phys[1], &regs->v_u0); writel_relaxed(addr->phys[1], (void __iomem *)&regs->v_u0);
writel_relaxed(addr->phys[2], &regs->v_v0); writel_relaxed(addr->phys[2], (void __iomem *)&regs->v_v0);
} else } else
writel_relaxed(addr->phys[0], &regs->g_0); writel_relaxed(addr->phys[0], (void __iomem *)&regs->g_0);
return overlay->addr.phys[0]; return overlay->addr.phys[0];
} }
@ -268,16 +275,18 @@ static void path_set_mode(struct mmp_path *path, struct mmp_mode *mode)
tmp |= dsi_rbswap & CFG_INTFRBSWAP_MASK; tmp |= dsi_rbswap & CFG_INTFRBSWAP_MASK;
writel_relaxed(tmp, ctrl_regs(path) + intf_rbswap_ctrl(path->id)); writel_relaxed(tmp, ctrl_regs(path) + intf_rbswap_ctrl(path->id));
writel_relaxed((mode->yres << 16) | mode->xres, &regs->screen_active); writel_relaxed((mode->yres << 16) | mode->xres,
(void __iomem *)&regs->screen_active);
writel_relaxed((mode->left_margin << 16) | mode->right_margin, writel_relaxed((mode->left_margin << 16) | mode->right_margin,
&regs->screen_h_porch); (void __iomem *)&regs->screen_h_porch);
writel_relaxed((mode->upper_margin << 16) | mode->lower_margin, writel_relaxed((mode->upper_margin << 16) | mode->lower_margin,
&regs->screen_v_porch); (void __iomem *)&regs->screen_v_porch);
total_x = mode->xres + mode->left_margin + mode->right_margin + total_x = mode->xres + mode->left_margin + mode->right_margin +
mode->hsync_len; mode->hsync_len;
total_y = mode->yres + mode->upper_margin + mode->lower_margin + total_y = mode->yres + mode->upper_margin + mode->lower_margin +
mode->vsync_len; mode->vsync_len;
writel_relaxed((total_y << 16) | total_x, &regs->screen_size); writel_relaxed((total_y << 16) | total_x,
(void __iomem *)&regs->screen_size);
/* vsync ctrl */ /* vsync ctrl */
if (path->output_type == PATH_OUT_DSI) if (path->output_type == PATH_OUT_DSI)
@ -285,7 +294,7 @@ static void path_set_mode(struct mmp_path *path, struct mmp_mode *mode)
else else
vsync_ctrl = ((mode->xres + mode->right_margin) << 16) vsync_ctrl = ((mode->xres + mode->right_margin) << 16)
| (mode->xres + mode->right_margin); | (mode->xres + mode->right_margin);
writel_relaxed(vsync_ctrl, &regs->vsync_ctrl); writel_relaxed(vsync_ctrl, (void __iomem *)&regs->vsync_ctrl);
/* set pixclock div */ /* set pixclock div */
sclk_src = clk_get_rate(path_to_ctrl(path)->clk); sclk_src = clk_get_rate(path_to_ctrl(path)->clk);
@ -366,9 +375,9 @@ static void path_set_default(struct mmp_path *path)
writel_relaxed(dma_ctrl1, ctrl_regs(path) + dma_ctrl(1, path->id)); writel_relaxed(dma_ctrl1, ctrl_regs(path) + dma_ctrl(1, path->id));
/* Configure default register values */ /* Configure default register values */
writel_relaxed(0x00000000, &regs->blank_color); writel_relaxed(0x00000000, (void __iomem *)&regs->blank_color);
writel_relaxed(0x00000000, &regs->g_1); writel_relaxed(0x00000000, (void __iomem *)&regs->g_1);
writel_relaxed(0x00000000, &regs->g_start); writel_relaxed(0x00000000, (void __iomem *)&regs->g_start);
/* /*
* 1.enable multiple burst request in DMA AXI * 1.enable multiple burst request in DMA AXI

10
drivers/video/fbdev/mmp/hw/mmp_ctrl.h
View File

@ -1393,7 +1393,7 @@ struct mmphw_ctrl {
/* platform related, get from config */ /* platform related, get from config */
const char *name; const char *name;
int irq; int irq;
void *reg_base; void __iomem *reg_base;
struct clk *clk; struct clk *clk;
/* sys info */ /* sys info */
@ -1429,7 +1429,7 @@ static inline struct mmphw_ctrl *overlay_to_ctrl(struct mmp_overlay *overlay)
return path_to_ctrl(overlay->path); return path_to_ctrl(overlay->path);
} }
static inline void *ctrl_regs(struct mmp_path *path) static inline void __iomem *ctrl_regs(struct mmp_path *path)
{ {
return path_to_ctrl(path)->reg_base; return path_to_ctrl(path)->reg_base;
} }
@ -1438,11 +1438,11 @@ static inline void *ctrl_regs(struct mmp_path *path)
static inline struct lcd_regs *path_regs(struct mmp_path *path) static inline struct lcd_regs *path_regs(struct mmp_path *path)
{ {
if (path->id == PATH_PN) if (path->id == PATH_PN)
return (struct lcd_regs *)(ctrl_regs(path) + 0xc0); return (struct lcd_regs __force *)(ctrl_regs(path) + 0xc0);
else if (path->id == PATH_TV) else if (path->id == PATH_TV)
return (struct lcd_regs *)ctrl_regs(path); return (struct lcd_regs __force *)ctrl_regs(path);
else if (path->id == PATH_P2) else if (path->id == PATH_P2)
return (struct lcd_regs *)(ctrl_regs(path) + 0x200); return (struct lcd_regs __force *)(ctrl_regs(path) + 0x200);
else { else {
dev_err(path->dev, "path id %d invalid\n", path->id); dev_err(path->dev, "path id %d invalid\n", path->id);
BUG_ON(1); BUG_ON(1);

6
drivers/video/fbdev/mmp/hw/mmp_spi.c
View File

@ -31,7 +31,7 @@ static inline int lcd_spi_write(struct spi_device *spi, u32 data)
{ {
int timeout = 100000, isr, ret = 0; int timeout = 100000, isr, ret = 0;
u32 tmp; u32 tmp;
void *reg_base = void __iomem *reg_base = (void __iomem *)
*(void **)spi_master_get_devdata(spi->master); *(void **)spi_master_get_devdata(spi->master);
/* clear ISR */ /* clear ISR */
@ -80,7 +80,7 @@ static inline int lcd_spi_write(struct spi_device *spi, u32 data)
static int lcd_spi_setup(struct spi_device *spi) static int lcd_spi_setup(struct spi_device *spi)
{ {
void *reg_base = void __iomem *reg_base = (void __iomem *)
*(void **)spi_master_get_devdata(spi->master); *(void **)spi_master_get_devdata(spi->master);
u32 tmp; u32 tmp;
@ -146,7 +146,7 @@ int lcd_spi_register(struct mmphw_ctrl *ctrl)
return -ENOMEM; return -ENOMEM;
} }
p_regbase = spi_master_get_devdata(master); p_regbase = spi_master_get_devdata(master);
*p_regbase = ctrl->reg_base; *p_regbase = (void __force *)ctrl->reg_base;
/* set bus num to 5 to avoid conflict with other spi hosts */ /* set bus num to 5 to avoid conflict with other spi hosts */
master->bus_num = 5; master->bus_num = 5;