summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
index 96f4438a3569..9c36f14a2d30 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
@@ -97,10 +97,10 @@
status = "okay";
};
+ /* To keep the CAN controller enabled by default,
+ * disable conflicting spidev.
+ */
spidev0: spidev@0 {
- compatible = "toradex,evalspi";
- reg = <0>;
- spi-max-frequency = <23000000>;
status = "disabled";
};
};