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 <oleksandr.suvorov@toradex.com>

6 files changed, 15 insertions, 42 deletions

diff --git a/arch/arm/boot/dts/imx6dl-colibri-aster.dts b/arch/arm/boot/dts/imx6dl-colibri-aster.dts
index d149c02932cb..052ca13ddd06 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-aster.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-aster.dts
@@ -84,13 +84,6 @@
 	>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi4 &pinctrl_csi_gpio_2>;
-	status = "okay";
-
-	spidev0: spidev@0 {
-		compatible = "toradex,evalspi";
-		reg = <0>;
-		spi-max-frequency = <23000000>;
-	};
 
 	spidev1: spidev@1 {
 		compatible = "toradex,evalspi";
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..06f7f2d06069 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";
 	};
 };
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";
 	};
 };
diff --git a/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts b/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts
index ef019a950655..bf829c14ca81 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-iris-v2.dts
@@ -44,18 +44,6 @@
 	status = "okay";
 };
 
-/* Colibri SSP */
-&ecspi4 {
-	status = "okay";
-
-	spidev0: spidev@0 {
-		compatible = "toradex,evalspi";
-		reg = <0>;
-		spi-max-frequency = <23000000>;
-		status = "okay";
-	};
-};
-
 /*
  * I2C: I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier
  * board)
diff --git a/arch/arm/boot/dts/imx6dl-colibri-iris.dts b/arch/arm/boot/dts/imx6dl-colibri-iris.dts
index 7927b3534e91..45a84023e36b 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-iris.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-iris.dts
@@ -32,18 +32,6 @@
 	status = "okay";
 };
 
-/* Colibri SSP */
-&ecspi4 {
-	status = "okay";
-
-	spidev0: spidev@0 {
-		compatible = "toradex,evalspi";
-		reg = <0>;
-		spi-max-frequency = <23000000>;
-		status = "okay";
-	};
-};
-
 /*
  * I2C: I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier
  * board)
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 2e51c2ab5a80..b9a1cf409c84 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -221,7 +221,13 @@
 	cs-gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_ecspi4>;
-	status = "disabled";
+	status = "okay";
+
+	spidev0: spidev@0 {
+		compatible = "toradex,evalspi";
+		reg = <0>;
+		spi-max-frequency = <23000000>;
+	};
 };
 
 &fec {