summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--overlays/Makefile2
-rw-r--r--overlays/apalis-imx6_lcd-lt161010_overlay.dts2
-rw-r--r--overlays/apalis-imx8_resistive-touch_overlay.dts22
-rw-r--r--overlays/colibri-imx6_lcd-lt161010_overlay.dts2
-rw-r--r--overlays/colibri-imx6ull_atmel-mxt-connector_overlay.dts20
-rw-r--r--overlays/colibri-imx8x_disable-cm40-uart_overlay.dts21
6 files changed, 54 insertions, 15 deletions
diff --git a/overlays/Makefile b/overlays/Makefile
index 19bd504..02e4930 100644
--- a/overlays/Makefile
+++ b/overlays/Makefile
@@ -37,6 +37,7 @@ dtb-y += apalis-imx8_lvds_overlay.dtbo
dtb-y += apalis-imx8_mezzanine_lvds_overlay.dtbo
dtb-y += apalis-imx8_mezzanine_ov5640_overlay.dtbo
dtb-y += apalis-imx8_ov5640_overlay.dtbo
+dtb-y += apalis-imx8_resistive-touch_overlay.dtbo
dtb-y += colibri-imx6_atmel-mxt-adapter_overlay.dtbo
dtb-y += colibri-imx6_atmel-mxt-connector_overlay.dtbo
dtb-y += colibri-imx6-eval_spidev_overlay.dtbo
@@ -70,6 +71,7 @@ dtb-y += colibri-imx7_lcd-vga_overlay.dtbo
dtb-y += colibri-imx8x_ad7879_overlay.dtbo
dtb-y += colibri-imx8x_atmel-mxt-adapter_overlay.dtbo
dtb-y += colibri-imx8x_atmel-mxt-connector_overlay.dtbo
+dtb-y += colibri-imx8x_disable-cm40-uart_overlay.dtbo
dtb-y += colibri-imx8x_display-lcdif_overlay.dtbo
dtb-y += colibri-imx8x_dsihdmi_overlay.dtbo
dtb-y += colibri-imx8x-eval_spidev_overlay.dtbo
diff --git a/overlays/apalis-imx6_lcd-lt161010_overlay.dts b/overlays/apalis-imx6_lcd-lt161010_overlay.dts
index 3a873d9..b08fa23 100644
--- a/overlays/apalis-imx6_lcd-lt161010_overlay.dts
+++ b/overlays/apalis-imx6_lcd-lt161010_overlay.dts
@@ -21,6 +21,6 @@
};
&mxcfb3 {
- mode_str ="800x480M@60";
+ mode_str ="FusionF07A";
status = "okay";
};
diff --git a/overlays/apalis-imx8_resistive-touch_overlay.dts b/overlays/apalis-imx8_resistive-touch_overlay.dts
new file mode 100644
index 0000000..b204cb3
--- /dev/null
+++ b/overlays/apalis-imx8_resistive-touch_overlay.dts
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2022 Toradex
+ */
+
+// Resistive touchscreen enablement.
+
+/dts-v1/;
+/plugin/;
+
+/ {
+ compatible = "toradex,apalis-imx8";
+};
+
+&adc1 {
+ /* remove the pinctrl-adc1 to use the touchscreen */
+ pinctrl-0 = <>;
+};
+
+&touchscreen {
+ status = "okay";
+};
diff --git a/overlays/colibri-imx6_lcd-lt161010_overlay.dts b/overlays/colibri-imx6_lcd-lt161010_overlay.dts
index cf805a1..1cb44a5 100644
--- a/overlays/colibri-imx6_lcd-lt161010_overlay.dts
+++ b/overlays/colibri-imx6_lcd-lt161010_overlay.dts
@@ -21,7 +21,7 @@
};
&mxcfb1 {
- mode_str ="800x480M@60";
+ mode_str ="FusionF07A";
status = "okay";
};
diff --git a/overlays/colibri-imx6ull_atmel-mxt-connector_overlay.dts b/overlays/colibri-imx6ull_atmel-mxt-connector_overlay.dts
index 6772e79..4aea144 100644
--- a/overlays/colibri-imx6ull_atmel-mxt-connector_overlay.dts
+++ b/overlays/colibri-imx6ull_atmel-mxt-connector_overlay.dts
@@ -9,11 +9,18 @@
/dts-v1/;
/plugin/;
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+
/ {
compatible = "toradex,colibri-imx6ull-emmc";
};
&atmel_mxt_ts {
+ pinctrl-0 = <&pinctrl_atmel_conn &pinctrl_atmel_snvs_conn>;
+ interrupt-parent = <&gpio5>;
+ interrupts = <4 IRQ_TYPE_EDGE_FALLING>; /* SODIMM_107, INT */
+ reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; /* SODIMM_106, RST */
status = "okay";
};
@@ -24,16 +31,3 @@
&i2c1 {
status = "okay";
};
-
-/* PWM <B> */
-&pwm5 {
- /* Pin already used by atmel_mxt_ts touchscreen */
- status = "disabled";
-};
-
-/* PWM <C> */
-&pwm6 {
- /* Pin already used by atmel_mxt_ts touchscreen */
- status = "disabled";
-};
-
diff --git a/overlays/colibri-imx8x_disable-cm40-uart_overlay.dts b/overlays/colibri-imx8x_disable-cm40-uart_overlay.dts
new file mode 100644
index 0000000..e778c87
--- /dev/null
+++ b/overlays/colibri-imx8x_disable-cm40-uart_overlay.dts
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2021 Toradex
+ */
+
+// Disables, at the Linux side, the UART that is shared with Cortex-M
+
+/dts-v1/;
+/plugin/;
+
+/{
+ compatible = "toradex,colibri-imx8";
+};
+
+&cm40_lpuart {
+ status = "disabled";
+};
+
+&cm40_uart_lpcg {
+ status = "disabled";
+};