MBa8MPxL: update linux-tqma-current to 6.12

Signed-off-by: Martin Schmiedel <Martin.Schmiedel@tq-group.com>
ColorfulRhino · Jan 19, 2025 · a4ed40b · a4ed40b
1 parent 6cca6d4
commit a4ed40b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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/...ree-for-imx8mp-tqma8mpql-mba8mp-ras.patch → ...ree-for-imx8mp-tqma8mpql-mba8mp-ras.patch b/...ree-for-imx8mp-tqma8mpql-mba8mp-ras.patch → ...ree-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