mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 21:26:49 +00:00
linux: update to 6.6.57
deleted: projects/Rockchip/patches/linux/default/linux-0003-pinctrl--rockchip--correct-RK3328-iomux-width-flag-for-GPIO2-B-pins.patch modified: projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch removed hunks 11 and 47
This commit is contained in:
Peter Tuschy
parent
a0b38747d8
commit
4df04d47b2
@ -29,8 +29,8 @@ case "${LINUX}" in
|
|||||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
PKG_VERSION="6.6.46"
|
PKG_VERSION="6.6.57"
|
||||||
PKG_SHA256="052f932396d9c7d84ceeda91226a8ef797c12188bde41e6c419602d990dd45f2"
|
PKG_SHA256="66ce426ef96f99b8e1ef7ac72e780c730ef8b970f7aa5708501c4274d7abb7b3"
|
||||||
PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
PKG_URL="https://www.kernel.org/pub/linux/kernel/v${PKG_VERSION/.*/}.x/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||||
PKG_PATCH_DIRS="default"
|
PKG_PATCH_DIRS="default"
|
||||||
;;
|
;;
|
||||||
|
|||||||
@ -1,55 +0,0 @@
|
|||||||
From e0e1d9a46cbcebf4faa5e3deacefe9934886bea1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Huang-Huang Bao <i@eh5.me>
|
|
||||||
Date: Tue, 9 Jul 2024 18:54:28 +0800
|
|
||||||
Subject: pinctrl: rockchip: correct RK3328 iomux width flag for GPIO2-B pins
|
|
||||||
|
|
||||||
commit 128f71fe014fc91efa1407ce549f94a9a9f1072c upstream.
|
|
||||||
|
|
||||||
The base iomux offsets for each GPIO pin line are accumulatively
|
|
||||||
calculated based off iomux width flag in rockchip_pinctrl_get_soc_data.
|
|
||||||
If the iomux width flag is one of IOMUX_WIDTH_4BIT, IOMUX_WIDTH_3BIT or
|
|
||||||
IOMUX_WIDTH_2BIT, the base offset for next pin line would increase by 8
|
|
||||||
bytes, otherwise it would increase by 4 bytes.
|
|
||||||
|
|
||||||
Despite most of GPIO2-B iomux have 2-bit data width, which can be fit
|
|
||||||
into 4 bytes space with write mask, it actually take 8 bytes width for
|
|
||||||
whole GPIO2-B line.
|
|
||||||
|
|
||||||
Commit e8448a6c817c ("pinctrl: rockchip: fix pinmux bits for RK3328
|
|
||||||
GPIO2-B pins") wrongly set iomux width flag to 0, causing all base
|
|
||||||
iomux offset for line after GPIO2-B to be calculated wrong. Fix the
|
|
||||||
iomux width flag to IOMUX_WIDTH_2BIT so the offset after GPIO2-B is
|
|
||||||
correctly increased by 8, matching the actual width of GPIO2-B iomux.
|
|
||||||
|
|
||||||
Fixes: e8448a6c817c ("pinctrl: rockchip: fix pinmux bits for RK3328 GPIO2-B pins")
|
|
||||||
Cc: stable@vger.kernel.org
|
|
||||||
Reported-by: Richard Kojedzinszky <richard@kojedz.in>
|
|
||||||
Closes: https://lore.kernel.org/linux-rockchip/4f29b743202397d60edfb3c725537415@kojedz.in/
|
|
||||||
Tested-by: Richard Kojedzinszky <richard@kojedz.in>
|
|
||||||
Signed-off-by: Huang-Huang Bao <i@eh5.me>
|
|
||||||
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
|
|
||||||
Tested-by: Daniel Golle <daniel@makrotopia.org>
|
|
||||||
Tested-by: Trevor Woerner <twoerner@gmail.com>
|
|
||||||
Link: https://lore.kernel.org/20240709105428.1176375-1-i@eh5.me
|
|
||||||
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
---
|
|
||||||
drivers/pinctrl/pinctrl-rockchip.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/pinctrl/pinctrl-rockchip.c b/drivers/pinctrl/pinctrl-rockchip.c
|
|
||||||
index b02eaba010d101..b5a02335617d77 100644
|
|
||||||
--- a/drivers/pinctrl/pinctrl-rockchip.c
|
|
||||||
+++ b/drivers/pinctrl/pinctrl-rockchip.c
|
|
||||||
@@ -3802,7 +3802,7 @@ static struct rockchip_pin_bank rk3328_pin_banks[] = {
|
|
||||||
PIN_BANK_IOMUX_FLAGS(0, 32, "gpio0", 0, 0, 0, 0),
|
|
||||||
PIN_BANK_IOMUX_FLAGS(1, 32, "gpio1", 0, 0, 0, 0),
|
|
||||||
PIN_BANK_IOMUX_FLAGS(2, 32, "gpio2", 0,
|
|
||||||
- 0,
|
|
||||||
+ IOMUX_WIDTH_2BIT,
|
|
||||||
IOMUX_WIDTH_3BIT,
|
|
||||||
0),
|
|
||||||
PIN_BANK_IOMUX_FLAGS(3, 32, "gpio3",
|
|
||||||
--
|
|
||||||
cgit 1.2.3-korg
|
|
||||||
|
|
||||||
@ -631,30 +631,6 @@ index 38dded2baaf7..9e460b7e14a4 100644
|
|||||||
err_clk:
|
err_clk:
|
||||||
regulator_disable(hdmi->avdd_1v8);
|
regulator_disable(hdmi->avdd_1v8);
|
||||||
|
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jonas Karlman <jonas@kwiboo.se>
|
|
||||||
Date: Wed, 8 Jan 2020 21:07:50 +0000
|
|
||||||
Subject: [PATCH] clk: rockchip: set parent rate for DCLK_VOP clock on rk3228
|
|
||||||
|
|
||||||
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
|
||||||
---
|
|
||||||
drivers/clk/rockchip/clk-rk3228.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/clk/rockchip/clk-rk3228.c b/drivers/clk/rockchip/clk-rk3228.c
|
|
||||||
index a24a35553e13..7343d2d7676b 100644
|
|
||||||
--- a/drivers/clk/rockchip/clk-rk3228.c
|
|
||||||
+++ b/drivers/clk/rockchip/clk-rk3228.c
|
|
||||||
@@ -409,7 +409,7 @@ static struct rockchip_clk_branch rk3228_clk_branches[] __initdata = {
|
|
||||||
RK2928_CLKSEL_CON(29), 0, 3, DFLAGS),
|
|
||||||
DIV(0, "sclk_vop_pre", "sclk_vop_src", 0,
|
|
||||||
RK2928_CLKSEL_CON(27), 8, 8, DFLAGS),
|
|
||||||
- MUX(DCLK_VOP, "dclk_vop", mux_dclk_vop_p, 0,
|
|
||||||
+ MUX(DCLK_VOP, "dclk_vop", mux_dclk_vop_p, CLK_SET_RATE_PARENT | CLK_SET_RATE_NO_REPARENT,
|
|
||||||
RK2928_CLKSEL_CON(27), 1, 1, MFLAGS),
|
|
||||||
|
|
||||||
FACTOR(0, "xin12m", "xin24m", 0, 1, 2),
|
|
||||||
|
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Jonas Karlman <jonas@kwiboo.se>
|
From: Jonas Karlman <jonas@kwiboo.se>
|
||||||
Date: Sat, 10 Oct 2020 14:32:21 +0000
|
Date: Sat, 10 Oct 2020 14:32:21 +0000
|
||||||
@ -2662,37 +2638,6 @@ index ae4c49e84470..92e621f2714f 100644
|
|||||||
|
|
||||||
static const u16 csc_coeff_rgb_full_to_rgb_limited[3][4] = {
|
static const u16 csc_coeff_rgb_full_to_rgb_limited[3][4] = {
|
||||||
|
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alex Bee <knaerzche@gmail.com>
|
|
||||||
Date: Tue, 1 Jun 2021 19:24:37 +0200
|
|
||||||
Subject: [PATCH] drm/rockchip: allow 4096px width modes
|
|
||||||
|
|
||||||
There is not reason to limit vop output to 3840px width modes.
|
|
||||||
Also drop the limitation from dw_hdmi_rockchip_mode_valid, since
|
|
||||||
the max dimenstions of the actual vop version is validated in
|
|
||||||
vop_crtc_mode_valid anyways.
|
|
||||||
|
|
||||||
Signed-off-by: Alex Bee <knaerzche@gmail.com>
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
|
||||||
index ef0a078c22f4..49619f794061 100644
|
|
||||||
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
|
||||||
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
|
|
||||||
@@ -424,8 +424,8 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win,
|
|
||||||
if (info->is_yuv)
|
|
||||||
is_yuv = true;
|
|
||||||
|
|
||||||
- if (dst_w > 3840) {
|
|
||||||
- DRM_DEV_ERROR(vop->dev, "Maximum dst width (3840) exceeded\n");
|
|
||||||
+ if (dst_w > 4096) {
|
|
||||||
+ DRM_DEV_ERROR(vop->dev, "Maximum dst width (4096) exceeded\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
From: Jonas Karlman <jonas@kwiboo.se>
|
From: Jonas Karlman <jonas@kwiboo.se>
|
||||||
Date: Tue, 1 Oct 2019 20:52:42 +0000
|
Date: Tue, 1 Oct 2019 20:52:42 +0000
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user