summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/imx6q-apalis-eval.dts115
-rw-r--r--arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts94
-rw-r--r--arch/arm/boot/dts/imx6q-apalis-ixora.dts97
3 files changed, 177 insertions, 129 deletions
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index d2cb080993e9..cb72cd78954e 100644
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2017 Toradex AG
+ * Copyright 2014-2019 Toradex AG
* Copyright 2012 Freescale Semiconductor, Inc.
* Copyright 2011 Linaro Ltd.
*
@@ -80,30 +80,6 @@
};
};
- v4l2_cap_0 {
- compatible = "fsl,imx6q-v4l2-capture";
- ipu_id = <0>;
- csi_id = <0>;
- mclk_source = <0>;
- status = "okay";
- };
-
- v4l2_cap_1 { // second parallel camera
- compatible = "fsl,imx6q-v4l2-capture";
- ipu_id = <1>;
- csi_id = <1>;
- mclk_source = <0>;
- status = "okay";
- };
-
- v4l2_cap_2 { // mipi-csi2 camera
- compatible = "fsl,imx6q-v4l2-capture";
- ipu_id = <0>;
- csi_id = <1>;
- mclk_source = <0>;
- status = "okay";
- };
-
lcd_display: display@di0 {
compatible = "fsl,imx-parallel-display";
#address-cells = <1>;
@@ -164,14 +140,30 @@
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
-};
-&mipi_csi {
- ipu_id = <0>;
- csi_id = <1>;
- v_channel = <0>;
- lanes = <2>;
- status = "okay";
+ v4l2_cap_0 {
+ compatible = "fsl,imx6q-v4l2-capture";
+ ipu_id = <0>;
+ csi_id = <0>;
+ mclk_source = <0>;
+ status = "okay";
+ };
+
+ v4l2_cap_1 { // second parallel camera
+ compatible = "fsl,imx6q-v4l2-capture";
+ ipu_id = <1>;
+ csi_id = <1>;
+ mclk_source = <0>;
+ status = "okay";
+ };
+
+ v4l2_cap_2 { // mipi-csi2 camera
+ compatible = "fsl,imx6q-v4l2-capture";
+ ipu_id = <0>;
+ csi_id = <1>;
+ mclk_source = <0>;
+ status = "okay";
+ };
};
&backlight {
@@ -189,6 +181,16 @@
status = "okay";
};
+&can1 {
+ xceiver-supply = <&reg_3v3_sw>;
+ status = "okay";
+};
+
+&can2 {
+ xceiver-supply = <&reg_3v3_sw>;
+ status = "okay";
+};
+
/* Apalis SPI1 */
&ecspi1 {
status = "okay";
@@ -211,16 +213,6 @@
};
};
-&can1 {
- xceiver-supply = <&reg_3v3_sw>;
- status = "okay";
-};
-
-&can2 {
- xceiver-supply = <&reg_3v3_sw>;
- status = "okay";
-};
-
&hdmi_audio {
status = "okay";
};
@@ -255,8 +247,8 @@
/* TouchRevolution Fusion 7 and 10 multi-touch controller */
compatible = "touchrevolution,fusion-f0710a";
reg = <0x10>;
- gpios = <&gpio6 10 0 /* MXM3 11, Pen down interrupt */
- &gpio6 9 0 /* MXM3 13, Reset */
+ gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */
+ &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */
>;
};
@@ -371,6 +363,18 @@
status = "okay";
};
+&ldb {
+ status = "okay";
+};
+
+&mipi_csi {
+ ipu_id = <0>;
+ csi_id = <1>;
+ v_channel = <0>;
+ lanes = <2>;
+ status = "okay";
+};
+
&mxcfb1 {
status = "okay";
};
@@ -387,15 +391,13 @@
status = "okay";
};
-&ldb {
- status = "okay";
-};
-
&pcie {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_reset_moci>;
- reset-gpio = <&gpio1 2 0>;
- reset-ep-gpio = <&gpio1 28 0>;
+ /* active-high meaning opposite of regular PERST# active-low polarity */
+ reset-gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>;
+ reset-gpio-active-high;
+ vpcie-supply = <&reg_pcie_switch>;
status = "okay";
};
@@ -415,11 +417,11 @@
status = "okay";
};
-&reg_usb_otg_vbus {
+&reg_usb_host_vbus {
status = "okay";
};
-&reg_usb_host_vbus {
+&reg_usb_otg_vbus {
status = "okay";
};
@@ -445,6 +447,11 @@
&uart2 {
status = "okay";
+#if 0
+ linux,rs485-enabled-at-boot-time;
+ rs485-rts-active-low;
+ rs485-rx-during-tx;
+#endif
};
&uart4 {
@@ -486,9 +493,7 @@
};
&iomuxc {
- /*
- * Mux the Apalis GPIOs
- */
+ /* Mux the Apalis GPIOs */
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
&pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
index 73f554821ba5..70789ec1768c 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2017 Toradex AG
+ * Copyright 2014-2019 Toradex AG
* Copyright 2012 Freescale Semiconductor, Inc.
* Copyright 2011 Linaro Ltd.
*
@@ -107,21 +107,6 @@
};
};
- panel: panel {
- /*
- * edt,et057090dhu: EDT 5.7" LCD TFT
- * edt,et070080dh6: EDT 7.0" LCD TFT
- */
- compatible = "edt,et057090dhu";
- backlight = <&backlight>;
-
- port {
- lcd_panel_in: endpoint {
- remote-endpoint = <&lcd_display_out>;
- };
- };
- };
-
leds {
compatible = "gpio-leds";
@@ -149,6 +134,30 @@
};
};
+ panel: panel {
+ /*
+ * edt,et057090dhu: EDT 5.7" LCD TFT
+ * edt,et070080dh6: EDT 7.0" LCD TFT
+ */
+ compatible = "edt,et057090dhu";
+ backlight = <&backlight>;
+ power-supply = <&reg_3v3_sw>;
+
+ port {
+ lcd_panel_in: endpoint {
+ remote-endpoint = <&lcd_display_out>;
+ };
+ };
+ };
+
+ reg_3v3_sw: regulator-3v3-sw {
+ compatible = "regulator-fixed";
+ regulator-name = "3.3V_SW";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
v4l2_cap_0 {
compatible = "fsl,imx6q-v4l2-capture";
ipu_id = <0>;
@@ -164,13 +173,6 @@
mclk_source = <0>;
status = "okay";
};
-
-#if 0
- v4l2_out {
- compatible = "fsl,mxc_v4l2_output";
- status = "okay";
- };
-#endif
};
&backlight {
@@ -184,6 +186,17 @@
#endif
brightness-levels = <0 127 191 223 239 247 251 255>;
default-brightness-level = <1>;
+ power-supply = <&reg_3v3_sw>;
+ status = "okay";
+};
+
+&can1 {
+ xceiver-supply = <&reg_3v3_sw>;
+ status = "okay";
+};
+
+&can2 {
+ xceiver-supply = <&reg_3v3_sw>;
status = "okay";
};
@@ -198,12 +211,15 @@
};
};
-&can1 {
+/* Apalis SPI2 */
+&ecspi2 {
status = "okay";
-};
-&can2 {
- status = "okay";
+ spidev1: spidev@2 {
+ compatible = "toradex,evalspi";
+ reg = <0>;
+ spi-max-frequency = <18000000>;
+ };
};
&hdmi_audio {
@@ -343,12 +359,16 @@
};
};
+&ipu1_di1_disp1 {
+ remote-endpoint = <&lcd_display_in>;
+};
+
&lcd {
status = "okay";
};
-&ipu1_di1_disp1 {
- remote-endpoint = <&lcd_display_in>;
+&ldb {
+ status = "okay";
};
&mipi_csi {
@@ -375,10 +395,6 @@
status = "okay";
};
-&ldb {
- status = "okay";
-};
-
&pcie {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_reset_moci>;
@@ -404,11 +420,11 @@
status = "okay";
};
-&reg_usb_otg_vbus {
+&reg_usb_host_vbus {
status = "okay";
};
-&reg_usb_host_vbus {
+&reg_usb_otg_vbus {
status = "okay";
};
@@ -474,10 +490,12 @@
status = "okay";
};
+&vdac {
+ status = "okay";
+};
+
&iomuxc {
- /*
- * Mux the Apalis GPIOs
- */
+ /* Mux the Apalis GPIOs */
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
&pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
index 82865c502dea..a1b2b67127fb 100644
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2017 Toradex AG
+ * Copyright 2014-2019 Toradex AG
* Copyright 2012 Freescale Semiconductor, Inc.
* Copyright 2011 Linaro Ltd.
*
@@ -106,21 +106,6 @@
};
};
- panel: panel {
- /*
- * edt,et057090dhu: EDT 5.7" LCD TFT
- * edt,et070080dh6: EDT 7.0" LCD TFT
- */
- compatible = "edt,et057090dhu";
- backlight = <&backlight>;
-
- port {
- lcd_panel_in: endpoint {
- remote-endpoint = <&lcd_display_out>;
- };
- };
- };
-
leds {
compatible = "gpio-leds";
@@ -148,6 +133,30 @@
};
};
+ panel: panel {
+ /*
+ * edt,et057090dhu: EDT 5.7" LCD TFT
+ * edt,et070080dh6: EDT 7.0" LCD TFT
+ */
+ compatible = "edt,et057090dhu";
+ backlight = <&backlight>;
+ power-supply = <&reg_3v3_sw>;
+
+ port {
+ lcd_panel_in: endpoint {
+ remote-endpoint = <&lcd_display_out>;
+ };
+ };
+ };
+
+ reg_3v3_sw: regulator-3v3-sw {
+ compatible = "regulator-fixed";
+ regulator-name = "3.3V_SW";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
v4l2_cap_0 {
compatible = "fsl,imx6q-v4l2-capture";
ipu_id = <0>;
@@ -155,12 +164,6 @@
mclk_source = <0>;
status = "okay";
};
-#if 0
- v4l2_out {
- compatible = "fsl,mxc_v4l2_output";
- status = "okay";
- };
-#endif
};
&backlight {
@@ -174,6 +177,17 @@
#endif
brightness-levels = <0 127 191 223 239 247 251 255>;
default-brightness-level = <1>;
+ power-supply = <&reg_3v3_sw>;
+ status = "okay";
+};
+
+&can1 {
+ xceiver-supply = <&reg_3v3_sw>;
+ status = "okay";
+};
+
+&can2 {
+ xceiver-supply = <&reg_3v3_sw>;
status = "okay";
};
@@ -188,12 +202,15 @@
};
};
-&can1 {
+/* Apalis SPI2 */
+&ecspi2 {
status = "okay";
-};
-&can2 {
- status = "okay";
+ spidev1: spidev@2 {
+ compatible = "toradex,evalspi";
+ reg = <0>;
+ spi-max-frequency = <18000000>;
+ };
};
&hdmi_audio {
@@ -320,10 +337,18 @@
};
};
+&ipu1_di1_disp1 {
+ remote-endpoint = <&lcd_display_in>;
+};
+
&lcd {
status = "okay";
};
+&ldb {
+ status = "okay";
+};
+
&mxcfb1 {
status = "okay";
};
@@ -340,14 +365,6 @@
status = "okay";
};
-&ipu1_di1_disp1 {
- remote-endpoint = <&lcd_display_in>;
-};
-
-&ldb {
- status = "okay";
-};
-
&pcie {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_reset_moci>;
@@ -373,11 +390,11 @@
status = "okay";
};
-&reg_usb_otg_vbus {
+&reg_usb_host_vbus {
status = "okay";
};
-&reg_usb_host_vbus {
+&reg_usb_otg_vbus {
status = "okay";
};
@@ -414,6 +431,10 @@
&uart4 {
status = "okay";
+ /*
+ * note that uart4 is only working with pinctrl_uart24_forceoff that is
+ * already defined in &uart2
+ */
};
&uart5 {
@@ -438,6 +459,10 @@
status = "okay";
};
+&vdac {
+ status = "okay";
+};
+
&iomuxc {
/* Mux the Apalis GPIOs */
pinctrl-names = "default";