summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleksandr Suvorov <oleksandr.suvorov@toradex.com>2021-01-13 18:43:01 +0200
committerOleksandr Suvorov <oleksandr.suvorov@toradex.com>2021-01-14 18:13:49 +0200
commit233514e2427e433e9cb474a9705b9204a0455ef9 (patch)
treed3af1d7aa511e5cc6e1dd589ef07192983e97191
parentd76e38fcbf3d24bf9592a2482e80aab213ea3959 (diff)
ARM: dts: colibri-imx7: 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>
-rw-r--r--arch/arm/boot/dts/imx7-colibri-aster.dtsi7
-rw-r--r--arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi11
-rw-r--r--arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi11
-rw-r--r--arch/arm/boot/dts/imx7-colibri-iris.dtsi11
-rw-r--r--arch/arm/boot/dts/imx7-colibri.dtsi7
5 files changed, 12 insertions, 35 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi
index 3b53ed1a97ae..72767d2af777 100644
--- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi
@@ -91,13 +91,6 @@
>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3 &pinctrl_ecspi3_cs &pinctrl_gpio5>;
- 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/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
index 0d7e1122b985..cbd7d32f224e 100644
--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
@@ -129,8 +129,6 @@
};
&ecspi3 {
- status = "okay";
-
mcp2515: can@0 {
compatible = "microchip,mcp2515";
pinctrl-names = "default";
@@ -144,13 +142,14 @@
xceiver-supply = <&reg_5v0>;
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";
};
+
};
&fec1 {
diff --git a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi
index 0abbe70f78b4..6fcb8f7b9b7d 100644
--- a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi
@@ -81,17 +81,6 @@
status = "okay";
};
-&ecspi3 {
- status = "okay";
-
- spidev0: spidev@0 {
- compatible = "toradex,evalspi";
- reg = <0>;
- spi-max-frequency = <23000000>;
- status = "okay";
- };
-};
-
&fec1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx7-colibri-iris.dtsi b/arch/arm/boot/dts/imx7-colibri-iris.dtsi
index f03a553a5b65..f15e9c2ab80b 100644
--- a/arch/arm/boot/dts/imx7-colibri-iris.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-iris.dtsi
@@ -78,17 +78,6 @@
status = "okay";
};
-&ecspi3 {
- status = "okay";
-
- spidev0: spidev@0 {
- compatible = "toradex,evalspi";
- reg = <0>;
- spi-max-frequency = <23000000>;
- status = "okay";
- };
-};
-
&fec1 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index 8e84a303fca6..472a3472dcbf 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -71,6 +71,13 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3 &pinctrl_ecspi3_cs>;
cs-gpios = <&gpio4 11 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+
+ spidev0: spidev@0 {
+ compatible = "toradex,evalspi";
+ reg = <0>;
+ spi-max-frequency = <23000000>;
+ };
};
&fec1 {