| Message ID | 20210211095058.473776-1-daniel@zonque.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/tiny: add driver for newhaven,1.8-128160EF | expand |
On Thu, Feb 11, 2021 at 10:50:58AM +0100, Daniel Mack wrote: > This patch adds support for Newhaven's NHD-1.8-128160EF display, featuring > an Ilitek ILI9163 controller. > > Signed-off-by: Daniel Mack <daniel@zonque.org> > --- > .../bindings/display/ilitek,ili9163.txt | 27 +++ I think the dt stuff needs to be split up and cc'ed to dt maintainers for ack. > drivers/gpu/drm/tiny/Kconfig | 13 + > drivers/gpu/drm/tiny/Makefile | 1 + > drivers/gpu/drm/tiny/ili9163.c | 224 ++++++++++++++++++ > 4 files changed, 265 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9163.txt > create mode 100644 drivers/gpu/drm/tiny/ili9163.c > > diff --git a/Documentation/devicetree/bindings/display/ilitek,ili9163.txt b/Documentation/devicetree/bindings/display/ilitek,ili9163.txt > new file mode 100644 > index 0000000000000..fee119991c14e > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/ilitek,ili9163.txt > @@ -0,0 +1,27 @@ > +Ilitek ILI9163 display panels > + > +This binding is for display panels using an Ilitek ILI9163 controller in SPI > +mode. > + > +Required properties: > +- compatible: "newhaven,1.8-128160EF", "ilitek,ili9163" > +- dc-gpios: D/C pin > +- reset-gpios: Reset pin > + > +The node for this driver must be a child node of a SPI controller, hence > +all mandatory properties described in ../spi/spi-bus.txt must be specified. > + > +Optional properties: > +- rotation: panel rotation in degrees counter clockwise (0,90,180,270) > +- backlight: phandle of the backlight device attached to the panel > + > +Example: > + display@0{ > + compatible = "newhaven,1.8-128160EF", "ilitek,ili9163" > + reg = <0>; > + spi-max-frequency = <32000000>; > + dc-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; > + reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; > + rotation = <270>; > + backlight = <&backlight>; > + }; > diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig > index 2b6414f0fa759..9de0c0eeea6f5 100644 > --- a/drivers/gpu/drm/tiny/Kconfig > +++ b/drivers/gpu/drm/tiny/Kconfig > @@ -41,6 +41,19 @@ config TINYDRM_HX8357D > > If M is selected the module will be called hx8357d. > > +config TINYDRM_ILI9163 > + tristate "DRM support for ILI9163 display panels" > + depends on DRM && SPI > + select DRM_KMS_HELPER > + select DRM_KMS_CMA_HELPER > + select DRM_MIPI_DBI > + select BACKLIGHT_CLASS_DEVICE > + help > + DRM driver for the following Ilitek ILI9163 panels: > + * NHD-1.8-128160EF 128x160 TFT > + > + If M is selected the module will be called ili9163. > + > config TINYDRM_ILI9225 > tristate "DRM support for ILI9225 display panels" > depends on DRM && SPI > diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile > index 6ae4e9e5a35fb..78016b2ed11b5 100644 > --- a/drivers/gpu/drm/tiny/Makefile > +++ b/drivers/gpu/drm/tiny/Makefile > @@ -3,6 +3,7 @@ > obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o > obj-$(CONFIG_DRM_GM12U320) += gm12u320.o > obj-$(CONFIG_TINYDRM_HX8357D) += hx8357d.o > +obj-$(CONFIG_TINYDRM_ILI9163) += ili9163.o > obj-$(CONFIG_TINYDRM_ILI9225) += ili9225.o > obj-$(CONFIG_TINYDRM_ILI9341) += ili9341.o > obj-$(CONFIG_TINYDRM_ILI9486) += ili9486.o > diff --git a/drivers/gpu/drm/tiny/ili9163.c b/drivers/gpu/drm/tiny/ili9163.c > new file mode 100644 > index 0000000000000..9f90ea9556c4d > --- /dev/null > +++ b/drivers/gpu/drm/tiny/ili9163.c > @@ -0,0 +1,224 @@ > +// SPDX-License-Identifier: GPL-2.0+ > + > +#include <linux/backlight.h> > +#include <linux/delay.h> > +#include <linux/gpio/consumer.h> > +#include <linux/module.h> > +#include <linux/property.h> > +#include <linux/spi/spi.h> > + > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_gem_framebuffer_helper.h> > +#include <drm/drm_mipi_dbi.h> > +#include <drm/drm_modeset_helper.h> > +#include <video/mipi_display.h> > + > +#define ILI9163_FRMCTR1 0xb1 > + > +#define ILI9163_PWCTRL1 0xc0 > +#define ILI9163_PWCTRL2 0xc1 > +#define ILI9163_VMCTRL1 0xc5 > +#define ILI9163_VMCTRL2 0xc7 > +#define ILI9163_PWCTRLA 0xcb > +#define ILI9163_PWCTRLB 0xcf > + > +#define ILI9163_EN3GAM 0xf2 > + > +#define ILI9163_MADCTL_BGR BIT(3) > +#define ILI9163_MADCTL_MV BIT(5) > +#define ILI9163_MADCTL_MX BIT(6) > +#define ILI9163_MADCTL_MY BIT(7) > + > +static void yx240qv29_enable(struct drm_simple_display_pipe *pipe, > + struct drm_crtc_state *crtc_state, > + struct drm_plane_state *plane_state) > +{ > + struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(pipe->crtc.dev); > + struct mipi_dbi *dbi = &dbidev->dbi; > + u8 addr_mode; > + int ret, idx; > + > + if (!drm_dev_enter(pipe->crtc.dev, &idx)) > + return; > + > + DRM_DEBUG_KMS("\n"); > + > + ret = mipi_dbi_poweron_conditional_reset(dbidev); > + if (ret < 0) > + goto out_exit; > + if (ret == 1) > + goto out_enable; > + > + /* Gamma */ > + mipi_dbi_command(dbi, MIPI_DCS_SET_GAMMA_CURVE, 0x04); > + mipi_dbi_command(dbi, ILI9163_EN3GAM, 0x00); > + > + /* Frame Rate */ > + mipi_dbi_command(dbi, ILI9163_FRMCTR1, 0x0a, 0x14); > + > + /* Power Control */ > + mipi_dbi_command(dbi, ILI9163_PWCTRL1, 0x0a, 0x00); > + mipi_dbi_command(dbi, ILI9163_PWCTRL2, 0x02); > + > + /* VCOM */ > + mipi_dbi_command(dbi, ILI9163_VMCTRL1, 0x2f, 0x3e); > + mipi_dbi_command(dbi, ILI9163_VMCTRL2, 0x40); > + > + /* Memory Access Control */ > + mipi_dbi_command(dbi, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT); > + > + mipi_dbi_command(dbi, MIPI_DCS_EXIT_SLEEP_MODE); > + msleep(100); > + > + mipi_dbi_command(dbi, MIPI_DCS_SET_DISPLAY_ON); > + msleep(100); > + > +out_enable: > + switch (dbidev->rotation) { > + default: > + addr_mode = 0; > + break; > + case 90: > + addr_mode = ILI9163_MADCTL_MV | ILI9163_MADCTL_MX; > + break; > + case 180: > + addr_mode = ILI9163_MADCTL_MX | ILI9163_MADCTL_MY; > + break; > + case 270: > + addr_mode = ILI9163_MADCTL_MV | ILI9163_MADCTL_MY; > + break; > + } > + addr_mode |= ILI9163_MADCTL_BGR; > + mipi_dbi_command(dbi, MIPI_DCS_SET_ADDRESS_MODE, addr_mode); > + mipi_dbi_enable_flush(dbidev, crtc_state, plane_state); > +out_exit: > + drm_dev_exit(idx); > +} > + > +static const struct drm_simple_display_pipe_funcs ili9163_pipe_funcs = { > + .enable = yx240qv29_enable, > + .disable = mipi_dbi_pipe_disable, > + .update = mipi_dbi_pipe_update, > + .prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb, > +}; > + > +static const struct drm_display_mode yx240qv29_mode = { > + DRM_SIMPLE_MODE(128, 160, 28, 35), > +}; > + > +DEFINE_DRM_GEM_CMA_FOPS(ili9163_fops); > + > +static struct drm_driver ili9163_driver = { > + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, > + .fops = &ili9163_fops, > + DRM_GEM_CMA_DRIVER_OPS_VMAP, > + .debugfs_init = mipi_dbi_debugfs_init, > + .name = "ili9163", > + .desc = "Ilitek ILI9163", > + .date = "20210208", > + .major = 1, > + .minor = 0, > +}; > + > +static const struct of_device_id ili9163_of_match[] = { > + { .compatible = "newhaven,1.8-128160EF" }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, ili9163_of_match); > + > +static const struct spi_device_id ili9163_id[] = { > + { "nhd-1.8-128160EF", 0 }, > + { } > +}; > +MODULE_DEVICE_TABLE(spi, ili9163_id); > + > +static int ili9163_probe(struct spi_device *spi) > +{ > + struct device *dev = &spi->dev; > + struct mipi_dbi_dev *dbidev; > + struct drm_device *drm; > + struct mipi_dbi *dbi; > + struct gpio_desc *dc; > + u32 rotation = 0; > + int ret; > + > + dbidev = devm_drm_dev_alloc(dev, &ili9163_driver, > + struct mipi_dbi_dev, drm); > + if (IS_ERR(dbidev)) > + return PTR_ERR(dbidev); > + > + dbi = &dbidev->dbi; > + drm = &dbidev->drm; > + > + dbi->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); > + if (IS_ERR(dbi->reset)) { > + DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n"); > + return PTR_ERR(dbi->reset); > + } > + > + dc = devm_gpiod_get_optional(dev, "dc", GPIOD_OUT_LOW); > + if (IS_ERR(dc)) { > + DRM_DEV_ERROR(dev, "Failed to get gpio 'dc'\n"); > + return PTR_ERR(dc); > + } > + > + dbidev->backlight = devm_of_find_backlight(dev); > + if (IS_ERR(dbidev->backlight)) > + return PTR_ERR(dbidev->backlight); > + > + device_property_read_u32(dev, "rotation", &rotation); > + > + ret = mipi_dbi_spi_init(spi, dbi, dc); > + if (ret) > + return ret; > + > + ret = mipi_dbi_dev_init(dbidev, &ili9163_pipe_funcs, &yx240qv29_mode, rotation); > + if (ret) > + return ret; > + > + drm_mode_config_reset(drm); > + > + ret = drm_dev_register(drm, 0); > + if (ret) > + return ret; > + > + spi_set_drvdata(spi, drm); > + > + drm_fbdev_generic_setup(drm, 0); > + > + return 0; > +} > + > +static int ili9163_remove(struct spi_device *spi) > +{ > + struct drm_device *drm = spi_get_drvdata(spi); > + > + drm_dev_unplug(drm); > + drm_atomic_helper_shutdown(drm); > + > + return 0; Nice tidy driver and I think you're on top of all the latest cleanups and refactors (I didn't check it applies&compiles on top of drm-misc-next, pls double check that). Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> I can apply once you've got the dt ack. Cheers, Daniel > +} > + > +static void ili9163_shutdown(struct spi_device *spi) > +{ > + drm_atomic_helper_shutdown(spi_get_drvdata(spi)); > +} > + > +static struct spi_driver ili9163_spi_driver = { > + .driver = { > + .name = "ili9163", > + .of_match_table = ili9163_of_match, > + }, > + .id_table = ili9163_id, > + .probe = ili9163_probe, > + .remove = ili9163_remove, > + .shutdown = ili9163_shutdown, > +}; > +module_spi_driver(ili9163_spi_driver); > + > +MODULE_DESCRIPTION("Ilitek ILI9163 DRM driver"); > +MODULE_AUTHOR("Daniel Mack <daniel@zonque.org>"); > +MODULE_LICENSE("GPL"); > -- > 2.29.2 >
Hi thanks for the driver. I only have some minor comments Am 11.02.21 um 10:50 schrieb Daniel Mack: > This patch adds support for Newhaven's NHD-1.8-128160EF display, featuring > an Ilitek ILI9163 controller. > > Signed-off-by: Daniel Mack <daniel@zonque.org> > --- > .../bindings/display/ilitek,ili9163.txt | 27 +++ > drivers/gpu/drm/tiny/Kconfig | 13 + > drivers/gpu/drm/tiny/Makefile | 1 + > drivers/gpu/drm/tiny/ili9163.c | 224 ++++++++++++++++++ > 4 files changed, 265 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9163.txt > create mode 100644 drivers/gpu/drm/tiny/ili9163.c > > diff --git a/Documentation/devicetree/bindings/display/ilitek,ili9163.txt b/Documentation/devicetree/bindings/display/ilitek,ili9163.txt > new file mode 100644 > index 0000000000000..fee119991c14e > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/ilitek,ili9163.txt > @@ -0,0 +1,27 @@ > +Ilitek ILI9163 display panels > + > +This binding is for display panels using an Ilitek ILI9163 controller in SPI > +mode. > + > +Required properties: > +- compatible: "newhaven,1.8-128160EF", "ilitek,ili9163" > +- dc-gpios: D/C pin > +- reset-gpios: Reset pin > + > +The node for this driver must be a child node of a SPI controller, hence > +all mandatory properties described in ../spi/spi-bus.txt must be specified. > + > +Optional properties: > +- rotation: panel rotation in degrees counter clockwise (0,90,180,270) > +- backlight: phandle of the backlight device attached to the panel > + > +Example: > + display@0{ > + compatible = "newhaven,1.8-128160EF", "ilitek,ili9163" > + reg = <0>; > + spi-max-frequency = <32000000>; > + dc-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; > + reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; > + rotation = <270>; > + backlight = <&backlight>; > + }; > diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig > index 2b6414f0fa759..9de0c0eeea6f5 100644 > --- a/drivers/gpu/drm/tiny/Kconfig > +++ b/drivers/gpu/drm/tiny/Kconfig > @@ -41,6 +41,19 @@ config TINYDRM_HX8357D > > If M is selected the module will be called hx8357d. > > +config TINYDRM_ILI9163 > + tristate "DRM support for ILI9163 display panels" > + depends on DRM && SPI > + select DRM_KMS_HELPER > + select DRM_KMS_CMA_HELPER > + select DRM_MIPI_DBI > + select BACKLIGHT_CLASS_DEVICE > + help > + DRM driver for the following Ilitek ILI9163 panels: > + * NHD-1.8-128160EF 128x160 TFT > + > + If M is selected the module will be called ili9163. > + > config TINYDRM_ILI9225 > tristate "DRM support for ILI9225 display panels" > depends on DRM && SPI > diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile > index 6ae4e9e5a35fb..78016b2ed11b5 100644 > --- a/drivers/gpu/drm/tiny/Makefile > +++ b/drivers/gpu/drm/tiny/Makefile > @@ -3,6 +3,7 @@ > obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o > obj-$(CONFIG_DRM_GM12U320) += gm12u320.o > obj-$(CONFIG_TINYDRM_HX8357D) += hx8357d.o > +obj-$(CONFIG_TINYDRM_ILI9163) += ili9163.o > obj-$(CONFIG_TINYDRM_ILI9225) += ili9225.o > obj-$(CONFIG_TINYDRM_ILI9341) += ili9341.o > obj-$(CONFIG_TINYDRM_ILI9486) += ili9486.o > diff --git a/drivers/gpu/drm/tiny/ili9163.c b/drivers/gpu/drm/tiny/ili9163.c > new file mode 100644 > index 0000000000000..9f90ea9556c4d > --- /dev/null > +++ b/drivers/gpu/drm/tiny/ili9163.c > @@ -0,0 +1,224 @@ > +// SPDX-License-Identifier: GPL-2.0+ > + > +#include <linux/backlight.h> > +#include <linux/delay.h> > +#include <linux/gpio/consumer.h> > +#include <linux/module.h> > +#include <linux/property.h> > +#include <linux/spi/spi.h> > + > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_gem_framebuffer_helper.h> > +#include <drm/drm_mipi_dbi.h> > +#include <drm/drm_modeset_helper.h> > +#include <video/mipi_display.h> > + > +#define ILI9163_FRMCTR1 0xb1 > + > +#define ILI9163_PWCTRL1 0xc0 > +#define ILI9163_PWCTRL2 0xc1 > +#define ILI9163_VMCTRL1 0xc5 > +#define ILI9163_VMCTRL2 0xc7 > +#define ILI9163_PWCTRLA 0xcb > +#define ILI9163_PWCTRLB 0xcf > + > +#define ILI9163_EN3GAM 0xf2 > + > +#define ILI9163_MADCTL_BGR BIT(3) > +#define ILI9163_MADCTL_MV BIT(5) > +#define ILI9163_MADCTL_MX BIT(6) > +#define ILI9163_MADCTL_MY BIT(7) The indention is inconsistent. Or maybe it's just my email client. > + > +static void yx240qv29_enable(struct drm_simple_display_pipe *pipe, > + struct drm_crtc_state *crtc_state, > + struct drm_plane_state *plane_state) > +{ > + struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(pipe->crtc.dev); > + struct mipi_dbi *dbi = &dbidev->dbi; > + u8 addr_mode; > + int ret, idx; > + > + if (!drm_dev_enter(pipe->crtc.dev, &idx)) > + return; > + > + DRM_DEBUG_KMS("\n"); We now use drm_debug_kms() and similar helpers. > + > + ret = mipi_dbi_poweron_conditional_reset(dbidev); > + if (ret < 0) > + goto out_exit; > + if (ret == 1) > + goto out_enable; > + > + /* Gamma */ > + mipi_dbi_command(dbi, MIPI_DCS_SET_GAMMA_CURVE, 0x04); > + mipi_dbi_command(dbi, ILI9163_EN3GAM, 0x00); > + > + /* Frame Rate */ > + mipi_dbi_command(dbi, ILI9163_FRMCTR1, 0x0a, 0x14); > + > + /* Power Control */ > + mipi_dbi_command(dbi, ILI9163_PWCTRL1, 0x0a, 0x00); > + mipi_dbi_command(dbi, ILI9163_PWCTRL2, 0x02); > + > + /* VCOM */ > + mipi_dbi_command(dbi, ILI9163_VMCTRL1, 0x2f, 0x3e); > + mipi_dbi_command(dbi, ILI9163_VMCTRL2, 0x40); > + > + /* Memory Access Control */ > + mipi_dbi_command(dbi, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT); > + > + mipi_dbi_command(dbi, MIPI_DCS_EXIT_SLEEP_MODE); > + msleep(100); > + > + mipi_dbi_command(dbi, MIPI_DCS_SET_DISPLAY_ON); > + msleep(100); > + > +out_enable: > + switch (dbidev->rotation) { > + default: > + addr_mode = 0; > + break; > + case 90: > + addr_mode = ILI9163_MADCTL_MV | ILI9163_MADCTL_MX; > + break; > + case 180: > + addr_mode = ILI9163_MADCTL_MX | ILI9163_MADCTL_MY; > + break; > + case 270: > + addr_mode = ILI9163_MADCTL_MV | ILI9163_MADCTL_MY; > + break; > + } > + addr_mode |= ILI9163_MADCTL_BGR; > + mipi_dbi_command(dbi, MIPI_DCS_SET_ADDRESS_MODE, addr_mode); > + mipi_dbi_enable_flush(dbidev, crtc_state, plane_state); > +out_exit: > + drm_dev_exit(idx); > +} > + > +static const struct drm_simple_display_pipe_funcs ili9163_pipe_funcs = { > + .enable = yx240qv29_enable, > + .disable = mipi_dbi_pipe_disable, > + .update = mipi_dbi_pipe_update, > + .prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb, > +}; > + > +static const struct drm_display_mode yx240qv29_mode = { > + DRM_SIMPLE_MODE(128, 160, 28, 35), > +}; > + > +DEFINE_DRM_GEM_CMA_FOPS(ili9163_fops); > + > +static struct drm_driver ili9163_driver = { > + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, Maybe order them by alphabet. > + .fops = &ili9163_fops, > + DRM_GEM_CMA_DRIVER_OPS_VMAP, > + .debugfs_init = mipi_dbi_debugfs_init, > + .name = "ili9163", > + .desc = "Ilitek ILI9163", > + .date = "20210208", > + .major = 1, > + .minor = 0, > +}; > + > +static const struct of_device_id ili9163_of_match[] = { > + { .compatible = "newhaven,1.8-128160EF" }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, ili9163_of_match); > + > +static const struct spi_device_id ili9163_id[] = { > + { "nhd-1.8-128160EF", 0 }, > + { } > +}; > +MODULE_DEVICE_TABLE(spi, ili9163_id); > + > +static int ili9163_probe(struct spi_device *spi) > +{ > + struct device *dev = &spi->dev; > + struct mipi_dbi_dev *dbidev; > + struct drm_device *drm; > + struct mipi_dbi *dbi; > + struct gpio_desc *dc; > + u32 rotation = 0; > + int ret; > + > + dbidev = devm_drm_dev_alloc(dev, &ili9163_driver, > + struct mipi_dbi_dev, drm); > + if (IS_ERR(dbidev)) > + return PTR_ERR(dbidev); > + > + dbi = &dbidev->dbi; > + drm = &dbidev->drm; > + > + dbi->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); > + if (IS_ERR(dbi->reset)) { > + DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n"); > + return PTR_ERR(dbi->reset); > + } > + > + dc = devm_gpiod_get_optional(dev, "dc", GPIOD_OUT_LOW); > + if (IS_ERR(dc)) { > + DRM_DEV_ERROR(dev, "Failed to get gpio 'dc'\n"); AFAIK drm_err() here and in similar places. > + return PTR_ERR(dc); > + } > + > + dbidev->backlight = devm_of_find_backlight(dev); > + if (IS_ERR(dbidev->backlight)) > + return PTR_ERR(dbidev->backlight); > + > + device_property_read_u32(dev, "rotation", &rotation); > + > + ret = mipi_dbi_spi_init(spi, dbi, dc); > + if (ret) > + return ret; > + > + ret = mipi_dbi_dev_init(dbidev, &ili9163_pipe_funcs, &yx240qv29_mode, rotation); > + if (ret) > + return ret; > + > + drm_mode_config_reset(drm); > + > + ret = drm_dev_register(drm, 0); > + if (ret) > + return ret; > + > + spi_set_drvdata(spi, drm); I don't know if anything might need drvdata (probably not). But it might be safer to set it after the allocation happend. > + > + drm_fbdev_generic_setup(drm, 0); > + > + return 0; > +} > + > +static int ili9163_remove(struct spi_device *spi) > +{ > + struct drm_device *drm = spi_get_drvdata(spi); > + > + drm_dev_unplug(drm); > + drm_atomic_helper_shutdown(drm); > + > + return 0; > +} > + > +static void ili9163_shutdown(struct spi_device *spi) > +{ > + drm_atomic_helper_shutdown(spi_get_drvdata(spi)); > +} > + > +static struct spi_driver ili9163_spi_driver = { > + .driver = { > + .name = "ili9163", > + .of_match_table = ili9163_of_match, > + }, > + .id_table = ili9163_id, > + .probe = ili9163_probe, > + .remove = ili9163_remove, > + .shutdown = ili9163_shutdown, > +}; > +module_spi_driver(ili9163_spi_driver); > + > +MODULE_DESCRIPTION("Ilitek ILI9163 DRM driver"); > +MODULE_AUTHOR("Daniel Mack <daniel@zonque.org>"); > +MODULE_LICENSE("GPL"); >
Hi, Thanks for the review! On 2/12/21 8:13 AM, Thomas Zimmermann wrote: > thanks for the driver. I only have some minor comments > > Am 11.02.21 um 10:50 schrieb Daniel Mack: >> +#define ILI9163_MADCTL_BGR BIT(3) >> +#define ILI9163_MADCTL_MV BIT(5) >> +#define ILI9163_MADCTL_MX BIT(6) >> +#define ILI9163_MADCTL_MY BIT(7) > > The indention is inconsistent. Or maybe it's just my email client. Yes, the latter :) Addressed the rest of your remarks. Will send a v2. Thanks, Daniel
Hi Am 12.02.21 um 10:47 schrieb Daniel Mack: > Hi, > > Thanks for the review! > > On 2/12/21 8:13 AM, Thomas Zimmermann wrote: >> thanks for the driver. I only have some minor comments >> >> Am 11.02.21 um 10:50 schrieb Daniel Mack: >>> +#define ILI9163_MADCTL_BGR BIT(3) >>> +#define ILI9163_MADCTL_MV BIT(5) >>> +#define ILI9163_MADCTL_MX BIT(6) >>> +#define ILI9163_MADCTL_MY BIT(7) >> >> The indention is inconsistent. Or maybe it's just my email client. > > Yes, the latter :) > > Addressed the rest of your remarks. Will send a v2. You should also add yourself to MAINTAINERS for this driver. Best regards Thomas > > > Thanks, > Daniel >
diff --git a/Documentation/devicetree/bindings/display/ilitek,ili9163.txt b/Documentation/devicetree/bindings/display/ilitek,ili9163.txt new file mode 100644 index 0000000000000..fee119991c14e --- /dev/null +++ b/Documentation/devicetree/bindings/display/ilitek,ili9163.txt @@ -0,0 +1,27 @@ +Ilitek ILI9163 display panels + +This binding is for display panels using an Ilitek ILI9163 controller in SPI +mode. + +Required properties: +- compatible: "newhaven,1.8-128160EF", "ilitek,ili9163" +- dc-gpios: D/C pin +- reset-gpios: Reset pin + +The node for this driver must be a child node of a SPI controller, hence +all mandatory properties described in ../spi/spi-bus.txt must be specified. + +Optional properties: +- rotation: panel rotation in degrees counter clockwise (0,90,180,270) +- backlight: phandle of the backlight device attached to the panel + +Example: + display@0{ + compatible = "newhaven,1.8-128160EF", "ilitek,ili9163" + reg = <0>; + spi-max-frequency = <32000000>; + dc-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + rotation = <270>; + backlight = <&backlight>; + }; diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig index 2b6414f0fa759..9de0c0eeea6f5 100644 --- a/drivers/gpu/drm/tiny/Kconfig +++ b/drivers/gpu/drm/tiny/Kconfig @@ -41,6 +41,19 @@ config TINYDRM_HX8357D If M is selected the module will be called hx8357d. +config TINYDRM_ILI9163 + tristate "DRM support for ILI9163 display panels" + depends on DRM && SPI + select DRM_KMS_HELPER + select DRM_KMS_CMA_HELPER + select DRM_MIPI_DBI + select BACKLIGHT_CLASS_DEVICE + help + DRM driver for the following Ilitek ILI9163 panels: + * NHD-1.8-128160EF 128x160 TFT + + If M is selected the module will be called ili9163. + config TINYDRM_ILI9225 tristate "DRM support for ILI9225 display panels" depends on DRM && SPI diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile index 6ae4e9e5a35fb..78016b2ed11b5 100644 --- a/drivers/gpu/drm/tiny/Makefile +++ b/drivers/gpu/drm/tiny/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_DRM_CIRRUS_QEMU) += cirrus.o obj-$(CONFIG_DRM_GM12U320) += gm12u320.o obj-$(CONFIG_TINYDRM_HX8357D) += hx8357d.o +obj-$(CONFIG_TINYDRM_ILI9163) += ili9163.o obj-$(CONFIG_TINYDRM_ILI9225) += ili9225.o obj-$(CONFIG_TINYDRM_ILI9341) += ili9341.o obj-$(CONFIG_TINYDRM_ILI9486) += ili9486.o diff --git a/drivers/gpu/drm/tiny/ili9163.c b/drivers/gpu/drm/tiny/ili9163.c new file mode 100644 index 0000000000000..9f90ea9556c4d --- /dev/null +++ b/drivers/gpu/drm/tiny/ili9163.c @@ -0,0 +1,224 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include <linux/backlight.h> +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/module.h> +#include <linux/property.h> +#include <linux/spi/spi.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_mipi_dbi.h> +#include <drm/drm_modeset_helper.h> +#include <video/mipi_display.h> + +#define ILI9163_FRMCTR1 0xb1 + +#define ILI9163_PWCTRL1 0xc0 +#define ILI9163_PWCTRL2 0xc1 +#define ILI9163_VMCTRL1 0xc5 +#define ILI9163_VMCTRL2 0xc7 +#define ILI9163_PWCTRLA 0xcb +#define ILI9163_PWCTRLB 0xcf + +#define ILI9163_EN3GAM 0xf2 + +#define ILI9163_MADCTL_BGR BIT(3) +#define ILI9163_MADCTL_MV BIT(5) +#define ILI9163_MADCTL_MX BIT(6) +#define ILI9163_MADCTL_MY BIT(7) + +static void yx240qv29_enable(struct drm_simple_display_pipe *pipe, + struct drm_crtc_state *crtc_state, + struct drm_plane_state *plane_state) +{ + struct mipi_dbi_dev *dbidev = drm_to_mipi_dbi_dev(pipe->crtc.dev); + struct mipi_dbi *dbi = &dbidev->dbi; + u8 addr_mode; + int ret, idx; + + if (!drm_dev_enter(pipe->crtc.dev, &idx)) + return; + + DRM_DEBUG_KMS("\n"); + + ret = mipi_dbi_poweron_conditional_reset(dbidev); + if (ret < 0) + goto out_exit; + if (ret == 1) + goto out_enable; + + /* Gamma */ + mipi_dbi_command(dbi, MIPI_DCS_SET_GAMMA_CURVE, 0x04); + mipi_dbi_command(dbi, ILI9163_EN3GAM, 0x00); + + /* Frame Rate */ + mipi_dbi_command(dbi, ILI9163_FRMCTR1, 0x0a, 0x14); + + /* Power Control */ + mipi_dbi_command(dbi, ILI9163_PWCTRL1, 0x0a, 0x00); + mipi_dbi_command(dbi, ILI9163_PWCTRL2, 0x02); + + /* VCOM */ + mipi_dbi_command(dbi, ILI9163_VMCTRL1, 0x2f, 0x3e); + mipi_dbi_command(dbi, ILI9163_VMCTRL2, 0x40); + + /* Memory Access Control */ + mipi_dbi_command(dbi, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT); + + mipi_dbi_command(dbi, MIPI_DCS_EXIT_SLEEP_MODE); + msleep(100); + + mipi_dbi_command(dbi, MIPI_DCS_SET_DISPLAY_ON); + msleep(100); + +out_enable: + switch (dbidev->rotation) { + default: + addr_mode = 0; + break; + case 90: + addr_mode = ILI9163_MADCTL_MV | ILI9163_MADCTL_MX; + break; + case 180: + addr_mode = ILI9163_MADCTL_MX | ILI9163_MADCTL_MY; + break; + case 270: + addr_mode = ILI9163_MADCTL_MV | ILI9163_MADCTL_MY; + break; + } + addr_mode |= ILI9163_MADCTL_BGR; + mipi_dbi_command(dbi, MIPI_DCS_SET_ADDRESS_MODE, addr_mode); + mipi_dbi_enable_flush(dbidev, crtc_state, plane_state); +out_exit: + drm_dev_exit(idx); +} + +static const struct drm_simple_display_pipe_funcs ili9163_pipe_funcs = { + .enable = yx240qv29_enable, + .disable = mipi_dbi_pipe_disable, + .update = mipi_dbi_pipe_update, + .prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb, +}; + +static const struct drm_display_mode yx240qv29_mode = { + DRM_SIMPLE_MODE(128, 160, 28, 35), +}; + +DEFINE_DRM_GEM_CMA_FOPS(ili9163_fops); + +static struct drm_driver ili9163_driver = { + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, + .fops = &ili9163_fops, + DRM_GEM_CMA_DRIVER_OPS_VMAP, + .debugfs_init = mipi_dbi_debugfs_init, + .name = "ili9163", + .desc = "Ilitek ILI9163", + .date = "20210208", + .major = 1, + .minor = 0, +}; + +static const struct of_device_id ili9163_of_match[] = { + { .compatible = "newhaven,1.8-128160EF" }, + { } +}; +MODULE_DEVICE_TABLE(of, ili9163_of_match); + +static const struct spi_device_id ili9163_id[] = { + { "nhd-1.8-128160EF", 0 }, + { } +}; +MODULE_DEVICE_TABLE(spi, ili9163_id); + +static int ili9163_probe(struct spi_device *spi) +{ + struct device *dev = &spi->dev; + struct mipi_dbi_dev *dbidev; + struct drm_device *drm; + struct mipi_dbi *dbi; + struct gpio_desc *dc; + u32 rotation = 0; + int ret; + + dbidev = devm_drm_dev_alloc(dev, &ili9163_driver, + struct mipi_dbi_dev, drm); + if (IS_ERR(dbidev)) + return PTR_ERR(dbidev); + + dbi = &dbidev->dbi; + drm = &dbidev->drm; + + dbi->reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + if (IS_ERR(dbi->reset)) { + DRM_DEV_ERROR(dev, "Failed to get gpio 'reset'\n"); + return PTR_ERR(dbi->reset); + } + + dc = devm_gpiod_get_optional(dev, "dc", GPIOD_OUT_LOW); + if (IS_ERR(dc)) { + DRM_DEV_ERROR(dev, "Failed to get gpio 'dc'\n"); + return PTR_ERR(dc); + } + + dbidev->backlight = devm_of_find_backlight(dev); + if (IS_ERR(dbidev->backlight)) + return PTR_ERR(dbidev->backlight); + + device_property_read_u32(dev, "rotation", &rotation); + + ret = mipi_dbi_spi_init(spi, dbi, dc); + if (ret) + return ret; + + ret = mipi_dbi_dev_init(dbidev, &ili9163_pipe_funcs, &yx240qv29_mode, rotation); + if (ret) + return ret; + + drm_mode_config_reset(drm); + + ret = drm_dev_register(drm, 0); + if (ret) + return ret; + + spi_set_drvdata(spi, drm); + + drm_fbdev_generic_setup(drm, 0); + + return 0; +} + +static int ili9163_remove(struct spi_device *spi) +{ + struct drm_device *drm = spi_get_drvdata(spi); + + drm_dev_unplug(drm); + drm_atomic_helper_shutdown(drm); + + return 0; +} + +static void ili9163_shutdown(struct spi_device *spi) +{ + drm_atomic_helper_shutdown(spi_get_drvdata(spi)); +} + +static struct spi_driver ili9163_spi_driver = { + .driver = { + .name = "ili9163", + .of_match_table = ili9163_of_match, + }, + .id_table = ili9163_id, + .probe = ili9163_probe, + .remove = ili9163_remove, + .shutdown = ili9163_shutdown, +}; +module_spi_driver(ili9163_spi_driver); + +MODULE_DESCRIPTION("Ilitek ILI9163 DRM driver"); +MODULE_AUTHOR("Daniel Mack <daniel@zonque.org>"); +MODULE_LICENSE("GPL");
This patch adds support for Newhaven's NHD-1.8-128160EF display, featuring an Ilitek ILI9163 controller. Signed-off-by: Daniel Mack <daniel@zonque.org> --- .../bindings/display/ilitek,ili9163.txt | 27 +++ drivers/gpu/drm/tiny/Kconfig | 13 + drivers/gpu/drm/tiny/Makefile | 1 + drivers/gpu/drm/tiny/ili9163.c | 224 ++++++++++++++++++ 4 files changed, 265 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9163.txt create mode 100644 drivers/gpu/drm/tiny/ili9163.c