diff options
Diffstat (limited to 'arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi index 302356d1e33e..481c915db2db 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi @@ -113,8 +113,6 @@ /* Colibri SPI */ &lpspi2 { - status = "okay"; - mcp2515: can@0 { compatible = "microchip,mcp2515"; pinctrl-names = "default"; @@ -126,13 +124,13 @@ spi-max-frequency = <10000000>; status = "okay"; }; - - spidev0: spidev@0 { - compatible = "toradex,evalspi"; - reg = <0>; - spi-max-frequency = <10000000>; - status = "disabled"; - }; + /* To keep the CAN controller enabled by default, + * disable conflicting spidev. This spidev device + * enables with the devicetree overlay. + */ + spidev0: spidev@0 { + status = "disabled"; + }; }; /* Colibri UART_B */ |