diff options
Diffstat (limited to 'arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts index 5f22b31753e2..764bdcf68780 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts @@ -91,8 +91,6 @@ /* Colibri SPI */ &ecspi4 { - status = "okay"; - mcp251x0: mcp251x@0 { compatible = "microchip,mcp2515"; reg = <0>; @@ -102,10 +100,11 @@ spi-max-frequency = <10000000>; 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"; }; }; @@ -243,10 +242,6 @@ }; }; -&lcd { - status = "okay"; -}; - &mxcfb1 { status = "okay"; }; |