summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2023-01-03 17:29:08 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2023-01-05 17:00:56 +0100
commit7527fe49bf5ecb86d1949e59777f8a4ad8744c91 (patch)
treeca8a31ae4c8beba4e98f8b13bc4dc03aaecb35b6
parent643e0f1dbd0eb664c70f1a1db763ea0253f1f276 (diff)
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 <philippe.schenker@toradex.com> (cherry picked from commit 3ea30ab50cd6c59698f33ee2342fc1db45bba035)
-rw-r--r--conf/machine/include/colibri-imx6.inc1
-rw-r--r--conf/machine/include/colibri-imx6ull-emmc.inc1
-rw-r--r--conf/machine/include/colibri-imx7-emmc.inc1
3 files changed, 0 insertions, 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 = ""