From d7a4c1b3ab001c52d50107e81c61075cc960866b Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 8 Jan 2026 21:27:00 +0100 Subject: [PATCH] Fix broken patch due to upstream changes, drop edge kernel as its not used --- config/boards/ayn-odin2.csc | 2 +- config/sources/families/sm8550.conf | 4 ---- ...3_mmc--sdhci-msm--Limit-HS-mode-frequency-to-37.5MHz.patch | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/config/boards/ayn-odin2.csc b/config/boards/ayn-odin2.csc index b70fc95c1b..63bde0f3e4 100644 --- a/config/boards/ayn-odin2.csc +++ b/config/boards/ayn-odin2.csc @@ -3,7 +3,7 @@ declare -g BOARD_NAME="Ayn Odin2" declare -g BOARD_VENDOR="ayntec" declare -g BOARD_MAINTAINER="FantasyGmm" declare -g BOARDFAMILY="sm8550" -declare -g KERNEL_TARGET="current,edge" +declare -g KERNEL_TARGET="current" declare -g KERNEL_TEST_TARGET="edge" declare -g EXTRAWIFI="no" declare -g BOOTCONFIG="none" diff --git a/config/sources/families/sm8550.conf b/config/sources/families/sm8550.conf index ef54eb53d2..03f9f9fbfd 100644 --- a/config/sources/families/sm8550.conf +++ b/config/sources/families/sm8550.conf @@ -21,10 +21,6 @@ case $BRANCH in declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo ;; - edge) - declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel. - ;; - esac family_tweaks_bsp() { diff --git a/patch/kernel/archive/sm8550-6.12/0043_mmc--sdhci-msm--Limit-HS-mode-frequency-to-37.5MHz.patch b/patch/kernel/archive/sm8550-6.12/0043_mmc--sdhci-msm--Limit-HS-mode-frequency-to-37.5MHz.patch index 7e383c25c1..e5fff5afaa 100644 --- a/patch/kernel/archive/sm8550-6.12/0043_mmc--sdhci-msm--Limit-HS-mode-frequency-to-37.5MHz.patch +++ b/patch/kernel/archive/sm8550-6.12/0043_mmc--sdhci-msm--Limit-HS-mode-frequency-to-37.5MHz.patch @@ -41,7 +41,7 @@ index a6c9e9b60812..9473039ccb13 100644 mult = msm_get_clock_mult_for_bus_mode(host); desired_rate = clock * mult; + -+ if (curr_ios.timing == MMC_TIMING_SD_HS && desired_rate == 50000000 ++ if (timing == MMC_TIMING_SD_HS && desired_rate == 50000000 + && msm_host->uses_level_shifter) + desired_rate = LEVEL_SHIFTER_HIGH_SPEED_FREQ; +