diff options
Diffstat (limited to 'arch/arm64/boot')
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qxp-colibri-eval-v3.dtsi | 16 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi | 16 |
2 files changed, 17 insertions, 15 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 */ diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi index 97a5fc44fd57..6ae38c7cc1f6 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qxp-colibri.dtsi @@ -943,12 +943,16 @@ /* Colibri SPI */ &lpspi2 { - #address-cells = <1>; - #size-cells = <0>; - fsl,spi-num-chipselects = <1>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lpspi2>; - cs-gpios = <&lsio_gpio1 0 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lpspi2>; + cs-gpios = <&lsio_gpio1 0 GPIO_ACTIVE_LOW>; + status = "okay"; + + spidev0: spidev@0 { + compatible = "toradex,evalspi"; + reg = <0>; + spi-max-frequency = <10000000>; + }; }; /* Colibri UART_B */ |