Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24e05e7a authored by Noralf Trønnes's avatar Noralf Trønnes
Browse files

drm/tinydrm/mi0283qt: Remove ili9341.h 



No need for a public header file for the command macros.
Just include the necessary ones in the driver.

Also use the MIPI_DCS_PIXEL_FMT_16BIT macro.

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarDavid Lechner <david@lechnology.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180110185940.53841-3-noralf@tronnes.org
parent 2a678996

drivers/gpu/drm/tinydrm/mi0283qt.c

+26 −2
Original line number Diff line number Diff line
@@ -18,11 +18,35 @@ 


#include <drm/drm_fb_helper.h>

#include <drm/drm_modeset_helper.h>

#include <drm/tinydrm/ili9341.h>

#include <drm/tinydrm/mipi-dbi.h>

#include <drm/tinydrm/tinydrm-helpers.h>

#include <video/mipi_display.h>



#define ILI9341_FRMCTR1		0xb1

#define ILI9341_DISCTRL		0xb6

#define ILI9341_ETMOD		0xb7



#define ILI9341_PWCTRL1		0xc0

#define ILI9341_PWCTRL2		0xc1

#define ILI9341_VMCTRL1		0xc5

#define ILI9341_VMCTRL2		0xc7

#define ILI9341_PWCTRLA		0xcb

#define ILI9341_PWCTRLB		0xcf



#define ILI9341_PGAMCTRL	0xe0

#define ILI9341_NGAMCTRL	0xe1

#define ILI9341_DTCTRLA		0xe8

#define ILI9341_DTCTRLB		0xea

#define ILI9341_PWRSEQ		0xed



#define ILI9341_EN3GAM		0xf2

#define ILI9341_PUMPCTRL	0xf7



#define ILI9341_MADCTL_BGR	BIT(3)

#define ILI9341_MADCTL_MV	BIT(5)

#define ILI9341_MADCTL_MX	BIT(6)

#define ILI9341_MADCTL_MY	BIT(7)



static int mi0283qt_init(struct mipi_dbi *mipi)

{

	struct tinydrm_device *tdev = &mipi->tinydrm;
@@ -69,7 +93,7 @@ static int mi0283qt_init(struct mipi_dbi *mipi) 
	mipi_dbi_command(mipi, ILI9341_VMCTRL2, 0xbe);



	/* Memory Access Control */

	mipi_dbi_command(mipi, MIPI_DCS_SET_PIXEL_FORMAT, 0x55);

	mipi_dbi_command(mipi, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT);



	switch (mipi->rotation) {

	default:

include/drm/tinydrm/ili9341.h

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
/*

 * ILI9341 LCD controller

 *

 * Copyright 2016 Noralf Trønnes

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#ifndef __LINUX_ILI9341_H

#define __LINUX_ILI9341_H



#define ILI9341_FRMCTR1    0xb1

#define ILI9341_FRMCTR2    0xb2

#define ILI9341_FRMCTR3    0xb3

#define ILI9341_INVTR      0xb4

#define ILI9341_PRCTR      0xb5

#define ILI9341_DISCTRL    0xb6

#define ILI9341_ETMOD      0xb7



#define ILI9341_PWCTRL1    0xc0

#define ILI9341_PWCTRL2    0xc1

#define ILI9341_VMCTRL1    0xc5

#define ILI9341_VMCTRL2    0xc7

#define ILI9341_PWCTRLA    0xcb

#define ILI9341_PWCTRLB    0xcf



#define ILI9341_RDID1      0xda

#define ILI9341_RDID2      0xdb

#define ILI9341_RDID3      0xdc

#define ILI9341_RDID4      0xd3



#define ILI9341_PGAMCTRL   0xe0

#define ILI9341_NGAMCTRL   0xe1

#define ILI9341_DGAMCTRL1  0xe2

#define ILI9341_DGAMCTRL2  0xe3

#define ILI9341_DTCTRLA    0xe8

#define ILI9341_DTCTRLB    0xea

#define ILI9341_PWRSEQ     0xed



#define ILI9341_EN3GAM     0xf2

#define ILI9341_IFCTRL     0xf6

#define ILI9341_PUMPCTRL   0xf7



#define ILI9341_MADCTL_MH  BIT(2)

#define ILI9341_MADCTL_BGR BIT(3)

#define ILI9341_MADCTL_ML  BIT(4)

#define ILI9341_MADCTL_MV  BIT(5)

#define ILI9341_MADCTL_MX  BIT(6)

#define ILI9341_MADCTL_MY  BIT(7)



#endif /* __LINUX_ILI9341_H */