summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-10-27 17:18:21 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2014-10-28 14:35:41 +0100
commite4d6ca5866fb71e43081e10fdd9f830bf589a01a (patch)
tree20c3244dca74e2c4faf02d0088694093ad5aa90e /arch/arm/boot
parent82cf64948ddab0360fab876ee321b6191ed7258a (diff)
Apalis/Colibri iMX6: add deactivated RS485 setting
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts3
-rw-r--r--arch/arm/boot/dts/imx6q-apalis-eval.dts3
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index fbcf0e591cf7..59dd4f281c14 100644
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -200,6 +200,9 @@
&uart2 {
status = "okay";
+#if 0
+ linux,rs485-enabled-at-boot-time;
+#endif
};
&uart3 {
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index 6a4b0fa6c5c8..446c08f0324f 100644
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -262,6 +262,9 @@
&uart2 {
status = "okay";
+#if 0
+ linux,rs485-enabled-at-boot-time;
+#endif
};
&uart4 {