Skip to content

Commit 9afbefe

Browse files
committed
MBa8MPxL: update linux-tqma-current to 6.12
Signed-off-by: Martin Schmiedel <[email protected]>
1 parent f4457a3 commit 9afbefe

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

config/kernel/linux-tqma-current.config

-1
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@ CONFIG_I2C_CHARDEV=y
409409
CONFIG_I2C_MUX=y
410410
CONFIG_I2C_MUX_PCA954x=y
411411
CONFIG_I2C_CADENCE=m
412-
CONFIG_I2C_DESIGNWARE_PLATFORM=y
413412
CONFIG_I2C_GPIO=m
414413
CONFIG_I2C_IMX=y
415414
CONFIG_I2C_IMX_LPI2C=y

config/sources/families/include/imx8_common.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ case $BOARD in
2727
case $BRANCH in
2828

2929
current) # mainline stable kernel
30-
KERNEL_MAJOR_MINOR="6.11"
30+
KERNEL_MAJOR_MINOR="6.12"
3131
;;
3232

3333
edge | default) # use for tests with recent mainline kernels

patch/kernel/archive/imx8m-6.11/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch renamed to patch/kernel/archive/imx8m-6.12/0001-Add-lvds-device-tree-for-imx8mp-tqma8mpql-mba8mp-ras.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
1+
From 55c0fe735ec015be833b639321d6439d82d75c96 Mon Sep 17 00:00:00 2001
22
From: Martin Schmiedel <[email protected]>
33
Date: Tue, 5 Nov 2024 10:07:03 +0100
44
Subject: Add lvds device tree for imx8mp-tqma8mpql-mba8mp-ras314
@@ -9,10 +9,10 @@ Signed-off-by: Martin Schmiedel <[email protected]>
99
1 file changed, 2 insertions(+)
1010

1111
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
12-
index 111111111111..222222222222 100644
12+
index 9d3df8b218a2..e43bf9b4cf0c 100644
1313
--- a/arch/arm64/boot/dts/freescale/Makefile
1414
+++ b/arch/arm64/boot/dts/freescale/Makefile
15-
@@ -198,8 +198,10 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk-mx8-dlvds-lcd1.dtb
15+
@@ -201,8 +201,10 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mp-evk-mx8-dlvds-lcd1.dtb
1616

1717
imx8mp-tqma8mpql-mba8mpxl-lvds-dtbs += imx8mp-tqma8mpql-mba8mpxl.dtb imx8mp-tqma8mpql-mba8mpxl-lvds.dtbo
1818
imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01-dtbs += imx8mp-tqma8mpql-mba8mpxl.dtb imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01.dtbo

0 commit comments

Comments
 (0)