diff --git a/config/kernel/linux-tqma-current.config b/config/kernel/linux-tqma-current.config
index fe460d14e04b..b3200afb741b 100644
--- a/config/kernel/linux-tqma-current.config
+++ b/config/kernel/linux-tqma-current.config
@@ -409,7 +409,6 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_CADENCE=m
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_IMX=y
 CONFIG_I2C_IMX_LPI2C=y
diff --git a/config/sources/families/include/imx8_common.inc b/config/sources/families/include/imx8_common.inc
index e3c24e883ec2..dbff3d421037 100644
--- a/config/sources/families/include/imx8_common.inc
+++ b/config/sources/families/include/imx8_common.inc
@@ -27,7 +27,7 @@ case $BOARD in
 		case $BRANCH in
 
 			current) # mainline stable kernel
-				KERNEL_MAJOR_MINOR="6.11"
+				KERNEL_MAJOR_MINOR="6.12"
 				;;
 
 			edge | default) # use for tests with recent mainline kernels
diff --git a/lib/functions/general/bat-cat.sh b/lib/functions/general/bat-cat.sh
index f389909efa2a..1dc4486045d0 100644
--- a/lib/functions/general/bat-cat.sh
+++ b/lib/functions/general/bat-cat.sh
@@ -9,7 +9,7 @@
 
 function run_tool_batcat() {
 	# Default version
-	BATCAT_VERSION=${BATCAT_VERSION:-0.24.0} # https://github.com/sharkdp/bat/releases
+	BATCAT_VERSION=${BATCAT_VERSION:-0.25.0} # https://github.com/sharkdp/bat/releases
 
 	declare non_cache_dir="/armbian-tools/batcat" # To deploy/reuse cached batcat in a Docker image.
 
diff --git a/patch/kernel/archive/imx8m-6.11/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch b/patch/kernel/archive/imx8m-6.12/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch
similarity index 95%
rename from patch/kernel/archive/imx8m-6.11/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch
rename to patch/kernel/archive/imx8m-6.12/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch
index 0bea84fac8e1..396ef0523dd6 100644
--- a/patch/kernel/archive/imx8m-6.11/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch
+++ b/patch/kernel/archive/imx8m-6.12/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch
@@ -12,7 +12,7 @@ diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freesc
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/freescale/Makefile
 +++ b/arch/arm64/boot/dts/freescale/Makefile
-@@ -198,8 +198,10 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk-mx8-dlvds-lcd1.dtb
+@@ -201,8 +201,10 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk-mx8-dlvds-lcd1.dtb
  
  imx8mp-tqma8mpql-mba8mpxl-lvds-dtbs += imx8mp-tqma8mpql-mba8mpxl.dtb imx8mp-tqma8mpql-mba8mpxl-lvds.dtbo
  imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01-dtbs += imx8mp-tqma8mpql-mba8mpxl.dtb imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01.dtbo