Skip to content

L
linux
Commit 994ea402 authored by Linus Walleij's avatar Linus Walleij
Browse files
Options

drm/panel: Rename Sony ACX424 to Novatek NT35560 

A code drop from Sony Mobile reveals that the ACX424 panels are
built around the Novatek NT35560 panel controllers so just bite
the bullet and rename the driver and all basic symbols so that
we can modify this driver to cover any other panels also using
the Novatek NT35560 display controller.
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220103113822.654592-1-linus.walleij@linaro.org
parent a874aba8
Show whitespace changes
Inline Side-by-side
Showing with 129 additions and 124 deletions
MAINTAINERS
View file @ 994ea402
...@@ -6127,6 +6127,13 @@ T: git git://anongit.freedesktop.org/drm/drm-misc ...@@ -6127,6 +6127,13 @@ T: git git://anongit.freedesktop.org/drm/drm-misc
F: Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml F: Documentation/devicetree/bindings/display/panel/novatek,nt35510.yaml
F: drivers/gpu/drm/panel/panel-novatek-nt35510.c F: drivers/gpu/drm/panel/panel-novatek-nt35510.c
DRM DRIVER FOR NOVATEK NT35560 PANELS
M: Linus Walleij <linus.walleij@linaro.org>
S: Maintained
T: git git://anongit.freedesktop.org/drm/drm-misc
F: Documentation/devicetree/bindings/display/panel/sony,acx424akp.yaml
F: drivers/gpu/drm/panel/panel-novatek-nt35560.c
DRM DRIVER FOR NOVATEK NT36672A PANELS DRM DRIVER FOR NOVATEK NT36672A PANELS
M: Sumit Semwal <sumit.semwal@linaro.org> M: Sumit Semwal <sumit.semwal@linaro.org>
S: Maintained S: Maintained
...@@ -6258,12 +6265,6 @@ T: git git://anongit.freedesktop.org/drm/drm-misc ...@@ -6258,12 +6265,6 @@ T: git git://anongit.freedesktop.org/drm/drm-misc
F: Documentation/devicetree/bindings/display/sitronix,st7735r.yaml F: Documentation/devicetree/bindings/display/sitronix,st7735r.yaml
F: drivers/gpu/drm/tiny/st7735r.c F: drivers/gpu/drm/tiny/st7735r.c
DRM DRIVER FOR SONY ACX424AKP PANELS
M: Linus Walleij <linus.walleij@linaro.org>
S: Maintained
T: git git://anongit.freedesktop.org/drm/drm-misc
F: drivers/gpu/drm/panel/panel-sony-acx424akp.c
DRM DRIVER FOR ST-ERICSSON MCDE DRM DRIVER FOR ST-ERICSSON MCDE
M: Linus Walleij <linus.walleij@linaro.org> M: Linus Walleij <linus.walleij@linaro.org>
S: Maintained S: Maintained
......
drivers/gpu/drm/panel/Kconfig
View file @ 994ea402
...@@ -293,6 +293,18 @@ config DRM_PANEL_NOVATEK_NT35510 ...@@ -293,6 +293,18 @@ config DRM_PANEL_NOVATEK_NT35510
around the Novatek NT35510 display controller, such as some around the Novatek NT35510 display controller, such as some
Hydis panels. Hydis panels.
config DRM_PANEL_NOVATEK_NT35560
tristate "Novatek NT35560 DSI command mode panel"
depends on OF
depends on DRM_MIPI_DSI
depends on BACKLIGHT_CLASS_DEVICE
select VIDEOMODE_HELPERS
help
Say Y here if you want to enable the Novatek NT35560 display
controller. This panel supports DSI in both command and video
mode. This supports several panels such as Sony ACX424AKM and
ACX424AKP.
config DRM_PANEL_NOVATEK_NT35950 config DRM_PANEL_NOVATEK_NT35950
tristate "Novatek NT35950 DSI panel" tristate "Novatek NT35950 DSI panel"
depends on OF depends on OF
...@@ -593,17 +605,6 @@ config DRM_PANEL_SITRONIX_ST7789V ...@@ -593,17 +605,6 @@ config DRM_PANEL_SITRONIX_ST7789V
Say Y here if you want to enable support for the Sitronix Say Y here if you want to enable support for the Sitronix
ST7789V controller for 240x320 LCD panels ST7789V controller for 240x320 LCD panels
config DRM_PANEL_SONY_ACX424AKP
tristate "Sony ACX424AKP DSI command mode panel"
depends on OF
depends on DRM_MIPI_DSI
depends on BACKLIGHT_CLASS_DEVICE
select VIDEOMODE_HELPERS
help
Say Y here if you want to enable the Sony ACX424 display
panel. This panel supports DSI in both command and video
mode.
config DRM_PANEL_SONY_ACX565AKM config DRM_PANEL_SONY_ACX565AKM
tristate "Sony ACX565AKM panel" tristate "Sony ACX565AKM panel"
depends on GPIOLIB && OF && SPI depends on GPIOLIB && OF && SPI
......
drivers/gpu/drm/panel/Makefile
View file @ 994ea402
...@@ -27,6 +27,7 @@ obj-$(CONFIG_DRM_PANEL_LG_LB035Q02) += panel-lg-lb035q02.o ...@@ -27,6 +27,7 @@ obj-$(CONFIG_DRM_PANEL_LG_LB035Q02) += panel-lg-lb035q02.o
obj-$(CONFIG_DRM_PANEL_LG_LG4573) += panel-lg-lg4573.o obj-$(CONFIG_DRM_PANEL_LG_LG4573) += panel-lg-lg4573.o
obj-$(CONFIG_DRM_PANEL_NEC_NL8048HL11) += panel-nec-nl8048hl11.o obj-$(CONFIG_DRM_PANEL_NEC_NL8048HL11) += panel-nec-nl8048hl11.o
obj-$(CONFIG_DRM_PANEL_NOVATEK_NT35510) += panel-novatek-nt35510.o obj-$(CONFIG_DRM_PANEL_NOVATEK_NT35510) += panel-novatek-nt35510.o
obj-$(CONFIG_DRM_PANEL_NOVATEK_NT35560) += panel-novatek-nt35560.o
obj-$(CONFIG_DRM_PANEL_NOVATEK_NT35950) += panel-novatek-nt35950.o obj-$(CONFIG_DRM_PANEL_NOVATEK_NT35950) += panel-novatek-nt35950.o
obj-$(CONFIG_DRM_PANEL_NOVATEK_NT36672A) += panel-novatek-nt36672a.o obj-$(CONFIG_DRM_PANEL_NOVATEK_NT36672A) += panel-novatek-nt36672a.o
obj-$(CONFIG_DRM_PANEL_NOVATEK_NT39016) += panel-novatek-nt39016.o obj-$(CONFIG_DRM_PANEL_NOVATEK_NT39016) += panel-novatek-nt39016.o
...@@ -60,7 +61,6 @@ obj-$(CONFIG_DRM_PANEL_SHARP_LS060T1SX01) += panel-sharp-ls060t1sx01.o ...@@ -60,7 +61,6 @@ obj-$(CONFIG_DRM_PANEL_SHARP_LS060T1SX01) += panel-sharp-ls060t1sx01.o
obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7701) += panel-sitronix-st7701.o obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7701) += panel-sitronix-st7701.o
obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7703) += panel-sitronix-st7703.o obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7703) += panel-sitronix-st7703.o
obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7789V) += panel-sitronix-st7789v.o obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7789V) += panel-sitronix-st7789v.o
obj-$(CONFIG_DRM_PANEL_SONY_ACX424AKP) += panel-sony-acx424akp.o
obj-$(CONFIG_DRM_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o obj-$(CONFIG_DRM_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o
obj-$(CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521) += panel-sony-tulip-truly-nt35521.o obj-$(CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521) += panel-sony-tulip-truly-nt35521.o
obj-$(CONFIG_DRM_PANEL_TDO_TL070WSH30) += panel-tdo-tl070wsh30.o obj-$(CONFIG_DRM_PANEL_TDO_TL070WSH30) += panel-tdo-tl070wsh30.o
......
drivers/gpu/drm/panel/panel-sony-acx424akp.c → drivers/gpu/drm/panel/panel-novatek-nt35560.c
View file @ 994ea402
// SPDX-License-Identifier: GPL-2.0+ // SPDX-License-Identifier: GPL-2.0+
/* /*
* MIPI-DSI Sony ACX424AKP panel driver. This is a 480x864 * MIPI-DSI Novatek NT35560-based panel controller.
* AMOLED panel with a command-only DSI interface.
* *
* Copyright (C) Linaro Ltd. 2019 * Supported panels include:
* Sony ACX424AKM - a 480x854 AMOLED DSI panel
* Sony ACX424AKP - a 480x864 AMOLED DSI panel
*
* Copyright (C) Linaro Ltd. 2019-2021
* Author: Linus Walleij * Author: Linus Walleij
* Based on code and know-how from Marcus Lorentzon * Based on code and know-how from Marcus Lorentzon
* Copyright (C) ST-Ericsson SA 2010 * Copyright (C) ST-Ericsson SA 2010
...@@ -21,10 +24,10 @@ ...@@ -21,10 +24,10 @@
#include <drm/drm_modes.h> #include <drm/drm_modes.h>
#include <drm/drm_panel.h> #include <drm/drm_panel.h>
#define ACX424_DCS_READ_ID1 0xDA #define NT35560_DCS_READ_ID1 0xDA
#define ACX424_DCS_READ_ID2 0xDB #define NT35560_DCS_READ_ID2 0xDB
#define ACX424_DCS_READ_ID3 0xDC #define NT35560_DCS_READ_ID3 0xDC
#define ACX424_DCS_SET_MDDI 0xAE #define NT35560_DCS_SET_MDDI 0xAE
/* /*
* Sony seems to use vendor ID 0x81 * Sony seems to use vendor ID 0x81
...@@ -37,7 +40,7 @@ ...@@ -37,7 +40,7 @@
*/ */
#define DISPLAY_SONY_ACX424AKP_ID3 0x8000 #define DISPLAY_SONY_ACX424AKP_ID3 0x8000
struct acx424akp { struct nt35560 {
struct drm_panel panel; struct drm_panel panel;
struct device *dev; struct device *dev;
struct regulator *supply; struct regulator *supply;
...@@ -82,18 +85,18 @@ static const struct drm_display_mode sony_acx424akp_cmd_mode = { ...@@ -82,18 +85,18 @@ static const struct drm_display_mode sony_acx424akp_cmd_mode = {
.height_mm = 84, .height_mm = 84,
}; };
static inline struct acx424akp *panel_to_acx424akp(struct drm_panel *panel) static inline struct nt35560 *panel_to_nt35560(struct drm_panel *panel)
{ {
return container_of(panel, struct acx424akp, panel); return container_of(panel, struct nt35560, panel);
} }
#define FOSC 20 /* 20Mhz */ #define FOSC 20 /* 20Mhz */
#define SCALE_FACTOR_NS_DIV_MHZ 1000 #define SCALE_FACTOR_NS_DIV_MHZ 1000
static int acx424akp_set_brightness(struct backlight_device *bl) static int nt35560_set_brightness(struct backlight_device *bl)
{ {
struct acx424akp *acx = bl_get_data(bl); struct nt35560 *nt = bl_get_data(bl);
struct mipi_dsi_device *dsi = to_mipi_dsi_device(acx->dev); struct mipi_dsi_device *dsi = to_mipi_dsi_device(nt->dev);
int period_ns = 1023; int period_ns = 1023;
int duty_ns = bl->props.brightness; int duty_ns = bl->props.brightness;
u8 pwm_ratio; u8 pwm_ratio;
...@@ -107,7 +110,7 @@ static int acx424akp_set_brightness(struct backlight_device *bl) ...@@ -107,7 +110,7 @@ static int acx424akp_set_brightness(struct backlight_device *bl)
ret = mipi_dsi_dcs_write(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, ret = mipi_dsi_dcs_write(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY,
&par, 1); &par, 1);
if (ret) { if (ret) {
dev_err(acx->dev, "failed to disable display backlight (%d)\n", ret); dev_err(nt->dev, "failed to disable display backlight (%d)\n", ret);
return ret; return ret;
} }
return 0; return 0;
...@@ -120,11 +123,11 @@ static int acx424akp_set_brightness(struct backlight_device *bl) ...@@ -120,11 +123,11 @@ static int acx424akp_set_brightness(struct backlight_device *bl)
SCALE_FACTOR_NS_DIV_MHZ); SCALE_FACTOR_NS_DIV_MHZ);
/* Set up PWM dutycycle ONE byte (differs from the standard) */ /* Set up PWM dutycycle ONE byte (differs from the standard) */
dev_dbg(acx->dev, "calculated duty cycle %02x\n", pwm_ratio); dev_dbg(nt->dev, "calculated duty cycle %02x\n", pwm_ratio);
ret = mipi_dsi_dcs_write(dsi, MIPI_DCS_SET_DISPLAY_BRIGHTNESS, ret = mipi_dsi_dcs_write(dsi, MIPI_DCS_SET_DISPLAY_BRIGHTNESS,
&pwm_ratio, 1); &pwm_ratio, 1);
if (ret < 0) { if (ret < 0) {
dev_err(acx->dev, "failed to set display PWM ratio (%d)\n", ret); dev_err(nt->dev, "failed to set display PWM ratio (%d)\n", ret);
return ret; return ret;
} }
...@@ -140,30 +143,30 @@ static int acx424akp_set_brightness(struct backlight_device *bl) ...@@ -140,30 +143,30 @@ static int acx424akp_set_brightness(struct backlight_device *bl)
par = 0xaa; par = 0xaa;
ret = mipi_dsi_dcs_write(dsi, 0xf3, &par, 1); ret = mipi_dsi_dcs_write(dsi, 0xf3, &par, 1);
if (ret < 0) { if (ret < 0) {
dev_err(acx->dev, "failed to unlock CMD 2 (%d)\n", ret); dev_err(nt->dev, "failed to unlock CMD 2 (%d)\n", ret);
return ret; return ret;
} }
par = 0x01; par = 0x01;
ret = mipi_dsi_dcs_write(dsi, 0x00, &par, 1); ret = mipi_dsi_dcs_write(dsi, 0x00, &par, 1);
if (ret < 0) { if (ret < 0) {
dev_err(acx->dev, "failed to enter page 1 (%d)\n", ret); dev_err(nt->dev, "failed to enter page 1 (%d)\n", ret);
return ret; return ret;
} }
par = 0x01; par = 0x01;
ret = mipi_dsi_dcs_write(dsi, 0x7d, &par, 1); ret = mipi_dsi_dcs_write(dsi, 0x7d, &par, 1);
if (ret < 0) { if (ret < 0) {
dev_err(acx->dev, "failed to disable MTP reload (%d)\n", ret); dev_err(nt->dev, "failed to disable MTP reload (%d)\n", ret);
return ret; return ret;
} }
ret = mipi_dsi_dcs_write(dsi, 0x22, &pwm_div, 1); ret = mipi_dsi_dcs_write(dsi, 0x22, &pwm_div, 1);
if (ret < 0) { if (ret < 0) {
dev_err(acx->dev, "failed to set PWM divisor (%d)\n", ret); dev_err(nt->dev, "failed to set PWM divisor (%d)\n", ret);
return ret; return ret;
} }
par = 0xaa; par = 0xaa;
ret = mipi_dsi_dcs_write(dsi, 0x7f, &par, 1); ret = mipi_dsi_dcs_write(dsi, 0x7f, &par, 1);
if (ret < 0) { if (ret < 0) {
dev_err(acx->dev, "failed to lock CMD 2 (%d)\n", ret); dev_err(nt->dev, "failed to lock CMD 2 (%d)\n", ret);
return ret; return ret;
} }
...@@ -172,48 +175,48 @@ static int acx424akp_set_brightness(struct backlight_device *bl) ...@@ -172,48 +175,48 @@ static int acx424akp_set_brightness(struct backlight_device *bl)
ret = mipi_dsi_dcs_write(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY, ret = mipi_dsi_dcs_write(dsi, MIPI_DCS_WRITE_CONTROL_DISPLAY,
&par, 1); &par, 1);
if (ret < 0) { if (ret < 0) {
dev_err(acx->dev, "failed to enable display backlight (%d)\n", ret); dev_err(nt->dev, "failed to enable display backlight (%d)\n", ret);
return ret; return ret;
} }
return 0; return 0;
} }
static const struct backlight_ops acx424akp_bl_ops = { static const struct backlight_ops nt35560_bl_ops = {
.update_status = acx424akp_set_brightness, .update_status = nt35560_set_brightness,
}; };
static const struct backlight_properties acx424akp_bl_props = { static const struct backlight_properties nt35560_bl_props = {
.type = BACKLIGHT_RAW, .type = BACKLIGHT_RAW,
.brightness = 512, .brightness = 512,
.max_brightness = 1023, .max_brightness = 1023,
}; };
static int acx424akp_read_id(struct acx424akp *acx) static int nt35560_read_id(struct nt35560 *nt)
{ {
struct mipi_dsi_device *dsi = to_mipi_dsi_device(acx->dev); struct mipi_dsi_device *dsi = to_mipi_dsi_device(nt->dev);
u8 vendor, version, panel; u8 vendor, version, panel;
u16 val; u16 val;
int ret; int ret;
ret = mipi_dsi_dcs_read(dsi, ACX424_DCS_READ_ID1, &vendor, 1); ret = mipi_dsi_dcs_read(dsi, NT35560_DCS_READ_ID1, &vendor, 1);
if (ret < 0) { if (ret < 0) {
dev_err(acx->dev, "could not vendor ID byte\n"); dev_err(nt->dev, "could not vendor ID byte\n");
return ret; return ret;
} }
ret = mipi_dsi_dcs_read(dsi, ACX424_DCS_READ_ID2, &version, 1); ret = mipi_dsi_dcs_read(dsi, NT35560_DCS_READ_ID2, &version, 1);
if (ret < 0) { if (ret < 0) {
dev_err(acx->dev, "could not read device version byte\n"); dev_err(nt->dev, "could not read device version byte\n");
return ret; return ret;
} }
ret = mipi_dsi_dcs_read(dsi, ACX424_DCS_READ_ID3, &panel, 1); ret = mipi_dsi_dcs_read(dsi, NT35560_DCS_READ_ID3, &panel, 1);
if (ret < 0) { if (ret < 0) {
dev_err(acx->dev, "could not read panel ID byte\n"); dev_err(nt->dev, "could not read panel ID byte\n");
return ret; return ret;
} }
if (vendor == 0x00) { if (vendor == 0x00) {
dev_err(acx->dev, "device vendor ID is zero\n"); dev_err(nt->dev, "device vendor ID is zero\n");
return -ENODEV; return -ENODEV;
} }
...@@ -222,11 +225,11 @@ static int acx424akp_read_id(struct acx424akp *acx) ...@@ -222,11 +225,11 @@ static int acx424akp_read_id(struct acx424akp *acx)
case DISPLAY_SONY_ACX424AKP_ID1: case DISPLAY_SONY_ACX424AKP_ID1:
case DISPLAY_SONY_ACX424AKP_ID2: case DISPLAY_SONY_ACX424AKP_ID2:
case DISPLAY_SONY_ACX424AKP_ID3: case DISPLAY_SONY_ACX424AKP_ID3:
dev_info(acx->dev, "MTP vendor: %02x, version: %02x, panel: %02x\n", dev_info(nt->dev, "MTP vendor: %02x, version: %02x, panel: %02x\n",
vendor, version, panel); vendor, version, panel);
break; break;
default: default:
dev_info(acx->dev, "unknown vendor: %02x, version: %02x, panel: %02x\n", dev_info(nt->dev, "unknown vendor: %02x, version: %02x, panel: %02x\n",
vendor, version, panel); vendor, version, panel);
break; break;
} }
...@@ -234,49 +237,49 @@ static int acx424akp_read_id(struct acx424akp *acx) ...@@ -234,49 +237,49 @@ static int acx424akp_read_id(struct acx424akp *acx)
return 0; return 0;
} }
static int acx424akp_power_on(struct acx424akp *acx) static int nt35560_power_on(struct nt35560 *nt)
{ {
int ret; int ret;
ret = regulator_enable(acx->supply); ret = regulator_enable(nt->supply);
if (ret) { if (ret) {
dev_err(acx->dev, "failed to enable supply (%d)\n", ret); dev_err(nt->dev, "failed to enable supply (%d)\n", ret);
return ret; return ret;
} }
/* Assert RESET */ /* Assert RESET */
gpiod_set_value_cansleep(acx->reset_gpio, 1); gpiod_set_value_cansleep(nt->reset_gpio, 1);
udelay(20); udelay(20);
/* De-assert RESET */ /* De-assert RESET */
gpiod_set_value_cansleep(acx->reset_gpio, 0); gpiod_set_value_cansleep(nt->reset_gpio, 0);
usleep_range(11000, 20000); usleep_range(11000, 20000);
return 0; return 0;
} }
static void acx424akp_power_off(struct acx424akp *acx) static void nt35560_power_off(struct nt35560 *nt)
{ {
/* Assert RESET */ /* Assert RESET */
gpiod_set_value_cansleep(acx->reset_gpio, 1); gpiod_set_value_cansleep(nt->reset_gpio, 1);
usleep_range(11000, 20000); usleep_range(11000, 20000);
regulator_disable(acx->supply); regulator_disable(nt->supply);
} }
static int acx424akp_prepare(struct drm_panel *panel) static int nt35560_prepare(struct drm_panel *panel)
{ {
struct acx424akp *acx = panel_to_acx424akp(panel); struct nt35560 *nt = panel_to_nt35560(panel);
struct mipi_dsi_device *dsi = to_mipi_dsi_device(acx->dev); struct mipi_dsi_device *dsi = to_mipi_dsi_device(nt->dev);
const u8 mddi = 3; const u8 mddi = 3;
int ret; int ret;
ret = acx424akp_power_on(acx); ret = nt35560_power_on(nt);
if (ret) if (ret)
return ret; return ret;
ret = acx424akp_read_id(acx); ret = nt35560_read_id(nt);
if (ret) { if (ret) {
dev_err(acx->dev, "failed to read panel ID (%d)\n", ret); dev_err(nt->dev, "failed to read panel ID (%d)\n", ret);
goto err_power_off; goto err_power_off;
} }
...@@ -284,7 +287,7 @@ static int acx424akp_prepare(struct drm_panel *panel) ...@@ -284,7 +287,7 @@ static int acx424akp_prepare(struct drm_panel *panel)
ret = mipi_dsi_dcs_set_tear_on(dsi, ret = mipi_dsi_dcs_set_tear_on(dsi,
MIPI_DSI_DCS_TEAR_MODE_VBLANK); MIPI_DSI_DCS_TEAR_MODE_VBLANK);
if (ret) { if (ret) {
dev_err(acx->dev, "failed to enable vblank TE (%d)\n", ret); dev_err(nt->dev, "failed to enable vblank TE (%d)\n", ret);
goto err_power_off; goto err_power_off;
} }
...@@ -298,31 +301,31 @@ static int acx424akp_prepare(struct drm_panel *panel) ...@@ -298,31 +301,31 @@ static int acx424akp_prepare(struct drm_panel *panel)
* this command. Due to the lack of documentation we cannot know for * this command. Due to the lack of documentation we cannot know for
* sure. * sure.
*/ */
ret = mipi_dsi_dcs_write(dsi, ACX424_DCS_SET_MDDI, ret = mipi_dsi_dcs_write(dsi, NT35560_DCS_SET_MDDI,
&mddi, sizeof(mddi)); &mddi, sizeof(mddi));
if (ret < 0) { if (ret < 0) {
dev_err(acx->dev, "failed to set MDDI (%d)\n", ret); dev_err(nt->dev, "failed to set MDDI (%d)\n", ret);
goto err_power_off; goto err_power_off;
} }
/* Exit sleep mode */ /* Exit sleep mode */
ret = mipi_dsi_dcs_exit_sleep_mode(dsi); ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
if (ret) { if (ret) {
dev_err(acx->dev, "failed to exit sleep mode (%d)\n", ret); dev_err(nt->dev, "failed to exit sleep mode (%d)\n", ret);
goto err_power_off; goto err_power_off;
} }
msleep(140); msleep(140);
ret = mipi_dsi_dcs_set_display_on(dsi); ret = mipi_dsi_dcs_set_display_on(dsi);
if (ret) { if (ret) {
dev_err(acx->dev, "failed to turn display on (%d)\n", ret); dev_err(nt->dev, "failed to turn display on (%d)\n", ret);
goto err_power_off; goto err_power_off;
} }
if (acx->video_mode) { if (nt->video_mode) {
/* In video mode turn peripheral on */ /* In video mode turn peripheral on */
ret = mipi_dsi_turn_on_peripheral(dsi); ret = mipi_dsi_turn_on_peripheral(dsi);
if (ret) { if (ret) {
dev_err(acx->dev, "failed to turn on peripheral\n"); dev_err(nt->dev, "failed to turn on peripheral\n");
goto err_power_off; goto err_power_off;
} }
} }
...@@ -330,43 +333,43 @@ static int acx424akp_prepare(struct drm_panel *panel) ...@@ -330,43 +333,43 @@ static int acx424akp_prepare(struct drm_panel *panel)
return 0; return 0;
err_power_off: err_power_off:
acx424akp_power_off(acx); nt35560_power_off(nt);
return ret; return ret;
} }
static int acx424akp_unprepare(struct drm_panel *panel) static int nt35560_unprepare(struct drm_panel *panel)
{ {
struct acx424akp *acx = panel_to_acx424akp(panel); struct nt35560 *nt = panel_to_nt35560(panel);
struct mipi_dsi_device *dsi = to_mipi_dsi_device(acx->dev); struct mipi_dsi_device *dsi = to_mipi_dsi_device(nt->dev);
int ret; int ret;
ret = mipi_dsi_dcs_set_display_off(dsi); ret = mipi_dsi_dcs_set_display_off(dsi);
if (ret) { if (ret) {
dev_err(acx->dev, "failed to turn display off (%d)\n", ret); dev_err(nt->dev, "failed to turn display off (%d)\n", ret);
return ret; return ret;
} }
/* Enter sleep mode */ /* Enter sleep mode */
ret = mipi_dsi_dcs_enter_sleep_mode(dsi); ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
if (ret) { if (ret) {
dev_err(acx->dev, "failed to enter sleep mode (%d)\n", ret); dev_err(nt->dev, "failed to enter sleep mode (%d)\n", ret);
return ret; return ret;
} }
msleep(85); msleep(85);
acx424akp_power_off(acx); nt35560_power_off(nt);
return 0; return 0;
} }
static int acx424akp_get_modes(struct drm_panel *panel, static int nt35560_get_modes(struct drm_panel *panel,
struct drm_connector *connector) struct drm_connector *connector)
{ {
struct acx424akp *acx = panel_to_acx424akp(panel); struct nt35560 *nt = panel_to_nt35560(panel);
struct drm_display_mode *mode; struct drm_display_mode *mode;
if (acx->video_mode) if (nt->video_mode)
mode = drm_mode_duplicate(connector->dev, mode = drm_mode_duplicate(connector->dev,
&sony_acx424akp_vid_mode); &sony_acx424akp_vid_mode);
else else
...@@ -387,26 +390,26 @@ static int acx424akp_get_modes(struct drm_panel *panel, ...@@ -387,26 +390,26 @@ static int acx424akp_get_modes(struct drm_panel *panel,
return 1; /* Number of modes */ return 1; /* Number of modes */
} }
static const struct drm_panel_funcs acx424akp_drm_funcs = { static const struct drm_panel_funcs nt35560_drm_funcs = {
.unprepare = acx424akp_unprepare, .unprepare = nt35560_unprepare,
.prepare = acx424akp_prepare, .prepare = nt35560_prepare,
.get_modes = acx424akp_get_modes, .get_modes = nt35560_get_modes,
}; };
static int acx424akp_probe(struct mipi_dsi_device *dsi) static int nt35560_probe(struct mipi_dsi_device *dsi)
{ {
struct device *dev = &dsi->dev; struct device *dev = &dsi->dev;
struct acx424akp *acx; struct nt35560 *nt;
int ret; int ret;
acx = devm_kzalloc(dev, sizeof(struct acx424akp), GFP_KERNEL); nt = devm_kzalloc(dev, sizeof(struct nt35560), GFP_KERNEL);
if (!acx) if (!nt)
return -ENOMEM; return -ENOMEM;
acx->video_mode = of_property_read_bool(dev->of_node, nt->video_mode = of_property_read_bool(dev->of_node,
"enforce-video-mode"); "enforce-video-mode");
mipi_dsi_set_drvdata(dsi, acx); mipi_dsi_set_drvdata(dsi, nt);
acx->dev = dev; nt->dev = dev;
dsi->lanes = 2; dsi->lanes = 2;
dsi->format = MIPI_DSI_FMT_RGB888; dsi->format = MIPI_DSI_FMT_RGB888;
...@@ -419,7 +422,7 @@ static int acx424akp_probe(struct mipi_dsi_device *dsi) ...@@ -419,7 +422,7 @@ static int acx424akp_probe(struct mipi_dsi_device *dsi)
dsi->lp_rate = 19200000; dsi->lp_rate = 19200000;
dsi->hs_rate = 420160000; dsi->hs_rate = 420160000;
if (acx->video_mode) if (nt->video_mode)
/* Burst mode using event for sync */ /* Burst mode using event for sync */
dsi->mode_flags = dsi->mode_flags =
MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO |
...@@ -428,63 +431,63 @@ static int acx424akp_probe(struct mipi_dsi_device *dsi) ...@@ -428,63 +431,63 @@ static int acx424akp_probe(struct mipi_dsi_device *dsi)
dsi->mode_flags = dsi->mode_flags =
MIPI_DSI_CLOCK_NON_CONTINUOUS; MIPI_DSI_CLOCK_NON_CONTINUOUS;
acx->supply = devm_regulator_get(dev, "vddi"); nt->supply = devm_regulator_get(dev, "vddi");
if (IS_ERR(acx->supply)) if (IS_ERR(nt->supply))
return PTR_ERR(acx->supply); return PTR_ERR(nt->supply);
/* This asserts RESET by default */ /* This asserts RESET by default */
acx->reset_gpio = devm_gpiod_get_optional(dev, "reset", nt->reset_gpio = devm_gpiod_get_optional(dev, "reset",
GPIOD_OUT_HIGH); GPIOD_OUT_HIGH);
if (IS_ERR(acx->reset_gpio)) if (IS_ERR(nt->reset_gpio))
return dev_err_probe(dev, PTR_ERR(acx->reset_gpio), return dev_err_probe(dev, PTR_ERR(nt->reset_gpio),
"failed to request GPIO\n"); "failed to request GPIO\n");
drm_panel_init(&acx->panel, dev, &acx424akp_drm_funcs, drm_panel_init(&nt->panel, dev, &nt35560_drm_funcs,
DRM_MODE_CONNECTOR_DSI); DRM_MODE_CONNECTOR_DSI);
acx->panel.backlight = devm_backlight_device_register(dev, "acx424akp", dev, acx, nt->panel.backlight = devm_backlight_device_register(dev, "nt35560", dev, nt,
&acx424akp_bl_ops, &acx424akp_bl_props); &nt35560_bl_ops, &nt35560_bl_props);
if (IS_ERR(acx->panel.backlight)) if (IS_ERR(nt->panel.backlight))
return dev_err_probe(dev, PTR_ERR(acx->panel.backlight), return dev_err_probe(dev, PTR_ERR(nt->panel.backlight),
"failed to register backlight device\n"); "failed to register backlight device\n");
drm_panel_add(&acx->panel); drm_panel_add(&nt->panel);
ret = mipi_dsi_attach(dsi); ret = mipi_dsi_attach(dsi);
if (ret < 0) { if (ret < 0) {
drm_panel_remove(&acx->panel); drm_panel_remove(&nt->panel);
return ret; return ret;
} }
return 0; return 0;
} }
static int acx424akp_remove(struct mipi_dsi_device *dsi) static int nt35560_remove(struct mipi_dsi_device *dsi)
{ {
struct acx424akp *acx = mipi_dsi_get_drvdata(dsi); struct nt35560 *nt = mipi_dsi_get_drvdata(dsi);
mipi_dsi_detach(dsi); mipi_dsi_detach(dsi);
drm_panel_remove(&acx->panel); drm_panel_remove(&nt->panel);
return 0; return 0;
} }
static const struct of_device_id acx424akp_of_match[] = { static const struct of_device_id nt35560_of_match[] = {
{ .compatible = "sony,acx424akp" }, { .compatible = "sony,acx424akp" },
{ /* sentinel */ } { /* sentinel */ }
}; };
MODULE_DEVICE_TABLE(of, acx424akp_of_match); MODULE_DEVICE_TABLE(of, nt35560_of_match);
static struct mipi_dsi_driver acx424akp_driver = { static struct mipi_dsi_driver nt35560_driver = {
.probe = acx424akp_probe, .probe = nt35560_probe,
.remove = acx424akp_remove, .remove = nt35560_remove,
.driver = { .driver = {
.name = "panel-sony-acx424akp", .name = "panel-novatek-nt35560",
.of_match_table = acx424akp_of_match, .of_match_table = nt35560_of_match,
}, },
}; };
module_mipi_dsi_driver(acx424akp_driver); module_mipi_dsi_driver(nt35560_driver);
MODULE_AUTHOR("Linus Wallei <linus.walleij@linaro.org>"); MODULE_AUTHOR("Linus Wallei <linus.walleij@linaro.org>");
MODULE_DESCRIPTION("MIPI-DSI Sony acx424akp Panel Driver"); MODULE_DESCRIPTION("MIPI-DSI Novatek NT35560 Panel Driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7