From a9bc7fad5b2d91f187a0517001a57dbc3ed3b038 Mon Sep 17 00:00:00 2001 From: lean Date: Sun, 6 Mar 2022 23:26:30 +0800 Subject: [PATCH] rockchip: default switch kernel to 5.15 --- target/linux/rockchip/Makefile | 4 ++-- ...et-initial-signal-voltage-on-power-off.patch | 17 +++++------------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile index 3dcae9b34..c50dcc5c6 100644 --- a/target/linux/rockchip/Makefile +++ b/target/linux/rockchip/Makefile @@ -7,8 +7,8 @@ BOARDNAME:=Rockchip FEATURES:=ext4 audio usb usbgadget display gpio fpu pci pcie rootfs-part boot-part squashfs SUBTARGETS:=armv8 -KERNEL_PATCHVER=5.10 -KERNEL_TESTING_PATCHVER=5.15 +KERNEL_PATCHVER=5.15 +KERNEL_TESTING_PATCHVER=5.10 define Target/Description Build firmware image for Rockchip SoC devices. diff --git a/target/linux/rockchip/patches-5.10/107-mmc-core-set-initial-signal-voltage-on-power-off.patch b/target/linux/rockchip/patches-5.10/107-mmc-core-set-initial-signal-voltage-on-power-off.patch index a2ec66078..acc3e2c14 100644 --- a/target/linux/rockchip/patches-5.10/107-mmc-core-set-initial-signal-voltage-on-power-off.patch +++ b/target/linux/rockchip/patches-5.10/107-mmc-core-set-initial-signal-voltage-on-power-off.patch @@ -24,19 +24,12 @@ Signed-off-by: Jonas Karlman --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c -@@ -1684,6 +1684,14 @@ void mmc_power_off(struct mmc_host *host) - if (host->ios.power_mode == MMC_POWER_OFF) - return; +@@ -1354,6 +1354,8 @@ void mmc_power_off(struct mmc_host *host + + mmc_pwrseq_power_off(host); + mmc_set_initial_signal_voltage(host); + -+ /* -+ * This delay should be sufficient to allow the power supply -+ * to reach the minimum voltage. -+ */ -+ mmc_delay(host->ios.power_delay_ms); -+ - mmc_pwrseq_power_off(host); - host->ios.clock = 0; - + host->ios.vdd = 0; + \ No newline at end of file