This patch adds support for the Armadeus ST0700 Adapt. It comes with a Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT and an adapter board so that it can be connected on the TFT header of Armadeus Dev boards.
Cc: stable@vger.kernel.org # v4.19 Reviewed-by: Rob Herring robh@kernel.org Signed-off-by: Sébastien Szymanski sebastien.szymanski@armadeus.com --- .../display/panel/armadeus,st0700-adapt.txt | 9 ++++++ drivers/gpu/drm/panel/panel-simple.c | 29 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt
diff --git a/Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt b/Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt new file mode 100644 index 000000000000..a30d63db3c8f --- /dev/null +++ b/Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt @@ -0,0 +1,9 @@ +Armadeus ST0700 Adapt. A Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT with +an adapter board. + +Required properties: +- compatible: "armadeus,st0700-adapt" +- power-supply: see panel-common.txt + +Optional properties: +- backlight: see panel-common.txt diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 9e8218f6a3f2..45ca8d10b66f 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -446,6 +446,32 @@ static const struct panel_desc ampire_am800480r3tmqwa1h = { .bus_format = MEDIA_BUS_FMT_RGB666_1X18, };
+static const struct display_timing santek_st0700i5y_rbslw_f_timing = { + .pixelclock = { 26400000, 33300000, 46800000 }, + .hactive = { 800, 800, 800 }, + .hfront_porch = { 16, 210, 354 }, + .hback_porch = { 45, 36, 6 }, + .hsync_len = { 1, 10, 40 }, + .vactive = { 480, 480, 480 }, + .vfront_porch = { 7, 22, 147 }, + .vback_porch = { 22, 13, 3 }, + .vsync_len = { 1, 10, 20 }, + .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW | + DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE +}; + +static const struct panel_desc armadeus_st0700_adapt = { + .timings = &santek_st0700i5y_rbslw_f_timing, + .num_timings = 1, + .bpc = 6, + .size = { + .width = 154, + .height = 86, + }, + .bus_format = MEDIA_BUS_FMT_RGB666_1X18, + .bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_POSEDGE, +}; + static const struct drm_display_mode auo_b101aw03_mode = { .clock = 51450, .hdisplay = 1024, @@ -2544,6 +2570,9 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "arm,rtsm-display", .data = &arm_rtsm, + }, { + .compatible = "armadeus,st0700-adapt", + .data = &armadeus_st0700_adapt, }, { .compatible = "auo,b101aw03", .data = &auo_b101aw03,
To make use of the new eLCDIF DRM driver OF graph description is required. Describe the display using OF graph nodes.
Cc: stable@vger.kernel.org # v4.19 Signed-off-by: Sébastien Szymanski sebastien.szymanski@armadeus.com --- arch/arm/boot/dts/imx6ul-opos6uldev.dts | 37 +++++++++++-------------- 1 file changed, 16 insertions(+), 21 deletions(-)
diff --git a/arch/arm/boot/dts/imx6ul-opos6uldev.dts b/arch/arm/boot/dts/imx6ul-opos6uldev.dts index 0e59ee57fd55..8ecdb9ad2b2e 100644 --- a/arch/arm/boot/dts/imx6ul-opos6uldev.dts +++ b/arch/arm/boot/dts/imx6ul-opos6uldev.dts @@ -56,7 +56,7 @@ stdout-path = &uart1; };
- backlight { + backlight: backlight { compatible = "pwm-backlight"; pwms = <&pwm3 0 191000>; brightness-levels = <0 4 8 16 32 64 128 255>; @@ -97,6 +97,18 @@ gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; };
+ panel: panel { + compatible = "armadeus,st0700-adapt"; + power-supply = <®_3v3>; + backlight = <&backlight>; + + port { + panel_in: endpoint { + remote-endpoint = <&lcdif_out>; + }; + }; + }; + reg_5v: regulator-5v { compatible = "regulator-fixed"; regulator-name = "5V"; @@ -182,28 +194,11 @@ &lcdif { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcdif>; - display = <&display0>; - lcd-supply = <®_3v3>; status = "okay";
- display0: display0 { - bits-per-pixel = <32>; - bus-width = <18>; - - display-timings { - timing0: timing0 { - clock-frequency = <33000033>; - hactive = <800>; - vactive = <480>; - hback-porch = <96>; - hfront-porch = <96>; - vback-porch = <20>; - vfront-porch = <21>; - hsync-len = <64>; - vsync-len = <4>; - de-active = <1>; - pixelclk-active = <0>; - }; + port { + lcdif_out: endpoint { + remote-endpoint = <&panel_in>; }; }; };
Hi Sébastien,
On Tue, May 7, 2019 at 12:27 PM Sébastien Szymanski sebastien.szymanski@armadeus.com wrote:
To make use of the new eLCDIF DRM driver OF graph description is required. Describe the display using OF graph nodes.
Cc: stable@vger.kernel.org # v4.19
The Cc to stable applies to bugfixes, which is not the case here.
With such tag removed:
Reviewed-by: Fabio Estevam festevam@gmail.com
[Adding Sam, who is helping to review/collect panel-simple patches]
On Tue, May 7, 2019 at 12:27 PM Sébastien Szymanski sebastien.szymanski@armadeus.com wrote:
This patch adds support for the Armadeus ST0700 Adapt. It comes with a Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT and an adapter board so that it can be connected on the TFT header of Armadeus Dev boards.
Cc: stable@vger.kernel.org # v4.19 Reviewed-by: Rob Herring robh@kernel.org Signed-off-by: Sébastien Szymanski sebastien.szymanski@armadeus.com
.../display/panel/armadeus,st0700-adapt.txt | 9 ++++++ drivers/gpu/drm/panel/panel-simple.c | 29 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt
diff --git a/Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt b/Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt new file mode 100644 index 000000000000..a30d63db3c8f --- /dev/null +++ b/Documentation/devicetree/bindings/display/panel/armadeus,st0700-adapt.txt @@ -0,0 +1,9 @@ +Armadeus ST0700 Adapt. A Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT with +an adapter board.
+Required properties: +- compatible: "armadeus,st0700-adapt" +- power-supply: see panel-common.txt
+Optional properties: +- backlight: see panel-common.txt diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c index 9e8218f6a3f2..45ca8d10b66f 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -446,6 +446,32 @@ static const struct panel_desc ampire_am800480r3tmqwa1h = { .bus_format = MEDIA_BUS_FMT_RGB666_1X18, };
+static const struct display_timing santek_st0700i5y_rbslw_f_timing = {
.pixelclock = { 26400000, 33300000, 46800000 },.hactive = { 800, 800, 800 },.hfront_porch = { 16, 210, 354 },.hback_porch = { 45, 36, 6 },.hsync_len = { 1, 10, 40 },.vactive = { 480, 480, 480 },.vfront_porch = { 7, 22, 147 },.vback_porch = { 22, 13, 3 },.vsync_len = { 1, 10, 20 },.flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE+};
+static const struct panel_desc armadeus_st0700_adapt = {
.timings = &santek_st0700i5y_rbslw_f_timing,.num_timings = 1,.bpc = 6,.size = {.width = 154,.height = 86,},.bus_format = MEDIA_BUS_FMT_RGB666_1X18,.bus_flags = DRM_BUS_FLAG_DE_HIGH | DRM_BUS_FLAG_PIXDATA_POSEDGE,+};
static const struct drm_display_mode auo_b101aw03_mode = { .clock = 51450, .hdisplay = 1024, @@ -2544,6 +2570,9 @@ static const struct of_device_id platform_of_match[] = { }, { .compatible = "arm,rtsm-display", .data = &arm_rtsm,
}, {.compatible = "armadeus,st0700-adapt",.data = &armadeus_st0700_adapt, }, { .compatible = "auo,b101aw03", .data = &auo_b101aw03,-- 2.19.2
Hi Fabio
On Tue, May 07, 2019 at 12:33:39PM -0300, Fabio Estevam wrote:
[Adding Sam, who is helping to review/collect panel-simple patches]
On Tue, May 7, 2019 at 12:27 PM Sébastien Szymanski sebastien.szymanski@armadeus.com wrote:
This patch adds support for the Armadeus ST0700 Adapt. It comes with a Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT and an adapter board so that it can be connected on the TFT header of Armadeus Dev boards.
Cc: stable@vger.kernel.org # v4.19 Reviewed-by: Rob Herring robh@kernel.org Signed-off-by: Sébastien Szymanski sebastien.szymanski@armadeus.com
Reviewed-by: Sam Ravnborg sam@ravnborg.org
If you wil lresend the patch I can apply it. I have lost the original mail.
Sam
On Tue, May 07, 2019 at 06:19:50PM +0200, Sam Ravnborg wrote:
Hi Fabio
On Tue, May 07, 2019 at 12:33:39PM -0300, Fabio Estevam wrote:
[Adding Sam, who is helping to review/collect panel-simple patches]
On Tue, May 7, 2019 at 12:27 PM Sébastien Szymanski sebastien.szymanski@armadeus.com wrote:
This patch adds support for the Armadeus ST0700 Adapt. It comes with a Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT and an adapter board so that it can be connected on the TFT header of Armadeus Dev boards.
Cc: stable@vger.kernel.org # v4.19 Reviewed-by: Rob Herring robh@kernel.org Signed-off-by: Sébastien Szymanski sebastien.szymanski@armadeus.com
Reviewed-by: Sam Ravnborg sam@ravnborg.org
If you wil lresend the patch I can apply it. I have lost the original mail.
Usually patchwork should have it already (and you can pipe the raw patchwork mbox into dim apply), but somehow it's not there either. Not sure why, sometimes this is because mails are stuck in moderation, sometimes because people do interesting things with their mails (e.g. smtp servers mangling formatting). -Daniel
On Wed, May 08, 2019 at 10:33:03AM +0200, Daniel Vetter wrote:
On Tue, May 07, 2019 at 06:19:50PM +0200, Sam Ravnborg wrote:
Hi Fabio
On Tue, May 07, 2019 at 12:33:39PM -0300, Fabio Estevam wrote:
[Adding Sam, who is helping to review/collect panel-simple patches]
On Tue, May 7, 2019 at 12:27 PM Sébastien Szymanski sebastien.szymanski@armadeus.com wrote:
This patch adds support for the Armadeus ST0700 Adapt. It comes with a Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT and an adapter board so that it can be connected on the TFT header of Armadeus Dev boards.
Cc: stable@vger.kernel.org # v4.19 Reviewed-by: Rob Herring robh@kernel.org Signed-off-by: Sébastien Szymanski sebastien.szymanski@armadeus.com
Reviewed-by: Sam Ravnborg sam@ravnborg.org
If you wil lresend the patch I can apply it. I have lost the original mail.
Usually patchwork should have it already (and you can pipe the raw patchwork mbox into dim apply), but somehow it's not there either. Not sure why, sometimes this is because mails are stuck in moderation, sometimes because people do interesting things with their mails (e.g. smtp servers mangling formatting).
patchwork was just a bit slow, it's there now:
https://patchwork.freedesktop.org/series/60408/
Cheers, Daniel
Hello Sam,
On 5/8/19 11:06 AM, Daniel Vetter wrote:
On Wed, May 08, 2019 at 10:33:03AM +0200, Daniel Vetter wrote:
On Tue, May 07, 2019 at 06:19:50PM +0200, Sam Ravnborg wrote:
Hi Fabio
On Tue, May 07, 2019 at 12:33:39PM -0300, Fabio Estevam wrote:
[Adding Sam, who is helping to review/collect panel-simple patches]
On Tue, May 7, 2019 at 12:27 PM Sébastien Szymanski sebastien.szymanski@armadeus.com wrote:
This patch adds support for the Armadeus ST0700 Adapt. It comes with a Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT and an adapter board so that it can be connected on the TFT header of Armadeus Dev boards.
Cc: stable@vger.kernel.org # v4.19 Reviewed-by: Rob Herring robh@kernel.org Signed-off-by: Sébastien Szymanski sebastien.szymanski@armadeus.com
Reviewed-by: Sam Ravnborg sam@ravnborg.org
If you wil lresend the patch I can apply it. I have lost the original mail.
Usually patchwork should have it already (and you can pipe the raw patchwork mbox into dim apply), but somehow it's not there either. Not sure why, sometimes this is because mails are stuck in moderation, sometimes because people do interesting things with their mails (e.g. smtp servers mangling formatting).
patchwork was just a bit slow, it's there now:
Will you take the patch from patchwork or should I resent it ?
Regards,
Cheers, Daniel
On Tue, May 07, 2019 at 05:27:12PM +0200, Sébastien Szymanski wrote:
This patch adds support for the Armadeus ST0700 Adapt. It comes with a Santek ST0700I5Y-RBSLW 7.0" WVGA (800x480) TFT and an adapter board so that it can be connected on the TFT header of Armadeus Dev boards.
Cc: stable@vger.kernel.org # v4.19 Reviewed-by: Rob Herring robh@kernel.org Signed-off-by: Sébastien Szymanski sebastien.szymanski@armadeus.com
Thanks, applied. Only patch 1/2 applied, as patch 2/2 is missing review.
Sam
linux-stable-mirror@lists.linaro.org
-
Daniel Vetter -
Fabio Estevam -
Sam Ravnborg -
Sébastien Szymanski