summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri-aster.dtsi15
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi6
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi11
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri-iris.dtsi11
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri.dtsi7
5 files changed, 15 insertions, 35 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi
index b18337d49606..ddb3146ff399 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi
@@ -83,19 +83,14 @@
status = "okay";
fsl,spi-num-chipselects = <2>;
- /* Note, gpio4 11 is muxed by hoggrp-4 */
+ /* Note: the gpio4 28 is muxed with pinctrl_gpio4 group, controlled
+ * by iomuxc.
+ */
cs-gpios = <
- &gpio3 26 GPIO_ACTIVE_HIGH
- &gpio4 28 GPIO_ACTIVE_HIGH
+ &gpio3 26 GPIO_ACTIVE_HIGH /* SODIMM_86 LCD_DATA21 */
+ &gpio4 28 GPIO_ACTIVE_HIGH /* SODIMM_65 CSI_DATA07 */
>;
- spidev0: spidev@0 {
- compatible = "toradex,evalspi";
- reg = <0>;
- spi-max-frequency = <23000000>;
- status = "okay";
- };
-
spidev1: spidev@1 {
compatible = "toradex,evalspi";
reg = <1>;
diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
index 96f4438a3569..9c36f14a2d30 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
@@ -97,10 +97,10 @@
status = "okay";
};
+ /* To keep the CAN controller enabled by default,
+ * disable conflicting spidev.
+ */
spidev0: spidev@0 {
- compatible = "toradex,evalspi";
- reg = <0>;
- spi-max-frequency = <23000000>;
status = "disabled";
};
};
diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi
index dde92dd69998..1617013ed10a 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-iris-v2.dtsi
@@ -85,17 +85,6 @@
status = "okay";
};
-&ecspi1 {
- status = "okay";
-
- spidev0: spidev@0 {
- compatible = "toradex,evalspi";
- reg = <0>;
- spi-max-frequency = <23000000>;
- status = "okay";
- };
-};
-
&i2c1 {
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1>;
diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi
index 1e309c267876..e7c8ed87fc3b 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi
@@ -75,17 +75,6 @@
status = "okay";
};
-&ecspi1 {
- status = "okay";
-
- spidev0: spidev@0 {
- compatible = "toradex,evalspi";
- reg = <0>;
- spi-max-frequency = <23000000>;
- status = "okay";
- };
-};
-
&i2c1 {
pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1>;
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index ad6a96b7f5b8..63669c1177da 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -109,6 +109,13 @@
cs-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>;
+
+ spidev0: spidev@0 {
+ compatible = "toradex,evalspi";
+ reg = <0>;
+ spi-max-frequency = <23000000>;
+ status = "okay";
+ };
};
&fec2 {