main/linux-postmarketos-stericsson: upgrade to 5.14-rc2 (MR 2361)

panel.patch has been upstreamed and is therefore dropped.

[ci:skip-build] already built successfully in CI
This commit is contained in:
Newbyte 2021-07-19 07:55:49 +02:00 committed by Clayton Craft
parent 65fe812d5c
commit b19ce6a937
No known key found for this signature in database
GPG key ID: 7A3461CA187CEA54
2 changed files with 4 additions and 40 deletions

View file

@ -4,9 +4,9 @@
_flavor="postmarketos-stericsson"
_config="config-$_flavor.armv7"
pkgname=linux-$_flavor
pkgver=5.14_rc1
pkgrel=1
_tag="5.14-rc1"
pkgver=5.14_rc2
pkgrel=0
_tag="5.14-rc2"
pkgdesc="Mainline kernel fork for ST-Ericsson NovaThor devices"
arch="armv7"
_carch="arm"
@ -24,7 +24,6 @@ source="
bl.patch
emmc.patch
firmware.patch
panel.patch
regulators.patch
"
builddir="$srcdir/linux-${_tag#v}"
@ -54,11 +53,10 @@ package() {
}
sha512sums="
5effe0dfa535cd19e5e2519f192801ecc8523c828d8d10035880fd01129fb8dd6354b4a5c4a59aa1cec3333c3717d7492d3b7881c55c8bb6e1f51e9f313c7e58 linux-postmarketos-stericsson-5.14-rc1.tar.gz
f12cb96635631a15e806dc1488e69344ec4da62fae10866be070e915f0ba359520b0564f09bc425e588f1d6f484d337b15f1699b492d10e5d4f4908b54c93bbe linux-postmarketos-stericsson-5.14-rc2.tar.gz
6c47559ac85e7ac89fdeeb67295da09d2c9a4558080142d85e23e6c659a3fdf73f4a4b63807bc617dbd170afd50860e4aa24d9cb1919ad2160dcff9ab7c77e04 config-postmarketos-stericsson.armv7
66ec2d3105540e991bccc8cfb0e4212cb40a31a5a35e8cdc084b8bd7ffa016a86b3b340fd57b077b3c95b5bcb1e80cadaa11e71cd1a54a3e0e595024f3f27346 bl.patch
760afb46cf56a97b9a9a61fabd5c686c7b98bd64864774516099ad57a7c34d146a16d7ce4687b6071c3fd2df307e7f184428924569e0e767f3c80b780720d85b emmc.patch
8c12e75094fde3fe50318cc478afdb2ed304ad682172e30b64ac27d536d8ccba2b6a364e62b4028e9c9ea7863e43f36dc6e3d466b29199d260d86a5995d224a1 firmware.patch
1d4d549c5a8c8bda8eec814cd8632626f16d273d775f082028d15db7a330e0c01b2999668b0963eaeb06410de0c14d1d4c3344ac92a228da9392dba33562dcac panel.patch
8206d74c52328827502a32644f70fd149a72a78aaf936cd44f474b9153e8caccf73206df76e24004329edebab90e1a4a0e965630f4817aa5dd642d9ee2729295 regulators.patch
"

View file

@ -1,34 +0,0 @@
Failing to read the MTP over DSI should not bring down the
system and make us bail out from using the display, it turns
out that this happens when toggling the display off and on,
and that write is often still working so the display output
is just fine. Printing an error is enough.
Tested by killing the Gnome session repeatedly on the
Samsung Skomer.
Fixes: 899f24ed8d3a ("drm/panel: Add driver for Novatek NT35510-based panels")
Cc: Stephan Gerhold <stephan@gerhold.net>
Reported-by: newbyte@disroot.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/gpu/drm/panel/panel-novatek-nt35510.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-novatek-nt35510.c b/drivers/gpu/drm/panel/panel-novatek-nt35510.c
index ef70140c5b09..873cbd38e6d3 100644
--- a/drivers/gpu/drm/panel/panel-novatek-nt35510.c
+++ b/drivers/gpu/drm/panel/panel-novatek-nt35510.c
@@ -706,9 +706,7 @@ static int nt35510_power_on(struct nt35510 *nt)
if (ret)
return ret;
- ret = nt35510_read_id(nt);
- if (ret)
- return ret;
+ nt35510_read_id(nt);
/* Set up stuff in manufacturer control, page 1 */
ret = nt35510_send_long(nt, dsi, MCS_CMD_MAUCCTR,
--
2.31.1