Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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: Priit Laes <plaes@plaes.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Priit Laes and committed by
Greg Kroah-Hartman
49475ed0 89823edc

+18 -17
+18 -17
drivers/staging/fbtft/fb_ili9486.c
··· 17 17 #include <linux/module.h> 18 18 #include <linux/kernel.h> 19 19 #include <linux/init.h> 20 + #include <video/mipi_display.h> 20 21 21 22 #include "fbtft.h" 22 23 ··· 29 28 static int default_init_sequence[] = { 30 29 /* Interface Mode Control */ 31 30 -1, 0xb0, 0x0, 32 - /* Sleep OUT */ 33 - -1, 0x11, 31 + -1, MIPI_DCS_EXIT_SLEEP_MODE, 34 32 -2, 250, 35 33 /* Interface Pixel Format */ 36 - -1, 0x3A, 0x55, 34 + -1, MIPI_DCS_SET_PIXEL_FORMAT, 0x55, 37 35 /* Power Control 3 */ 38 36 -1, 0xC2, 0x44, 39 37 /* VCOM Control 1 */ ··· 46 46 /* Digital Gamma Control 1 */ 47 47 -1, 0xE2, 0x0F, 0x32, 0x2E, 0x0B, 0x0D, 0x05, 0x47, 0x75, 48 48 0x37, 0x06, 0x10, 0x03, 0x24, 0x20, 0x00, 49 - /* Sleep OUT */ 50 - -1, 0x11, 51 - /* Display ON */ 52 - -1, 0x29, 49 + -1, MIPI_DCS_EXIT_SLEEP_MODE, 50 + -1, MIPI_DCS_SET_DISPLAY_ON, 53 51 /* end marker */ 54 52 -3 55 53 }; 56 54 57 55 static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye) 58 56 { 59 - /* Column address */ 60 - write_reg(par, 0x2A, xs >> 8, xs & 0xFF, xe >> 8, xe & 0xFF); 57 + write_reg(par, MIPI_DCS_SET_COLUMN_ADDRESS, 58 + xs >> 8, xs & 0xFF, xe >> 8, xe & 0xFF); 61 59 62 - /* Row address */ 63 - write_reg(par, 0x2B, ys >> 8, ys & 0xFF, ye >> 8, ye & 0xFF); 60 + write_reg(par, MIPI_DCS_SET_PAGE_ADDRESS, 61 + ys >> 8, ys & 0xFF, ye >> 8, ye & 0xFF); 64 62 65 - /* Memory write */ 66 - write_reg(par, 0x2C); 63 + write_reg(par, MIPI_DCS_WRITE_MEMORY_START); 67 64 } 68 65 69 66 static int set_var(struct fbtft_par *par) 70 67 { 71 68 switch (par->info->var.rotate) { 72 69 case 0: 73 - write_reg(par, 0x36, 0x80 | (par->bgr << 3)); 70 + write_reg(par, MIPI_DCS_SET_ADDRESS_MODE, 71 + 0x80 | (par->bgr << 3)); 74 72 break; 75 73 case 90: 76 - write_reg(par, 0x36, 0x20 | (par->bgr << 3)); 74 + write_reg(par, MIPI_DCS_SET_ADDRESS_MODE, 75 + 0x20 | (par->bgr << 3)); 77 76 break; 78 77 case 180: 79 - write_reg(par, 0x36, 0x40 | (par->bgr << 3)); 78 + write_reg(par, MIPI_DCS_SET_ADDRESS_MODE, 79 + 0x40 | (par->bgr << 3)); 80 80 break; 81 81 case 270: 82 - write_reg(par, 0x36, 0xE0 | (par->bgr << 3)); 82 + write_reg(par, MIPI_DCS_SET_ADDRESS_MODE, 83 + 0xE0 | (par->bgr << 3)); 83 84 break; 84 85 default: 85 86 break;