Commit 95808932 authored by Priit Laes's avatar Priit Laes Committed by Greg Kroah-Hartman

staging: fbtft: Use standard MIPI DCS command defines for hx8357d

This patch makes use of the standard MIPI Display Command Set to remove
some of the magic constants found in source code.
Signed-off-by: default avatarPriit Laes <plaes@plaes.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fbf461d1
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <video/mipi_display.h>
#include "fbtft.h" #include "fbtft.h"
#include "fb_hx8357d.h" #include "fb_hx8357d.h"
...@@ -35,7 +36,7 @@ static int init_display(struct fbtft_par *par) ...@@ -35,7 +36,7 @@ static int init_display(struct fbtft_par *par)
par->fbtftops.reset(par); par->fbtftops.reset(par);
/* Reset things like Gamma */ /* Reset things like Gamma */
write_reg(par, HX8357B_SWRESET); write_reg(par, MIPI_DCS_SOFT_RESET);
usleep_range(5000, 7000); usleep_range(5000, 7000);
/* setextc */ /* setextc */
...@@ -116,22 +117,22 @@ static int init_display(struct fbtft_par *par) ...@@ -116,22 +117,22 @@ static int init_display(struct fbtft_par *par)
0x01); 0x01);
/* 16 bit */ /* 16 bit */
write_reg(par, HX8357_COLMOD, 0x55); write_reg(par, MIPI_DCS_SET_PIXEL_FORMAT, 0x55);
write_reg(par, HX8357_MADCTL, 0xC0); write_reg(par, MIPI_DCS_SET_ADDRESS_MODE, 0xC0);
/* TE off */ /* TE off */
write_reg(par, HX8357_TEON, 0x00); write_reg(par, MIPI_DCS_SET_TEAR_ON, 0x00);
/* tear line */ /* tear line */
write_reg(par, HX8357_TEARLINE, 0x00, 0x02); write_reg(par, MIPI_DCS_SET_TEAR_SCANLINE, 0x00, 0x02);
/* Exit Sleep */ /* Exit Sleep */
write_reg(par, HX8357_SLPOUT); write_reg(par, MIPI_DCS_EXIT_SLEEP_MODE);
msleep(150); msleep(150);
/* display on */ /* display on */
write_reg(par, HX8357_DISPON); write_reg(par, MIPI_DCS_SET_DISPLAY_ON);
usleep_range(5000, 7000); usleep_range(5000, 7000);
return 0; return 0;
...@@ -139,18 +140,15 @@ static int init_display(struct fbtft_par *par) ...@@ -139,18 +140,15 @@ static int init_display(struct fbtft_par *par)
static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye) static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
{ {
/* Column addr set */ write_reg(par, MIPI_DCS_SET_COLUMN_ADDRESS,
write_reg(par, HX8357_CASET,
xs >> 8, xs & 0xff, /* XSTART */ xs >> 8, xs & 0xff, /* XSTART */
xe >> 8, xe & 0xff); /* XEND */ xe >> 8, xe & 0xff); /* XEND */
/* Row addr set */ write_reg(par, MIPI_DCS_SET_PAGE_ADDRESS,
write_reg(par, HX8357_PASET,
ys >> 8, ys & 0xff, /* YSTART */ ys >> 8, ys & 0xff, /* YSTART */
ye >> 8, ye & 0xff); /* YEND */ ye >> 8, ye & 0xff); /* YEND */
/* write to RAM */ write_reg(par, MIPI_DCS_WRITE_MEMORY_START);
write_reg(par, HX8357_RAMWR);
} }
#define HX8357D_MADCTL_MY 0x80 #define HX8357D_MADCTL_MY 0x80
...@@ -182,7 +180,7 @@ static int set_var(struct fbtft_par *par) ...@@ -182,7 +180,7 @@ static int set_var(struct fbtft_par *par)
val |= (par->bgr ? HX8357D_MADCTL_RGB : HX8357D_MADCTL_BGR); val |= (par->bgr ? HX8357D_MADCTL_RGB : HX8357D_MADCTL_BGR);
/* Memory Access Control */ /* Memory Access Control */
write_reg(par, HX8357_MADCTL, val); write_reg(par, MIPI_DCS_SET_ADDRESS_MODE, val);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment