From d76e38fcbf3d24bf9592a2482e80aab213ea3959 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 7 Jan 2021 13:44:49 +0200 Subject: ARM: dts: colibri-imx6dl: improve spidev configuration All Toradex Colibri family boards support the ecspi interface. Move the definition of spidev0 to the module devicetree and enable it by default. Colibri Eval board has a CAN SPI controller. Disable the spidev0 for this board to have the CAN controller been enabled by default. Related-to: ELB-3401 Signed-off-by: Oleksandr Suvorov --- arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts') diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index 85490fa6c3bf..09e5740c75df 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -88,8 +88,6 @@ /* Colibri SSP */ &ecspi4 { - status = "okay"; - mcp251x0: mcp251x@0 { compatible = "microchip,mcp2515"; reg = <0>; @@ -99,10 +97,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"; }; }; -- cgit v1.2.3