From 7527fe49bf5ecb86d1949e59777f8a4ad8744c91 Mon Sep 17 00:00:00 2001 From: Philippe Schenker Date: Tue, 3 Jan 2023 17:29:08 +0100 Subject: machine: colibri-imx6/6ull/7: Do not apply spidev overlay by default Do not apply spidev overlay by default as already CAN is enabled on that spi interface. They will interfere with each other resulting in an error. Related-to: ELB-4724 Signed-off-by: Philippe Schenker (cherry picked from commit 3ea30ab50cd6c59698f33ee2342fc1db45bba035) --- conf/machine/include/colibri-imx6.inc | 1 - conf/machine/include/colibri-imx6ull-emmc.inc | 1 - conf/machine/include/colibri-imx7-emmc.inc | 1 - 3 files changed, 3 deletions(-) diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc index e6d3849..2577188 100644 --- a/conf/machine/include/colibri-imx6.inc +++ b/conf/machine/include/colibri-imx6.inc @@ -9,7 +9,6 @@ MACHINE_NAME = "Colibri-iMX6" TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \ colibri-imx6_vga-640x480_overlay.dtbo \ - colibri-imx6_spidev_overlay.dtbo \ " TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "" diff --git a/conf/machine/include/colibri-imx6ull-emmc.inc b/conf/machine/include/colibri-imx6ull-emmc.inc index ed0885c..3910bf4 100644 --- a/conf/machine/include/colibri-imx6ull-emmc.inc +++ b/conf/machine/include/colibri-imx6ull-emmc.inc @@ -11,7 +11,6 @@ MACHINE_NAME = "Colibri-iMX6ULL-eMMC" TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \ colibri-imx6ull_vga-640x480_overlay.dtbo \ - colibri-imx6ull_spidev_overlay.dtbo \ " TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "" diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc index 64be389..b3141b3 100644 --- a/conf/machine/include/colibri-imx7-emmc.inc +++ b/conf/machine/include/colibri-imx7-emmc.inc @@ -9,7 +9,6 @@ MACHINE_NAME = "Colibri-iMX7-eMMC" TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = " \ colibri-imx7_vga-640x480_overlay.dtbo \ - colibri-imx7_spidev_overlay.dtbo \ " TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "" -- cgit v1.2.3