mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.19 to 5.19.2
This commit is contained in:
lean
parent
155fd1750e
commit
5c200342a7
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.19 = .1
|
LINUX_VERSION-5.19 = .2
|
||||||
LINUX_KERNEL_HASH-5.19.1 = f4e27b926ea2c66b808db1f5706254cf92a8899e2108eedb0c3a7d12499aea55
|
LINUX_KERNEL_HASH-5.19.2 = 48e40a1f5501ec6c40e3c86d3d5319200b688f2d9360f72833084d74801fe63d
|
||||||
|
|||||||
@ -1,27 +0,0 @@
|
|||||||
From 118f07ebcff85e505941b9806171d2fab0cb7b8e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dan Carpenter <dan.carpenter@oracle.com>
|
|
||||||
Date: Mon, 9 May 2022 12:05:05 +0300
|
|
||||||
Subject: [PATCH 37/51] drm/rockchip: vop2: unlock on error path in
|
|
||||||
vop2_crtc_atomic_enable()
|
|
||||||
|
|
||||||
This error path needs an unlock before returning.
|
|
||||||
|
|
||||||
Fixes: 604be85547ce ("drm/rockchip: Add VOP2 driver")
|
|
||||||
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
|
|
||||||
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
|
|
||||||
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
||||||
Link: https://patchwork.freedesktop.org/patch/msgid/YnjZQRV9lpub2ET8@kili
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
|
|
||||||
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
|
|
||||||
@@ -1524,6 +1524,7 @@ static void vop2_crtc_atomic_enable(stru
|
|
||||||
if (ret < 0) {
|
|
||||||
drm_err(vop2->drm, "failed to enable dclk for video port%d - %d\n",
|
|
||||||
vp->id, ret);
|
|
||||||
+ vop2_unlock(vop2);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
From 189fcc50d8531f4904a96aac754fd61c26c4dd3c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
||||||
Date: Sat, 18 Jun 2022 19:08:05 +0200
|
|
||||||
Subject: [PATCH 40/51] drm/rockchip: Fix an error handling path
|
|
||||||
rockchip_dp_probe()
|
|
||||||
|
|
||||||
Should component_add() fail, we should call analogix_dp_remove() in the
|
|
||||||
error handling path, as already done in the remove function.
|
|
||||||
|
|
||||||
Fixes: 152cce0006ab ("drm/bridge: analogix_dp: Split bind() into probe() and real bind()")
|
|
||||||
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
||||||
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
||||||
Link: https://patchwork.freedesktop.org/patch/msgid/b719d9061bb97eb85145fbd3c5e63f4549f2e13e.1655572071.git.christophe.jaillet@wanadoo.fr
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 10 +++++++++-
|
|
||||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
|
|
||||||
+++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
|
|
||||||
@@ -408,7 +408,15 @@ static int rockchip_dp_probe(struct plat
|
|
||||||
if (IS_ERR(dp->adp))
|
|
||||||
return PTR_ERR(dp->adp);
|
|
||||||
|
|
||||||
- return component_add(dev, &rockchip_dp_component_ops);
|
|
||||||
+ ret = component_add(dev, &rockchip_dp_component_ops);
|
|
||||||
+ if (ret)
|
|
||||||
+ goto err_dp_remove;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+err_dp_remove:
|
|
||||||
+ analogix_dp_remove(dp->adp);
|
|
||||||
+ return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int rockchip_dp_remove(struct platform_device *pdev)
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
From c65316cf05c7597c0d8dc23373b840aafd34ffb8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Geis <pgwipeout@gmail.com>
|
|
||||||
Date: Tue, 21 Jun 2022 20:31:40 -0400
|
|
||||||
Subject: [PATCH 43/51] phy: rockchip-inno-usb2: Sync initial otg state
|
|
||||||
|
|
||||||
The initial otg state for the phy defaults to device mode. The actual
|
|
||||||
state isn't detected until an ID IRQ fires. Fix this by syncing the ID
|
|
||||||
state during initialization.
|
|
||||||
|
|
||||||
Fixes: 51a9b2c03dd3 ("phy: rockchip-inno-usb2: Handle ID IRQ")
|
|
||||||
Signed-off-by: Peter Geis <pgwipeout@gmail.com>
|
|
||||||
Reviewed-by: Samuel Holland <samuel@sholland.org>
|
|
||||||
Link: https://lore.kernel.org/r/20220622003140.30365-1-pgwipeout@gmail.com
|
|
||||||
Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
|
||||||
---
|
|
||||||
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
|
||||||
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
|
||||||
@@ -1162,6 +1162,12 @@ static int rockchip_usb2phy_otg_port_ini
|
|
||||||
EXTCON_USB_HOST, &rport->event_nb);
|
|
||||||
if (ret)
|
|
||||||
dev_err(rphy->dev, "register USB HOST notifier failed\n");
|
|
||||||
+
|
|
||||||
+ if (!of_property_read_bool(rphy->dev->of_node, "extcon")) {
|
|
||||||
+ /* do initial sync of usb state */
|
|
||||||
+ ret = property_enabled(rphy->grf, &rport->port_cfg->utmi_id);
|
|
||||||
+ extcon_set_state_sync(rphy->edev, EXTCON_USB_HOST, !ret);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
out:
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
From 3ddee7849f0ab4b4edcc812c6569236b53796640 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Samuel Holland <samuel@sholland.org>
|
|
||||||
Date: Fri, 8 Jul 2022 01:14:34 -0500
|
|
||||||
Subject: [PATCH 49/51] phy: rockchip-inno-usb2: Ignore OTG IRQs in host mode
|
|
||||||
|
|
||||||
When the OTG port is fixed to host mode, the driver does not request its
|
|
||||||
IRQs, nor does it enable those IRQs in hardware. Similarly, the driver
|
|
||||||
should ignore the OTG port IRQs when handling the shared interrupt.
|
|
||||||
|
|
||||||
Otherwise, it would update the extcon based on an ID pin which may be in
|
|
||||||
an undefined state, or try to queue a uninitialized work item.
|
|
||||||
|
|
||||||
Fixes: 6a98df08ccd5 ("phy: rockchip-inno-usb2: Fix muxed interrupt support")
|
|
||||||
Reported-by: Frank Wunderlich <frank-w@public-files.de>
|
|
||||||
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
|
||||||
Tested-by: Frank Wunderlich <frank-w@public-files.de>
|
|
||||||
Tested-by: Peter Geis <pgwipeout@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 4 +++-
|
|
||||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
|
||||||
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
|
||||||
@@ -978,7 +978,9 @@ static irqreturn_t rockchip_usb2phy_irq(
|
|
||||||
|
|
||||||
switch (rport->port_id) {
|
|
||||||
case USB2PHY_PORT_OTG:
|
|
||||||
- ret |= rockchip_usb2phy_otg_mux_irq(irq, rport);
|
|
||||||
+ if (rport->mode != USB_DR_MODE_HOST &&
|
|
||||||
+ rport->mode != USB_DR_MODE_UNKNOWN)
|
|
||||||
+ ret |= rockchip_usb2phy_otg_mux_irq(irq, rport);
|
|
||||||
break;
|
|
||||||
case USB2PHY_PORT_HOST:
|
|
||||||
ret |= rockchip_usb2phy_linestate_irq(irq, rport);
|
|
||||||
Loading…
Reference in New Issue
Block a user