From 69d8a8074a391bc2be0603117c8b237cb0577742 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Wed, 18 Dec 2024 19:36:36 +0300 Subject: [PATCH] sunxi-6.12: Switch to v6.12.5 --- config/sources/families/include/sunxi64_common.inc | 2 +- config/sources/families/include/sunxi_common.inc | 2 +- ...gpu-drm-panel-simple-Add-compability-olinuxino-lcd.patch | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/sources/families/include/sunxi64_common.inc b/config/sources/families/include/sunxi64_common.inc index 4b963a455..760970465 100644 --- a/config/sources/families/include/sunxi64_common.inc +++ b/config/sources/families/include/sunxi64_common.inc @@ -36,7 +36,7 @@ case $BRANCH in edge) declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.12.4" + declare -g KERNELBRANCH="tag:v6.12.5" ;; esac diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index be45d6f85..d347345fb 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -37,7 +37,7 @@ case $BRANCH in edge) declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.12.4" + declare -g KERNELBRANCH="tag:v6.12.5" ;; esac diff --git a/patch/kernel/archive/sunxi-6.12/patches.armbian/drv-gpu-drm-panel-simple-Add-compability-olinuxino-lcd.patch b/patch/kernel/archive/sunxi-6.12/patches.armbian/drv-gpu-drm-panel-simple-Add-compability-olinuxino-lcd.patch index 1d66bec65..5f80eb107 100644 --- a/patch/kernel/archive/sunxi-6.12/patches.armbian/drv-gpu-drm-panel-simple-Add-compability-olinuxino-lcd.patch +++ b/patch/kernel/archive/sunxi-6.12/patches.armbian/drv-gpu-drm-panel-simple-Add-compability-olinuxino-lcd.patch @@ -1,4 +1,4 @@ -From 3689548dfb284451850f69e292d8f3e20cf3833b Mon Sep 17 00:00:00 2001 +From e75e5903f955c45c67134ed9651f8e2d0e1bbe66 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Wed, 2 Feb 2022 19:34:55 +0300 Subject: drv:gpu:drm: panel-simple Add compability olinuxino lcd @@ -8,7 +8,7 @@ Subject: drv:gpu:drm: panel-simple Add compability olinuxino lcd 1 file changed, 121 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 86735430462f..27c3c04c2a77 100644 +index 06381c628209..b488f6d153d8 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -3496,6 +3496,42 @@ static const struct panel_desc okaya_rs800480t_7x0gp = { @@ -138,7 +138,7 @@ index 86735430462f..27c3c04c2a77 100644 /* * 800x480 CVT. The panel appears to be quite accepting, at least as far as * pixel clocks, but this is the timing that was being used in the Adafruit -@@ -4911,8 +5013,23 @@ static const struct of_device_id platform_of_match[] = { +@@ -4936,8 +5038,23 @@ static const struct of_device_id platform_of_match[] = { .compatible = "okaya,rs800480t-7x0gp", .data = &okaya_rs800480t_7x0gp, }, {