summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi')
-rw-r--r--arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi11
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
index 0d7e1122b985..cbd7d32f224e 100644
--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
@@ -129,8 +129,6 @@
};
&ecspi3 {
- status = "okay";
-
mcp2515: can@0 {
compatible = "microchip,mcp2515";
pinctrl-names = "default";
@@ -144,13 +142,14 @@
xceiver-supply = <&reg_5v0>;
status = "okay";
};
-
+ /* To keep the CAN controller enabled by default,
+ * disable conflicting spidev. This spidev device
+ * enables with the devicetree overlay.
+ */
spidev0: spidev@0 {
- compatible = "toradex,evalspi";
- reg = <0>;
- spi-max-frequency = <23000000>;
status = "disabled";
};
+
};
&fec1 {