diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 7fdd242765..6e6edf3736 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -29,8 +29,8 @@ case "$LINUX" in PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" ;; *) - PKG_VERSION="5.5" - PKG_SHA256="a6fbd4ee903c128367892c2393ee0d9657b6ed3ea90016d4dc6f1f6da20b2330" + PKG_VERSION="5.5.6" + PKG_SHA256="54cc88ab9d7517267d8592905b277424ae441f3d7209c7ad1236533c2be6ee35" PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_PATCH_DIRS="default" ;; diff --git a/projects/Allwinner/patches/linux/0001-backport-from-5.6.patch b/projects/Allwinner/patches/linux/0001-backport-from-5.6.patch index ab00aed2c8..8b32b6543a 100644 --- a/projects/Allwinner/patches/linux/0001-backport-from-5.6.patch +++ b/projects/Allwinner/patches/linux/0001-backport-from-5.6.patch @@ -1164,80 +1164,6 @@ index 0afea59486c2..6e68ed831015 100644 -- 2.24.1 -From ec97faff743b398e21f74a54c81333f3390093aa Mon Sep 17 00:00:00 2001 -From: Icenowy Zheng -Date: Fri, 3 Jan 2020 22:35:03 -0800 -Subject: [PATCH] clk: sunxi-ng: add mux and pll notifiers for A64 CPU clock - -The A64 PLL_CPU clock has the same instability if some factor changed -without the PLL gated like other SoCs with sun6i-style CCU, e.g. A33, -H3. - -Add the mux and pll notifiers for A64 CPU clock to workaround the -problem. - -Fixes: c6a0637460c2 ("clk: sunxi-ng: Add A64 clocks") -Signed-off-by: Icenowy Zheng -Signed-off-by: Vasily Khoruzhick -Signed-off-by: Maxime Ripard ---- - drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 28 ++++++++++++++++++++++++++- - 1 file changed, 27 insertions(+), 1 deletion(-) - -diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c -index 49bd7a4c015c..5f66bf879772 100644 ---- a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c -+++ b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c -@@ -921,11 +921,26 @@ static const struct sunxi_ccu_desc sun50i_a64_ccu_desc = { - .num_resets = ARRAY_SIZE(sun50i_a64_ccu_resets), - }; - -+static struct ccu_pll_nb sun50i_a64_pll_cpu_nb = { -+ .common = &pll_cpux_clk.common, -+ /* copy from pll_cpux_clk */ -+ .enable = BIT(31), -+ .lock = BIT(28), -+}; -+ -+static struct ccu_mux_nb sun50i_a64_cpu_nb = { -+ .common = &cpux_clk.common, -+ .cm = &cpux_clk.mux, -+ .delay_us = 1, /* > 8 clock cycles at 24 MHz */ -+ .bypass_index = 1, /* index of 24 MHz oscillator */ -+}; -+ - static int sun50i_a64_ccu_probe(struct platform_device *pdev) - { - struct resource *res; - void __iomem *reg; - u32 val; -+ int ret; - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - reg = devm_ioremap_resource(&pdev->dev, res); -@@ -939,7 +954,18 @@ static int sun50i_a64_ccu_probe(struct platform_device *pdev) - - writel(0x515, reg + SUN50I_A64_PLL_MIPI_REG); - -- return sunxi_ccu_probe(pdev->dev.of_node, reg, &sun50i_a64_ccu_desc); -+ ret = sunxi_ccu_probe(pdev->dev.of_node, reg, &sun50i_a64_ccu_desc); -+ if (ret) -+ return ret; -+ -+ /* Gate then ungate PLL CPU after any rate changes */ -+ ccu_pll_notifier_register(&sun50i_a64_pll_cpu_nb); -+ -+ /* Reparent CPU during PLL CPU rate changes */ -+ ccu_mux_notifier_register(pll_cpux_clk.common.hw.clk, -+ &sun50i_a64_cpu_nb); -+ -+ return 0; - } - - static const struct of_device_id sun50i_a64_ccu_ids[] = { --- -2.24.1 - From 624b4b48d9d870c2858c016d8709715495409654 Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Tue, 29 Oct 2019 12:28:46 +0100 diff --git a/projects/Allwinner/patches/linux/0002-backport-from-5.7.patch b/projects/Allwinner/patches/linux/0002-backport-from-5.7.patch deleted file mode 100644 index f0c8e218af..0000000000 --- a/projects/Allwinner/patches/linux/0002-backport-from-5.7.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cf913e9683273f2640501094fa63a67e29f437b3 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Sun, 26 Jan 2020 07:59:37 +0100 -Subject: [PATCH] Revert "drm/sun4i: drv: Allow framebuffer modifiers in mode - config" - -This reverts commit 9db9c0cf5895e4ddde2814360cae7bea9282edd2. - -Setting mode_config.allow_fb_modifiers manually is completely -unnecessary. It is set automatically by drm_universal_plane_init() based -on the fact if modifier list is provided or not. Even more, it breaks -DE2 and DE3 as they don't support any modifiers beside linear. Modifiers -aware applications can be confused by provided empty modifier list - at -least linear modifier should be included, but it's not for DE2 and DE3. - -Fixes: 9db9c0cf5895 ("drm/sun4i: drv: Allow framebuffer modifiers in mode config") -Signed-off-by: Jernej Skrabec -Reviewed-by: Paul Kocialkowski -Signed-off-by: Maxime Ripard -Link: https://patchwork.freedesktop.org/patch/msgid/20200126065937.9564-1-jernej.skrabec@siol.net ---- - drivers/gpu/drm/sun4i/sun4i_drv.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c -index a5757b11b730..5b54eff12cc0 100644 ---- a/drivers/gpu/drm/sun4i/sun4i_drv.c -+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c -@@ -85,7 +85,6 @@ static int sun4i_drv_bind(struct device *dev) - } - - drm_mode_config_init(drm); -- drm->mode_config.allow_fb_modifiers = true; - - ret = component_bind_all(drm->dev, drm); - if (ret) { --- -2.25.0 -