* [PATCH v2 0/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM/Ixora carrier board
@ 2016-01-05 16:39 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-05 16:39 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Lucas Stach, Russell King, Sascha Hauer, Petr Štetiar,
Shawn Guo, Fabio Estevam, Kumar Gala, Ian Campbell, Stefan Agner,
Joshua Clayton, Rob Herring, Pawel Moll, Mark Rutland,
Marcel Ziswiler, devicetree, linux-kernel, Shawn Guo
This patch series adds support for Toradex Apalis iMX6Q/D SoM module [1] and
Ixora carrier board [2].
Petr Štetiar has simply taken content of DTSes from Toradex's Git tree [3],
removed not mainlined stuff and fixed all errors returned by checkpatch script.
Please note that RESET_MOCI# used as mini-PCIe PERST# is not directly
GPIO1_IO28 but rather inverted (e.g. active-high and ored with RESETBMCU coming
off the PMIC but that is not relevant in this context). As changing the
reset-gpio polarity wasn't previously supported Petr Štetiar's
"PCI: imx6: Fix reset-gpio to work with active low GPIO" fix [4] is needed.
1. https://www.toradex.com/computer-on-modules/apalis-arm-family/freescale-imx-6
2. https://www.toradex.com/products/carrier-boards/ixora-carrier-board
3. https://git.toradex.com/cgit/linux-toradex.git/log/?h=toradex_imx_3.14.28_1.0.0_ga
4. https://patchwork.ozlabs.org/patch/552886/
Changes in v2:
- clarify exact Apalis iMX6Q/D SoM type in cover letter
- clarify exact Apalis iMX6Q/D module type and Ixora carrier board in model
node
- got rid of obsolete mmc aliases
- working SGTL5000 audio/sound integration
- working STMPE811 touch screen controller integration
- integrated review feedback from Lucas
- left and even added some more comments as I don't see why putting any
explanatory comments in dts' should be such a bad thing to do
- completely got rid of the memory node as that is something typically filled
in by the boot loader e.g. U-Boot
- without the regulators simple-bus it no longer boots
- even though we supposedly shipped a few hundred V1.0a modules drop DCE UART
support for now and simplify file layout
- replaced obsolete no-1-8-v by mainline supported voltage-ranges = <3300 3300>
usdhc property and yes card detects are indeed active low (;-p)
- integrated review feedback from Stefan
- fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver to be
enabled)
- fixed HDMI DDC (requires GPIO-based bitbanging I2C to be enabled)
- fixed SPDIF
Petr Štetiar (2):
ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
ARM: dts: imx6: Add support for Toradex Ixora carrier board
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/imx6q-apalis-ixora.dts | 256 ++++++++
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1040 ++++++++++++++++++++++++++++++
3 files changed, 1297 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
--
2.5.0
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 0/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM/Ixora carrier board
@ 2016-01-05 16:39 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-05 16:39 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Mark Rutland, devicetree, Joshua Clayton, Russell King,
Pawel Moll, Ian Campbell, Marcel Ziswiler, Shawn Guo,
linux-kernel, Stefan Agner, Rob Herring, Sascha Hauer,
Kumar Gala, Petr Štetiar, Shawn Guo, Fabio Estevam,
Lucas Stach
This patch series adds support for Toradex Apalis iMX6Q/D SoM module [1] and
Ixora carrier board [2].
Petr Štetiar has simply taken content of DTSes from Toradex's Git tree [3],
removed not mainlined stuff and fixed all errors returned by checkpatch script.
Please note that RESET_MOCI# used as mini-PCIe PERST# is not directly
GPIO1_IO28 but rather inverted (e.g. active-high and ored with RESETBMCU coming
off the PMIC but that is not relevant in this context). As changing the
reset-gpio polarity wasn't previously supported Petr Štetiar's
"PCI: imx6: Fix reset-gpio to work with active low GPIO" fix [4] is needed.
1. https://www.toradex.com/computer-on-modules/apalis-arm-family/freescale-imx-6
2. https://www.toradex.com/products/carrier-boards/ixora-carrier-board
3. https://git.toradex.com/cgit/linux-toradex.git/log/?h=toradex_imx_3.14.28_1.0.0_ga
4. https://patchwork.ozlabs.org/patch/552886/
Changes in v2:
- clarify exact Apalis iMX6Q/D SoM type in cover letter
- clarify exact Apalis iMX6Q/D module type and Ixora carrier board in model
node
- got rid of obsolete mmc aliases
- working SGTL5000 audio/sound integration
- working STMPE811 touch screen controller integration
- integrated review feedback from Lucas
- left and even added some more comments as I don't see why putting any
explanatory comments in dts' should be such a bad thing to do
- completely got rid of the memory node as that is something typically filled
in by the boot loader e.g. U-Boot
- without the regulators simple-bus it no longer boots
- even though we supposedly shipped a few hundred V1.0a modules drop DCE UART
support for now and simplify file layout
- replaced obsolete no-1-8-v by mainline supported voltage-ranges = <3300 3300>
usdhc property and yes card detects are indeed active low (;-p)
- integrated review feedback from Stefan
- fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver to be
enabled)
- fixed HDMI DDC (requires GPIO-based bitbanging I2C to be enabled)
- fixed SPDIF
Petr Štetiar (2):
ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
ARM: dts: imx6: Add support for Toradex Ixora carrier board
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/imx6q-apalis-ixora.dts | 256 ++++++++
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1040 ++++++++++++++++++++++++++++++
3 files changed, 1297 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
--
2.5.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 0/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM/Ixora carrier board
@ 2016-01-05 16:39 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-05 16:39 UTC (permalink / raw)
To: linux-arm-kernel
This patch series adds support for Toradex Apalis iMX6Q/D SoM module [1] and
Ixora carrier board [2].
Petr ?tetiar has simply taken content of DTSes from Toradex's Git tree [3],
removed not mainlined stuff and fixed all errors returned by checkpatch script.
Please note that RESET_MOCI# used as mini-PCIe PERST# is not directly
GPIO1_IO28 but rather inverted (e.g. active-high and ored with RESETBMCU coming
off the PMIC but that is not relevant in this context). As changing the
reset-gpio polarity wasn't previously supported Petr ?tetiar's
"PCI: imx6: Fix reset-gpio to work with active low GPIO" fix [4] is needed.
1. https://www.toradex.com/computer-on-modules/apalis-arm-family/freescale-imx-6
2. https://www.toradex.com/products/carrier-boards/ixora-carrier-board
3. https://git.toradex.com/cgit/linux-toradex.git/log/?h=toradex_imx_3.14.28_1.0.0_ga
4. https://patchwork.ozlabs.org/patch/552886/
Changes in v2:
- clarify exact Apalis iMX6Q/D SoM type in cover letter
- clarify exact Apalis iMX6Q/D module type and Ixora carrier board in model
node
- got rid of obsolete mmc aliases
- working SGTL5000 audio/sound integration
- working STMPE811 touch screen controller integration
- integrated review feedback from Lucas
- left and even added some more comments as I don't see why putting any
explanatory comments in dts' should be such a bad thing to do
- completely got rid of the memory node as that is something typically filled
in by the boot loader e.g. U-Boot
- without the regulators simple-bus it no longer boots
- even though we supposedly shipped a few hundred V1.0a modules drop DCE UART
support for now and simplify file layout
- replaced obsolete no-1-8-v by mainline supported voltage-ranges = <3300 3300>
usdhc property and yes card detects are indeed active low (;-p)
- integrated review feedback from Stefan
- fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver to be
enabled)
- fixed HDMI DDC (requires GPIO-based bitbanging I2C to be enabled)
- fixed SPDIF
Petr ?tetiar (2):
ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
ARM: dts: imx6: Add support for Toradex Ixora carrier board
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/imx6q-apalis-ixora.dts | 256 ++++++++
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1040 ++++++++++++++++++++++++++++++
3 files changed, 1297 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
--
2.5.0
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
2016-01-05 16:39 ` Marcel Ziswiler
@ 2016-01-05 16:39 ` Marcel Ziswiler
-1 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-05 16:39 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Lucas Stach, Russell King, Sascha Hauer, Petr Štetiar,
Shawn Guo, Fabio Estevam, Kumar Gala, Ian Campbell, Stefan Agner,
Joshua Clayton, Rob Herring, Pawel Moll, Mark Rutland,
Marcel Ziswiler, devicetree, linux-kernel, Shawn Guo
From: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v2:
- clarify exact Apalis iMX6Q/D SoM type in cover letter
- clarify exact Apalis iMX6Q/D module type and Ixora carrier board in model
node
- got rid of obsolete mmc aliases
- working SGTL5000 audio/sound integration
- working STMPE811 touch screen controller integration
- integrated review feedback from Lucas
- left and even added some more comments as I don't see why putting any
explanatory comments in dts' should be such a bad thing to do
- completely got rid of the memory node as that is something typically filled
in by the boot loader e.g. U-Boot
- without the regulators simple-bus it no longer boots
- even though we supposedly shipped a few hundred V1.0a modules drop DCE UART
support for now and simplify file layout
- replaced obsolete no-1-8-v by mainline supported voltage-ranges = <3300 3300>
usdhc property and yes card detects are indeed active low (;-p)
- integrated review feedback from Stefan
- fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver to be
enabled)
- fixed HDMI DDC (requires GPIO-based bitbanging I2C to be enabled)
- fixed SPDIF
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1040 +++++++++++++++++++++++++++++++++
1 file changed, 1040 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
new file mode 100644
index 0000000..6104e2e
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -0,0 +1,1040 @@
+/*
+ * Copyright 2014-2016 Toradex AG
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "Toradex Apalis iMX6Q/D Module";
+ compatible = "toradex,apalis_imx6q", "fsl,imx6q";
+
+ backlight: backlight {
+ compatible = "pwm-backlight";
+ pwms = <&pwm4 0 5000000>;
+ status = "disabled";
+ };
+
+ /* DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 */
+ i2cddc: i2c@0 {
+ compatible = "i2c-gpio";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c_ddc>;
+ gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
+ &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
+ >;
+ i2c-gpio,delay-us = <2>; /* ~100 kHz */
+ status = "okay";
+ };
+
+ regulators {
+ compatible = "simple-bus";
+
+ reg_1p8v: 1p8v {
+ compatible = "regulator-fixed";
+ regulator-name = "1P8V";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-always-on;
+ };
+
+ reg_2p5v: 2p5v {
+ compatible = "regulator-fixed";
+ regulator-name = "2P5V";
+ regulator-min-microvolt = <2500000>;
+ regulator-max-microvolt = <2500000>;
+ regulator-always-on;
+ };
+
+ reg_3p3v: 3p3v {
+ compatible = "regulator-fixed";
+ regulator-name = "3P3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ reg_usb_otg_vbus: usb_otg_vbus {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_regulator_usbotg_pwr>;
+ regulator-name = "usb_otg_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ status = "disabled";
+ };
+
+ /* on module usb hub */
+ reg_usb_host_vbus_hub: usb_host_vbus_hub {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_regulator_usbhub_pwr>;
+ regulator-name = "usb_host_vbus_hub";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio3 28 GPIO_ACTIVE_HIGH>;
+ startup-delay-us = <2000>;
+ enable-active-high;
+ status = "okay";
+ };
+
+ reg_usb_host_vbus: usb_host_vbus {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_regulator_usbh_pwr>;
+ regulator-name = "usb_host_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ vin-supply = <®_usb_host_vbus_hub>;
+ status = "disabled";
+ };
+ };
+
+ sound {
+ compatible = "fsl,imx-audio-sgtl5000";
+ model = "imx6q-apalis-sgtl5000";
+ ssi-controller = <&ssi1>;
+ audio-codec = <&codec>;
+ audio-routing =
+ "LINE_IN", "Line In Jack",
+ "MIC_IN", "Mic Jack",
+ "Mic Jack", "Mic Bias",
+ "Headphone Jack", "HP_OUT";
+ mux-int-port = <1>;
+ mux-ext-port = <4>;
+ };
+
+ sound_spdif: sound-spdif {
+ compatible = "fsl,imx-audio-spdif";
+ model = "imx-spdif";
+ spdif-controller = <&spdif>;
+ spdif-in;
+ spdif-out;
+ status = "disabled";
+ };
+};
+
+&audmux {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_audmux &pinctrl_audmux_mclk>;
+ status = "okay";
+};
+
+/* Apalis SPI1 */
+&ecspi1 {
+ fsl,spi-num-chipselects = <1>;
+ cs-gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_spi_cs1>;
+ status = "disabled";
+};
+
+/* Apalis SPI2 */
+&ecspi2 {
+ fsl,spi-num-chipselects = <1>;
+ cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ecspi2 &pinctrl_spi_cs2>;
+ status = "disabled";
+};
+
+&fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet &pinctrl_enet_ctrl>;
+ phy-mode = "rgmii";
+ phy-handle = <ðphy>;
+ phy-reset-duration = <10>;
+ phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
+ status = "okay";
+
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ethphy: ethernet-phy@7 {
+ interrupt-parent = <&gpio1>;
+ interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
+ reg = <7>;
+ };
+ };
+};
+
+&can1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan1>;
+ status = "disabled";
+};
+
+&can2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan2>;
+ status = "disabled";
+};
+
+&hdmi {
+ ddc-i2c-bus = <&i2cddc>;
+ status = "okay";
+};
+
+/*
+ * GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier
+ * board)
+ */
+&i2c1 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c1>;
+ status = "disabled";
+};
+
+&i2c2 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
+ status = "okay";
+
+ pmic: pfuze100@08 {
+ compatible = "fsl,pfuze100";
+ reg = <0x08>;
+
+ regulators {
+ sw1a_reg: sw1ab {
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1875000>;
+ regulator-boot-on;
+ regulator-always-on;
+ regulator-ramp-delay = <6250>;
+ };
+
+ sw1c_reg: sw1c {
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1875000>;
+ regulator-boot-on;
+ regulator-always-on;
+ regulator-ramp-delay = <6250>;
+ };
+
+ sw3a_reg: sw3a {
+ regulator-min-microvolt = <400000>;
+ regulator-max-microvolt = <1975000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ swbst_reg: swbst {
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5150000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ snvs_reg: vsnvs {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vref_reg: vrefddr {
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen1_reg: vgen1 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen2_reg: vgen2 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen3_reg: vgen3 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen4_reg: vgen4 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen5_reg: vgen5 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen6_reg: vgen6 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+ };
+ };
+
+ codec: sgtl5000@0a {
+ compatible = "fsl,sgtl5000";
+ reg = <0x0a>;
+ clocks = <&clks 201>;
+ VDDA-supply = <®_2p5v>;
+ VDDIO-supply = <®_3p3v>;
+ };
+
+ /* STMPE811 touch screen controller */
+ stmpe811@41 {
+ compatible = "st,stmpe811";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_touch_int>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x41>;
+ interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-parent = <&gpio4>;
+ interrupt-controller;
+ id = <0>;
+ blocks = <0x5>;
+ irq-trigger = <0x1>;
+ stmpe_touchscreen {
+ compatible = "st,stmpe-ts";
+ reg = <0>;
+ /* 3.25 MHz ADC clock speed */
+ st,adc-freq = <1>;
+ /* 8 sample average control */
+ st,ave-ctrl = <3>;
+ /* 7 length fractional part in z */
+ st,fraction-z = <7>;
+ /*
+ * 50 mA typical 80 mA max touchscreen drivers
+ * current limit value
+ */
+ st,i-drive = <1>;
+ /* 12-bit ADC */
+ st,mod-12b = <1>;
+ /* internal ADC reference */
+ st,ref-sel = <0>;
+ /* ADC converstion time: 80 clocks */
+ st,sample-time = <4>;
+ /* 1 ms panel driver settling time */
+ st,settling = <3>;
+ /* 5 ms touch detect interrupt delay */
+ st,touch-det-delay = <5>;
+ };
+ };
+};
+
+/*
+ * GEN2_I2C, CAM: I2C3_SDA/SCL on MXM3 201/203 (unused)
+ */
+&i2c3 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default", "recovery";
+ pinctrl-0 = <&pinctrl_i2c3>;
+ pinctrl-1 = <&pinctrl_i2c3_recovery>;
+ scl-gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>;
+ sda-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
+ status = "disabled";
+};
+
+/* PAD Ctrl values for common settings */
+/*
+ * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE |
+ * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
+ */
+#define PAD_CTRL_HYS_PU 0x1b0b0
+
+/*
+ * (PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_MED |
+ * PAD_CTL_DSE_40ohm)
+ */
+#define PAD_CTRL_HYS_PD 0x130b0
+
+/*
+ * (PAD_CTL_PUS_22K_UP | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_LOW |
+ * PAD_CTL_DSE_80ohm)
+ */
+#define PAD_CTRL_PU_22k 0x0f058
+
+&iomuxc {
+ ecspi {
+ pinctrl_ecspi1: ecspi1grp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT6__ECSPI1_MISO 0x100b1
+ MX6QDL_PAD_CSI0_DAT5__ECSPI1_MOSI 0x100b1
+ MX6QDL_PAD_CSI0_DAT4__ECSPI1_SCLK 0x100b1
+ >;
+ };
+ pinctrl_ecspi2: ecspi2grp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_OE__ECSPI2_MISO 0x100b1
+ MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI 0x100b1
+ MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK 0x100b1
+ >;
+ };
+ pinctrl_spi_cs1: spi_cs1 {
+ fsl,pins = <
+ /* SPI1 cs */
+ MX6QDL_PAD_CSI0_DAT7__GPIO5_IO25 0x000b1
+ >;
+ };
+ pinctrl_spi_cs2: spi_cs2 {
+ fsl,pins = <
+ /* SPI2 cs */
+ MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x000b1
+ >;
+ };
+ };
+
+ flexcan {
+ pinctrl_flexcan1: flexcan1grp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_7__FLEXCAN1_TX 0x1b0b0
+ MX6QDL_PAD_GPIO_8__FLEXCAN1_RX 0x1b0b0
+ >;
+ };
+ pinctrl_flexcan2: flexcan2grp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b0b0
+ MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0
+ >;
+ };
+ };
+
+ gpio {
+ pinctrl_apalis_gpio1: apalis_gpio1 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_D4__GPIO2_IO04 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio2: apalis_gpio2 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_D5__GPIO2_IO05 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio3: apalis_gpio3 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio4: apalis_gpio4 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_D7__GPIO2_IO07 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio5: apalis_gpio5 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_RB0__GPIO6_IO10 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio6: apalis_gpio6 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09
+ PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio7: apalis_gpio7 {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_2__GPIO1_IO02 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio8: apalis_gpio8 {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_6__GPIO1_IO06 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_gpio_keys: gpio_keys {
+ fsl,pins = <
+ /* Power Button */
+ MX6QDL_PAD_GPIO_4__GPIO1_IO04 PAD_CTRL_HYS_PU
+ >;
+ };
+ };
+
+ hdmi {
+ pinctrl_hdmi_cec: hdmicecgrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+ >;
+ };
+ };
+
+ i2c {
+ pinctrl_i2c_ddc: i2c_ddc {
+ fsl,pins = <
+ /* DDC bitbang */
+ MX6QDL_PAD_EIM_EB2__GPIO2_IO30 PAD_CTRL_HYS_PU
+ MX6QDL_PAD_EIM_D16__GPIO3_IO16 PAD_CTRL_HYS_PU
+ >;
+ };
+ pinctrl_i2c1: i2c1grp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
+ MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
+ >;
+ };
+ pinctrl_i2c3: i2c3grp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
+ MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
+ >;
+ };
+ pinctrl_i2c3_recovery: i2c3-recoverygrp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D17__GPIO3_IO17 0x4001b8b1
+ MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x4001b8b1
+ >;
+ };
+ };
+
+ /* pins used on module */
+ imx6q-apalis {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_reset_moci &pinctrl_emmc_reset>;
+ pinctrl_audmux: audmuxgrp {
+ fsl,pins = <
+ MX6QDL_PAD_DISP0_DAT20__AUD4_TXC 0x130b0
+ MX6QDL_PAD_DISP0_DAT21__AUD4_TXD 0x130b0
+ MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS 0x130b0
+ MX6QDL_PAD_DISP0_DAT23__AUD4_RXD 0x130b0
+ >;
+ };
+ pinctrl_audmux_mclk: audmux_mclk {
+ fsl,pins = <
+ /* SGTL5000 sys_mclk */
+ MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0
+ >;
+ };
+ pinctrl_emmc_reset: emmc_reset {
+ fsl,pins = <
+ /* eMMC reset, leave it alone */
+ MX6QDL_PAD_SD3_RST__GPIO7_IO08 PAD_CTRL_PU_22k
+ >;
+ };
+ pinctrl_enet: enetgrp {
+ fsl,pins = <
+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x100b0
+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x100b0
+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x100b0
+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x100b0
+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x100b0
+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x100b0
+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x100b0
+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x100b0
+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x100b0
+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
+ >;
+ };
+ pinctrl_enet_ctrl: enet_ctrlgrp {
+ fsl,pins = <
+ /* Ethernet PHY reset */
+ MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x000b0
+ /* Ethernet PHY interrupt */
+ MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x000b1
+ >;
+ };
+ pinctrl_i2c2: i2c2grp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
+ >;
+ };
+ pinctrl_ipu2_vdac: ipu2vdacgrp {
+ fsl,pins = <
+ MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK 0xd1
+ MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN15 0xd1
+ MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN02 0xd1
+ MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN03 0xd1
+ MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_DATA00 0xf9
+ MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_DATA01 0xf9
+ MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_DATA02 0xf9
+ MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_DATA03 0xf9
+ MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_DATA04 0xf9
+ MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_DATA05 0xf9
+ MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_DATA06 0xf9
+ MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_DATA07 0xf9
+ MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_DATA08 0xf9
+ MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_DATA09 0xf9
+ MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0_DATA10 0xf9
+ MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0_DATA11 0xf9
+ MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0_DATA12 0xf9
+ MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0_DATA13 0xf9
+ MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0_DATA14 0xf9
+ MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0_DATA15 0xf9
+ >;
+ };
+ pinctrl_regulator_usbhub_pwr: gpio_regulator_usbhub_pwr {
+ fsl,pins = <
+ /* USBH_HUB_EN */
+ MX6QDL_PAD_EIM_D28__GPIO3_IO28 PAD_CTRL_PU_22k
+ >;
+ };
+ pinctrl_reset_moci: gpio_reset_moci {
+ fsl,pins = <
+ /* RESET_MOCI control */
+ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28
+ PAD_CTRL_PU_22k
+ >;
+ };
+ pinctrl_touch_int: touch_intgrp {
+ fsl,pins = <
+ /* STMPE811 interrupt */
+ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 PAD_CTRL_HYS_PU
+ >;
+ };
+ pinctrl_usdhc3: usdhc3grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
+ >;
+ };
+ pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /* 100Mhz */
+ fsl,pins = <
+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170B9
+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100B9
+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170B9
+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170B9
+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170B9
+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170B9
+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170B9
+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170B9
+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170B9
+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170B9
+ >;
+ };
+ pinctrl_usdhc3_200mhz: usdhc3grp-200mhz { /* 200Mhz */
+ fsl,pins = <
+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170F9
+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100F9
+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170F9
+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170F9
+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170F9
+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170F9
+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170F9
+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170F9
+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170F9
+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170F9
+ >;
+ };
+ };
+
+ ipu1 {
+ pinctrl_ipu1_lcdif: ipu1lcdifgrp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_A16__IPU1_DI1_DISP_CLK 0x61
+ /* DE */
+ MX6QDL_PAD_EIM_DA10__IPU1_DI1_PIN15 0x61
+ /* HSync */
+ MX6QDL_PAD_EIM_DA11__IPU1_DI1_PIN02 0x61
+ /* VSync */
+ MX6QDL_PAD_EIM_DA12__IPU1_DI1_PIN03 0x61
+ MX6QDL_PAD_EIM_DA9__IPU1_DISP1_DATA00 0x61
+ MX6QDL_PAD_EIM_DA8__IPU1_DISP1_DATA01 0x61
+ MX6QDL_PAD_EIM_DA7__IPU1_DISP1_DATA02 0x61
+ MX6QDL_PAD_EIM_DA6__IPU1_DISP1_DATA03 0x61
+ MX6QDL_PAD_EIM_DA5__IPU1_DISP1_DATA04 0x61
+ MX6QDL_PAD_EIM_DA4__IPU1_DISP1_DATA05 0x61
+ MX6QDL_PAD_EIM_DA3__IPU1_DISP1_DATA06 0x61
+ MX6QDL_PAD_EIM_DA2__IPU1_DISP1_DATA07 0x61
+ MX6QDL_PAD_EIM_DA1__IPU1_DISP1_DATA08 0x61
+ MX6QDL_PAD_EIM_DA0__IPU1_DISP1_DATA09 0x61
+ MX6QDL_PAD_EIM_EB1__IPU1_DISP1_DATA10 0x61
+ MX6QDL_PAD_EIM_EB0__IPU1_DISP1_DATA11 0x61
+ MX6QDL_PAD_EIM_A17__IPU1_DISP1_DATA12 0x61
+ MX6QDL_PAD_EIM_A18__IPU1_DISP1_DATA13 0x61
+ MX6QDL_PAD_EIM_A19__IPU1_DISP1_DATA14 0x61
+ MX6QDL_PAD_EIM_A20__IPU1_DISP1_DATA15 0x61
+ MX6QDL_PAD_EIM_A21__IPU1_DISP1_DATA16 0x61
+ MX6QDL_PAD_EIM_A22__IPU1_DISP1_DATA17 0x61
+ MX6QDL_PAD_EIM_A23__IPU1_DISP1_DATA18 0x61
+ MX6QDL_PAD_EIM_A24__IPU1_DISP1_DATA19 0x61
+ MX6QDL_PAD_EIM_D31__IPU1_DISP1_DATA20 0x61
+ MX6QDL_PAD_EIM_D30__IPU1_DISP1_DATA21 0x61
+ MX6QDL_PAD_EIM_D26__IPU1_DISP1_DATA22 0x61
+ MX6QDL_PAD_EIM_D27__IPU1_DISP1_DATA23 0x61
+ >;
+ };
+ pinctrl_cam_mclk: cam_mclk {
+ fsl,pins = <
+ /* CAM sys_mclk */
+ MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x00b0
+ >;
+ };
+ pinctrl_ipu1_csi0: ipu1csi0grp { /* parallel camera */
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12 0xb0b1
+ MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13 0xb0b1
+ MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14 0xb0b1
+ MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15 0xb0b1
+ MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16 0xb0b1
+ MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17 0xb0b1
+ MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18 0xb0b1
+ MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19 0xb0b1
+ MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0xb0b1
+ MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC 0xb0b1
+ MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC 0xb0b1
+ >;
+ };
+ };
+
+ pwm {
+ pinctrl_pwm1: pwm1grp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_9__PWM1_OUT 0x1b0b1
+ >;
+ };
+ pinctrl_pwm2: pwm2grp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_1__PWM2_OUT 0x1b0b1
+ >;
+ };
+ pinctrl_pwm3: pwm3grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
+ >;
+ };
+ pinctrl_pwm4: pwm4grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1
+ >;
+ };
+ };
+
+ spdif {
+ pinctrl_spdif: spdifgrp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_16__SPDIF_IN 0x1b0b0
+ MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0
+ >;
+ };
+ };
+
+ uart1 {
+ pinctrl_uart1_dce: uart1-dcegrp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
+ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
+ >;
+ };
+
+ /* DTE mode */
+ pinctrl_uart1_dte: uart1-dtegrp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT10__UART1_RX_DATA 0x1b0b1
+ MX6QDL_PAD_CSI0_DAT11__UART1_TX_DATA 0x1b0b1
+ MX6QDL_PAD_EIM_D19__UART1_RTS_B 0x1b0b1
+ MX6QDL_PAD_EIM_D20__UART1_CTS_B 0x1b0b1
+ >;
+ };
+
+ /* Additional DTR, DSR, DCD */
+ pinctrl_uart1_ctrl: uart1-ctrlgrp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D23__UART1_DCD_B 0x1b0b0
+ MX6QDL_PAD_EIM_D24__UART1_DTR_B 0x1b0b0
+ MX6QDL_PAD_EIM_D25__UART1_DSR_B 0x1b0b0
+ >;
+ };
+ };
+
+ uart2 {
+ pinctrl_uart2_dce: uart2-dcegrp {
+ fsl,pins = <
+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
+ >;
+ };
+
+ /* DTE mode */
+ pinctrl_uart2_dte: uart2grp-dte {
+ fsl,pins = <
+ MX6QDL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1
+ MX6QDL_PAD_SD4_DAT7__UART2_RX_DATA 0x1b0b1
+ MX6QDL_PAD_SD4_DAT6__UART2_RTS_B 0x1b0b1
+ MX6QDL_PAD_SD4_DAT5__UART2_CTS_B 0x1b0b1
+ >;
+ };
+ };
+
+ uart4 {
+ pinctrl_uart4_dce: uart4-dcegrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
+ MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
+ >;
+ };
+
+ /* DTE mode */
+ pinctrl_uart4_dte: uart4-dtegrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL0__UART4_RX_DATA 0x1b0b1
+ MX6QDL_PAD_KEY_ROW0__UART4_TX_DATA 0x1b0b1
+ >;
+ };
+ };
+
+ uart5 {
+ pinctrl_uart5_dce: uart5-dcegrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
+ MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
+ >;
+ };
+
+ /* DTE mode */
+ pinctrl_uart5_dte: uart5-dtegrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL1__UART5_RX_DATA 0x1b0b1
+ MX6QDL_PAD_KEY_ROW1__UART5_TX_DATA 0x1b0b1
+ >;
+ };
+ };
+
+ usbh {
+ pinctrl_regulator_usbh_pwr: gpio_regulator_usbh_pwr {
+ fsl,pins = <
+ /* USBH_EN */
+ MX6QDL_PAD_GPIO_0__GPIO1_IO00 PAD_CTRL_PU_22k
+ >;
+ };
+ };
+
+ usbotg {
+ pinctrl_usbotg: usbotggrp {
+ fsl,pins = <
+ MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
+ >;
+ };
+ pinctrl_regulator_usbotg_pwr: gpio_regulator_usbotg_pwr {
+ fsl,pins = <
+ /* USBO power en */
+ MX6QDL_PAD_EIM_D22__GPIO3_IO22 PAD_CTRL_PU_22k
+ >;
+ };
+ };
+
+ usdhc {
+ pinctrl_mmc_cd: gpio_mmc_cd {
+ fsl,pins = <
+ /* MMC1 CD */
+ MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x000b0
+ >;
+ };
+ pinctrl_sd_cd: gpio_sd_cd {
+ fsl,pins = <
+ /* SD1 CD */
+ MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x000b0
+ >;
+ };
+ pinctrl_usdhc1: usdhc1grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071
+ MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10071
+ MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17071
+ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17071
+ MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17071
+ MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17071
+ MX6QDL_PAD_NANDF_D0__SD1_DATA4 0x17071
+ MX6QDL_PAD_NANDF_D1__SD1_DATA5 0x17071
+ MX6QDL_PAD_NANDF_D2__SD1_DATA6 0x17071
+ MX6QDL_PAD_NANDF_D3__SD1_DATA7 0x17071
+ >;
+ };
+ pinctrl_usdhc2: usdhc2grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17071
+ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10071
+ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17071
+ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17071
+ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17071
+ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17071
+ >;
+ };
+ };
+};
+
+&ldb {
+ status = "okay";
+};
+
+&pwm1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm1>;
+ status = "disabled";
+};
+
+&pwm2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm2>;
+ status = "disabled";
+};
+
+&pwm3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm3>;
+ status = "disabled";
+};
+
+&pwm4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm4>;
+ status = "disabled";
+};
+
+&spdif {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_spdif>;
+ status = "disabled";
+};
+
+&ssi1 {
+ fsl,mode = "i2s-slave";
+ status = "okay";
+};
+
+&uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart1_dte &pinctrl_uart1_ctrl>;
+ fsl,dte-mode;
+ fsl,uart-has-rtscts;
+ status = "disabled";
+};
+
+&uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart2_dte>;
+ fsl,dte-mode;
+ fsl,uart-has-rtscts;
+ status = "disabled";
+};
+
+&uart4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart4_dte>;
+ fsl,dte-mode;
+ status = "disabled";
+};
+
+&uart5 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart5_dte>;
+ fsl,dte-mode;
+ status = "disabled";
+};
+
+&usbh1 {
+ vbus-supply = <®_usb_host_vbus>;
+ status = "disabled";
+};
+
+&usbotg {
+ vbus-supply = <®_usb_otg_vbus>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbotg>;
+ disable-over-current;
+ status = "disabled";
+};
+
+/* MMC1 */
+&usdhc1 {
+ label = "MMC1";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
+ cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
+ vmmc-supply = <®_3p3v>;
+ bus-width = <8>;
+ voltage-ranges = <3300 3300>;
+ status = "disabled";
+};
+
+/* SD1 */
+&usdhc2 {
+ label = "SD1";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>;
+ cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
+ vmmc-supply = <®_3p3v>;
+ bus-width = <4>;
+ voltage-ranges = <3300 3300>;
+ status = "disabled";
+};
+
+/* eMMC */
+&usdhc3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc3>;
+ vmmc-supply = <®_3p3v>;
+ bus-width = <8>;
+ voltage-ranges = <3300 3300>;
+ non-removable;
+ status = "okay";
+};
+
+&weim {
+ status = "disabled"; /* weim signals not accessible on i.MX6 */
+};
--
2.5.0
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-05 16:39 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-05 16:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Petr ?tetiar <ynezz@true.cz>
Signed-off-by: Petr ?tetiar <ynezz@true.cz>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v2:
- clarify exact Apalis iMX6Q/D SoM type in cover letter
- clarify exact Apalis iMX6Q/D module type and Ixora carrier board in model
node
- got rid of obsolete mmc aliases
- working SGTL5000 audio/sound integration
- working STMPE811 touch screen controller integration
- integrated review feedback from Lucas
- left and even added some more comments as I don't see why putting any
explanatory comments in dts' should be such a bad thing to do
- completely got rid of the memory node as that is something typically filled
in by the boot loader e.g. U-Boot
- without the regulators simple-bus it no longer boots
- even though we supposedly shipped a few hundred V1.0a modules drop DCE UART
support for now and simplify file layout
- replaced obsolete no-1-8-v by mainline supported voltage-ranges = <3300 3300>
usdhc property and yes card detects are indeed active low (;-p)
- integrated review feedback from Stefan
- fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver to be
enabled)
- fixed HDMI DDC (requires GPIO-based bitbanging I2C to be enabled)
- fixed SPDIF
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1040 +++++++++++++++++++++++++++++++++
1 file changed, 1040 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
new file mode 100644
index 0000000..6104e2e
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -0,0 +1,1040 @@
+/*
+ * Copyright 2014-2016 Toradex AG
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "Toradex Apalis iMX6Q/D Module";
+ compatible = "toradex,apalis_imx6q", "fsl,imx6q";
+
+ backlight: backlight {
+ compatible = "pwm-backlight";
+ pwms = <&pwm4 0 5000000>;
+ status = "disabled";
+ };
+
+ /* DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 */
+ i2cddc: i2c at 0 {
+ compatible = "i2c-gpio";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c_ddc>;
+ gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
+ &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
+ >;
+ i2c-gpio,delay-us = <2>; /* ~100 kHz */
+ status = "okay";
+ };
+
+ regulators {
+ compatible = "simple-bus";
+
+ reg_1p8v: 1p8v {
+ compatible = "regulator-fixed";
+ regulator-name = "1P8V";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-always-on;
+ };
+
+ reg_2p5v: 2p5v {
+ compatible = "regulator-fixed";
+ regulator-name = "2P5V";
+ regulator-min-microvolt = <2500000>;
+ regulator-max-microvolt = <2500000>;
+ regulator-always-on;
+ };
+
+ reg_3p3v: 3p3v {
+ compatible = "regulator-fixed";
+ regulator-name = "3P3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ reg_usb_otg_vbus: usb_otg_vbus {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_regulator_usbotg_pwr>;
+ regulator-name = "usb_otg_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ status = "disabled";
+ };
+
+ /* on module usb hub */
+ reg_usb_host_vbus_hub: usb_host_vbus_hub {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_regulator_usbhub_pwr>;
+ regulator-name = "usb_host_vbus_hub";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio3 28 GPIO_ACTIVE_HIGH>;
+ startup-delay-us = <2000>;
+ enable-active-high;
+ status = "okay";
+ };
+
+ reg_usb_host_vbus: usb_host_vbus {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_regulator_usbh_pwr>;
+ regulator-name = "usb_host_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ vin-supply = <®_usb_host_vbus_hub>;
+ status = "disabled";
+ };
+ };
+
+ sound {
+ compatible = "fsl,imx-audio-sgtl5000";
+ model = "imx6q-apalis-sgtl5000";
+ ssi-controller = <&ssi1>;
+ audio-codec = <&codec>;
+ audio-routing =
+ "LINE_IN", "Line In Jack",
+ "MIC_IN", "Mic Jack",
+ "Mic Jack", "Mic Bias",
+ "Headphone Jack", "HP_OUT";
+ mux-int-port = <1>;
+ mux-ext-port = <4>;
+ };
+
+ sound_spdif: sound-spdif {
+ compatible = "fsl,imx-audio-spdif";
+ model = "imx-spdif";
+ spdif-controller = <&spdif>;
+ spdif-in;
+ spdif-out;
+ status = "disabled";
+ };
+};
+
+&audmux {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_audmux &pinctrl_audmux_mclk>;
+ status = "okay";
+};
+
+/* Apalis SPI1 */
+&ecspi1 {
+ fsl,spi-num-chipselects = <1>;
+ cs-gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_spi_cs1>;
+ status = "disabled";
+};
+
+/* Apalis SPI2 */
+&ecspi2 {
+ fsl,spi-num-chipselects = <1>;
+ cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_ecspi2 &pinctrl_spi_cs2>;
+ status = "disabled";
+};
+
+&fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet &pinctrl_enet_ctrl>;
+ phy-mode = "rgmii";
+ phy-handle = <ðphy>;
+ phy-reset-duration = <10>;
+ phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
+ status = "okay";
+
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ethphy: ethernet-phy at 7 {
+ interrupt-parent = <&gpio1>;
+ interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
+ reg = <7>;
+ };
+ };
+};
+
+&can1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan1>;
+ status = "disabled";
+};
+
+&can2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan2>;
+ status = "disabled";
+};
+
+&hdmi {
+ ddc-i2c-bus = <&i2cddc>;
+ status = "okay";
+};
+
+/*
+ * GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier
+ * board)
+ */
+&i2c1 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c1>;
+ status = "disabled";
+};
+
+&i2c2 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c2>;
+ status = "okay";
+
+ pmic: pfuze100 at 08 {
+ compatible = "fsl,pfuze100";
+ reg = <0x08>;
+
+ regulators {
+ sw1a_reg: sw1ab {
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1875000>;
+ regulator-boot-on;
+ regulator-always-on;
+ regulator-ramp-delay = <6250>;
+ };
+
+ sw1c_reg: sw1c {
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1875000>;
+ regulator-boot-on;
+ regulator-always-on;
+ regulator-ramp-delay = <6250>;
+ };
+
+ sw3a_reg: sw3a {
+ regulator-min-microvolt = <400000>;
+ regulator-max-microvolt = <1975000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ swbst_reg: swbst {
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5150000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ snvs_reg: vsnvs {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vref_reg: vrefddr {
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen1_reg: vgen1 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen2_reg: vgen2 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen3_reg: vgen3 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen4_reg: vgen4 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen5_reg: vgen5 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen6_reg: vgen6 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+ };
+ };
+
+ codec: sgtl5000 at 0a {
+ compatible = "fsl,sgtl5000";
+ reg = <0x0a>;
+ clocks = <&clks 201>;
+ VDDA-supply = <®_2p5v>;
+ VDDIO-supply = <®_3p3v>;
+ };
+
+ /* STMPE811 touch screen controller */
+ stmpe811 at 41 {
+ compatible = "st,stmpe811";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_touch_int>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x41>;
+ interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-parent = <&gpio4>;
+ interrupt-controller;
+ id = <0>;
+ blocks = <0x5>;
+ irq-trigger = <0x1>;
+ stmpe_touchscreen {
+ compatible = "st,stmpe-ts";
+ reg = <0>;
+ /* 3.25 MHz ADC clock speed */
+ st,adc-freq = <1>;
+ /* 8 sample average control */
+ st,ave-ctrl = <3>;
+ /* 7 length fractional part in z */
+ st,fraction-z = <7>;
+ /*
+ * 50 mA typical 80 mA max touchscreen drivers
+ * current limit value
+ */
+ st,i-drive = <1>;
+ /* 12-bit ADC */
+ st,mod-12b = <1>;
+ /* internal ADC reference */
+ st,ref-sel = <0>;
+ /* ADC converstion time: 80 clocks */
+ st,sample-time = <4>;
+ /* 1 ms panel driver settling time */
+ st,settling = <3>;
+ /* 5 ms touch detect interrupt delay */
+ st,touch-det-delay = <5>;
+ };
+ };
+};
+
+/*
+ * GEN2_I2C, CAM: I2C3_SDA/SCL on MXM3 201/203 (unused)
+ */
+&i2c3 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default", "recovery";
+ pinctrl-0 = <&pinctrl_i2c3>;
+ pinctrl-1 = <&pinctrl_i2c3_recovery>;
+ scl-gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>;
+ sda-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
+ status = "disabled";
+};
+
+/* PAD Ctrl values for common settings */
+/*
+ * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE |
+ * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
+ */
+#define PAD_CTRL_HYS_PU 0x1b0b0
+
+/*
+ * (PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_MED |
+ * PAD_CTL_DSE_40ohm)
+ */
+#define PAD_CTRL_HYS_PD 0x130b0
+
+/*
+ * (PAD_CTL_PUS_22K_UP | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_LOW |
+ * PAD_CTL_DSE_80ohm)
+ */
+#define PAD_CTRL_PU_22k 0x0f058
+
+&iomuxc {
+ ecspi {
+ pinctrl_ecspi1: ecspi1grp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT6__ECSPI1_MISO 0x100b1
+ MX6QDL_PAD_CSI0_DAT5__ECSPI1_MOSI 0x100b1
+ MX6QDL_PAD_CSI0_DAT4__ECSPI1_SCLK 0x100b1
+ >;
+ };
+ pinctrl_ecspi2: ecspi2grp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_OE__ECSPI2_MISO 0x100b1
+ MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI 0x100b1
+ MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK 0x100b1
+ >;
+ };
+ pinctrl_spi_cs1: spi_cs1 {
+ fsl,pins = <
+ /* SPI1 cs */
+ MX6QDL_PAD_CSI0_DAT7__GPIO5_IO25 0x000b1
+ >;
+ };
+ pinctrl_spi_cs2: spi_cs2 {
+ fsl,pins = <
+ /* SPI2 cs */
+ MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x000b1
+ >;
+ };
+ };
+
+ flexcan {
+ pinctrl_flexcan1: flexcan1grp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_7__FLEXCAN1_TX 0x1b0b0
+ MX6QDL_PAD_GPIO_8__FLEXCAN1_RX 0x1b0b0
+ >;
+ };
+ pinctrl_flexcan2: flexcan2grp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b0b0
+ MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0
+ >;
+ };
+ };
+
+ gpio {
+ pinctrl_apalis_gpio1: apalis_gpio1 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_D4__GPIO2_IO04 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio2: apalis_gpio2 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_D5__GPIO2_IO05 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio3: apalis_gpio3 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_D6__GPIO2_IO06 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio4: apalis_gpio4 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_D7__GPIO2_IO07 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio5: apalis_gpio5 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_RB0__GPIO6_IO10 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio6: apalis_gpio6 {
+ fsl,pins = <
+ MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09
+ PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio7: apalis_gpio7 {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_2__GPIO1_IO02 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_apalis_gpio8: apalis_gpio8 {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_6__GPIO1_IO06 PAD_CTRL_HYS_PD
+ >;
+ };
+ pinctrl_gpio_keys: gpio_keys {
+ fsl,pins = <
+ /* Power Button */
+ MX6QDL_PAD_GPIO_4__GPIO1_IO04 PAD_CTRL_HYS_PU
+ >;
+ };
+ };
+
+ hdmi {
+ pinctrl_hdmi_cec: hdmicecgrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+ >;
+ };
+ };
+
+ i2c {
+ pinctrl_i2c_ddc: i2c_ddc {
+ fsl,pins = <
+ /* DDC bitbang */
+ MX6QDL_PAD_EIM_EB2__GPIO2_IO30 PAD_CTRL_HYS_PU
+ MX6QDL_PAD_EIM_D16__GPIO3_IO16 PAD_CTRL_HYS_PU
+ >;
+ };
+ pinctrl_i2c1: i2c1grp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
+ MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
+ >;
+ };
+ pinctrl_i2c3: i2c3grp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
+ MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
+ >;
+ };
+ pinctrl_i2c3_recovery: i2c3-recoverygrp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D17__GPIO3_IO17 0x4001b8b1
+ MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x4001b8b1
+ >;
+ };
+ };
+
+ /* pins used on module */
+ imx6q-apalis {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_reset_moci &pinctrl_emmc_reset>;
+ pinctrl_audmux: audmuxgrp {
+ fsl,pins = <
+ MX6QDL_PAD_DISP0_DAT20__AUD4_TXC 0x130b0
+ MX6QDL_PAD_DISP0_DAT21__AUD4_TXD 0x130b0
+ MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS 0x130b0
+ MX6QDL_PAD_DISP0_DAT23__AUD4_RXD 0x130b0
+ >;
+ };
+ pinctrl_audmux_mclk: audmux_mclk {
+ fsl,pins = <
+ /* SGTL5000 sys_mclk */
+ MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0
+ >;
+ };
+ pinctrl_emmc_reset: emmc_reset {
+ fsl,pins = <
+ /* eMMC reset, leave it alone */
+ MX6QDL_PAD_SD3_RST__GPIO7_IO08 PAD_CTRL_PU_22k
+ >;
+ };
+ pinctrl_enet: enetgrp {
+ fsl,pins = <
+ MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x100b0
+ MX6QDL_PAD_ENET_MDC__ENET_MDC 0x100b0
+ MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x100b0
+ MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x100b0
+ MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x100b0
+ MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x100b0
+ MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x100b0
+ MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x100b0
+ MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x100b0
+ MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
+ MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
+ MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
+ MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
+ MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
+ MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
+ >;
+ };
+ pinctrl_enet_ctrl: enet_ctrlgrp {
+ fsl,pins = <
+ /* Ethernet PHY reset */
+ MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x000b0
+ /* Ethernet PHY interrupt */
+ MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x000b1
+ >;
+ };
+ pinctrl_i2c2: i2c2grp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
+ MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
+ >;
+ };
+ pinctrl_ipu2_vdac: ipu2vdacgrp {
+ fsl,pins = <
+ MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK 0xd1
+ MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN15 0xd1
+ MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN02 0xd1
+ MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN03 0xd1
+ MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_DATA00 0xf9
+ MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_DATA01 0xf9
+ MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_DATA02 0xf9
+ MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_DATA03 0xf9
+ MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_DATA04 0xf9
+ MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_DATA05 0xf9
+ MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_DATA06 0xf9
+ MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_DATA07 0xf9
+ MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_DATA08 0xf9
+ MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_DATA09 0xf9
+ MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0_DATA10 0xf9
+ MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0_DATA11 0xf9
+ MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0_DATA12 0xf9
+ MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0_DATA13 0xf9
+ MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0_DATA14 0xf9
+ MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0_DATA15 0xf9
+ >;
+ };
+ pinctrl_regulator_usbhub_pwr: gpio_regulator_usbhub_pwr {
+ fsl,pins = <
+ /* USBH_HUB_EN */
+ MX6QDL_PAD_EIM_D28__GPIO3_IO28 PAD_CTRL_PU_22k
+ >;
+ };
+ pinctrl_reset_moci: gpio_reset_moci {
+ fsl,pins = <
+ /* RESET_MOCI control */
+ MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28
+ PAD_CTRL_PU_22k
+ >;
+ };
+ pinctrl_touch_int: touch_intgrp {
+ fsl,pins = <
+ /* STMPE811 interrupt */
+ MX6QDL_PAD_KEY_COL2__GPIO4_IO10 PAD_CTRL_HYS_PU
+ >;
+ };
+ pinctrl_usdhc3: usdhc3grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
+ >;
+ };
+ pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /* 100Mhz */
+ fsl,pins = <
+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170B9
+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100B9
+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170B9
+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170B9
+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170B9
+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170B9
+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170B9
+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170B9
+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170B9
+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170B9
+ >;
+ };
+ pinctrl_usdhc3_200mhz: usdhc3grp-200mhz { /* 200Mhz */
+ fsl,pins = <
+ MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170F9
+ MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100F9
+ MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170F9
+ MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170F9
+ MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170F9
+ MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170F9
+ MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170F9
+ MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170F9
+ MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170F9
+ MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170F9
+ >;
+ };
+ };
+
+ ipu1 {
+ pinctrl_ipu1_lcdif: ipu1lcdifgrp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_A16__IPU1_DI1_DISP_CLK 0x61
+ /* DE */
+ MX6QDL_PAD_EIM_DA10__IPU1_DI1_PIN15 0x61
+ /* HSync */
+ MX6QDL_PAD_EIM_DA11__IPU1_DI1_PIN02 0x61
+ /* VSync */
+ MX6QDL_PAD_EIM_DA12__IPU1_DI1_PIN03 0x61
+ MX6QDL_PAD_EIM_DA9__IPU1_DISP1_DATA00 0x61
+ MX6QDL_PAD_EIM_DA8__IPU1_DISP1_DATA01 0x61
+ MX6QDL_PAD_EIM_DA7__IPU1_DISP1_DATA02 0x61
+ MX6QDL_PAD_EIM_DA6__IPU1_DISP1_DATA03 0x61
+ MX6QDL_PAD_EIM_DA5__IPU1_DISP1_DATA04 0x61
+ MX6QDL_PAD_EIM_DA4__IPU1_DISP1_DATA05 0x61
+ MX6QDL_PAD_EIM_DA3__IPU1_DISP1_DATA06 0x61
+ MX6QDL_PAD_EIM_DA2__IPU1_DISP1_DATA07 0x61
+ MX6QDL_PAD_EIM_DA1__IPU1_DISP1_DATA08 0x61
+ MX6QDL_PAD_EIM_DA0__IPU1_DISP1_DATA09 0x61
+ MX6QDL_PAD_EIM_EB1__IPU1_DISP1_DATA10 0x61
+ MX6QDL_PAD_EIM_EB0__IPU1_DISP1_DATA11 0x61
+ MX6QDL_PAD_EIM_A17__IPU1_DISP1_DATA12 0x61
+ MX6QDL_PAD_EIM_A18__IPU1_DISP1_DATA13 0x61
+ MX6QDL_PAD_EIM_A19__IPU1_DISP1_DATA14 0x61
+ MX6QDL_PAD_EIM_A20__IPU1_DISP1_DATA15 0x61
+ MX6QDL_PAD_EIM_A21__IPU1_DISP1_DATA16 0x61
+ MX6QDL_PAD_EIM_A22__IPU1_DISP1_DATA17 0x61
+ MX6QDL_PAD_EIM_A23__IPU1_DISP1_DATA18 0x61
+ MX6QDL_PAD_EIM_A24__IPU1_DISP1_DATA19 0x61
+ MX6QDL_PAD_EIM_D31__IPU1_DISP1_DATA20 0x61
+ MX6QDL_PAD_EIM_D30__IPU1_DISP1_DATA21 0x61
+ MX6QDL_PAD_EIM_D26__IPU1_DISP1_DATA22 0x61
+ MX6QDL_PAD_EIM_D27__IPU1_DISP1_DATA23 0x61
+ >;
+ };
+ pinctrl_cam_mclk: cam_mclk {
+ fsl,pins = <
+ /* CAM sys_mclk */
+ MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x00b0
+ >;
+ };
+ pinctrl_ipu1_csi0: ipu1csi0grp { /* parallel camera */
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12 0xb0b1
+ MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13 0xb0b1
+ MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14 0xb0b1
+ MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15 0xb0b1
+ MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16 0xb0b1
+ MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17 0xb0b1
+ MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18 0xb0b1
+ MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19 0xb0b1
+ MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0xb0b1
+ MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC 0xb0b1
+ MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC 0xb0b1
+ >;
+ };
+ };
+
+ pwm {
+ pinctrl_pwm1: pwm1grp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_9__PWM1_OUT 0x1b0b1
+ >;
+ };
+ pinctrl_pwm2: pwm2grp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_1__PWM2_OUT 0x1b0b1
+ >;
+ };
+ pinctrl_pwm3: pwm3grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
+ >;
+ };
+ pinctrl_pwm4: pwm4grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1
+ >;
+ };
+ };
+
+ spdif {
+ pinctrl_spdif: spdifgrp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_16__SPDIF_IN 0x1b0b0
+ MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0
+ >;
+ };
+ };
+
+ uart1 {
+ pinctrl_uart1_dce: uart1-dcegrp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
+ MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
+ >;
+ };
+
+ /* DTE mode */
+ pinctrl_uart1_dte: uart1-dtegrp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT10__UART1_RX_DATA 0x1b0b1
+ MX6QDL_PAD_CSI0_DAT11__UART1_TX_DATA 0x1b0b1
+ MX6QDL_PAD_EIM_D19__UART1_RTS_B 0x1b0b1
+ MX6QDL_PAD_EIM_D20__UART1_CTS_B 0x1b0b1
+ >;
+ };
+
+ /* Additional DTR, DSR, DCD */
+ pinctrl_uart1_ctrl: uart1-ctrlgrp {
+ fsl,pins = <
+ MX6QDL_PAD_EIM_D23__UART1_DCD_B 0x1b0b0
+ MX6QDL_PAD_EIM_D24__UART1_DTR_B 0x1b0b0
+ MX6QDL_PAD_EIM_D25__UART1_DSR_B 0x1b0b0
+ >;
+ };
+ };
+
+ uart2 {
+ pinctrl_uart2_dce: uart2-dcegrp {
+ fsl,pins = <
+ MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
+ MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
+ >;
+ };
+
+ /* DTE mode */
+ pinctrl_uart2_dte: uart2grp-dte {
+ fsl,pins = <
+ MX6QDL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1
+ MX6QDL_PAD_SD4_DAT7__UART2_RX_DATA 0x1b0b1
+ MX6QDL_PAD_SD4_DAT6__UART2_RTS_B 0x1b0b1
+ MX6QDL_PAD_SD4_DAT5__UART2_CTS_B 0x1b0b1
+ >;
+ };
+ };
+
+ uart4 {
+ pinctrl_uart4_dce: uart4-dcegrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
+ MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
+ >;
+ };
+
+ /* DTE mode */
+ pinctrl_uart4_dte: uart4-dtegrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL0__UART4_RX_DATA 0x1b0b1
+ MX6QDL_PAD_KEY_ROW0__UART4_TX_DATA 0x1b0b1
+ >;
+ };
+ };
+
+ uart5 {
+ pinctrl_uart5_dce: uart5-dcegrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
+ MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
+ >;
+ };
+
+ /* DTE mode */
+ pinctrl_uart5_dte: uart5-dtegrp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_COL1__UART5_RX_DATA 0x1b0b1
+ MX6QDL_PAD_KEY_ROW1__UART5_TX_DATA 0x1b0b1
+ >;
+ };
+ };
+
+ usbh {
+ pinctrl_regulator_usbh_pwr: gpio_regulator_usbh_pwr {
+ fsl,pins = <
+ /* USBH_EN */
+ MX6QDL_PAD_GPIO_0__GPIO1_IO00 PAD_CTRL_PU_22k
+ >;
+ };
+ };
+
+ usbotg {
+ pinctrl_usbotg: usbotggrp {
+ fsl,pins = <
+ MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
+ >;
+ };
+ pinctrl_regulator_usbotg_pwr: gpio_regulator_usbotg_pwr {
+ fsl,pins = <
+ /* USBO power en */
+ MX6QDL_PAD_EIM_D22__GPIO3_IO22 PAD_CTRL_PU_22k
+ >;
+ };
+ };
+
+ usdhc {
+ pinctrl_mmc_cd: gpio_mmc_cd {
+ fsl,pins = <
+ /* MMC1 CD */
+ MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x000b0
+ >;
+ };
+ pinctrl_sd_cd: gpio_sd_cd {
+ fsl,pins = <
+ /* SD1 CD */
+ MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x000b0
+ >;
+ };
+ pinctrl_usdhc1: usdhc1grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071
+ MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10071
+ MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17071
+ MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17071
+ MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17071
+ MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17071
+ MX6QDL_PAD_NANDF_D0__SD1_DATA4 0x17071
+ MX6QDL_PAD_NANDF_D1__SD1_DATA5 0x17071
+ MX6QDL_PAD_NANDF_D2__SD1_DATA6 0x17071
+ MX6QDL_PAD_NANDF_D3__SD1_DATA7 0x17071
+ >;
+ };
+ pinctrl_usdhc2: usdhc2grp {
+ fsl,pins = <
+ MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17071
+ MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10071
+ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17071
+ MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17071
+ MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17071
+ MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17071
+ >;
+ };
+ };
+};
+
+&ldb {
+ status = "okay";
+};
+
+&pwm1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm1>;
+ status = "disabled";
+};
+
+&pwm2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm2>;
+ status = "disabled";
+};
+
+&pwm3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm3>;
+ status = "disabled";
+};
+
+&pwm4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm4>;
+ status = "disabled";
+};
+
+&spdif {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_spdif>;
+ status = "disabled";
+};
+
+&ssi1 {
+ fsl,mode = "i2s-slave";
+ status = "okay";
+};
+
+&uart1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart1_dte &pinctrl_uart1_ctrl>;
+ fsl,dte-mode;
+ fsl,uart-has-rtscts;
+ status = "disabled";
+};
+
+&uart2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart2_dte>;
+ fsl,dte-mode;
+ fsl,uart-has-rtscts;
+ status = "disabled";
+};
+
+&uart4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart4_dte>;
+ fsl,dte-mode;
+ status = "disabled";
+};
+
+&uart5 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart5_dte>;
+ fsl,dte-mode;
+ status = "disabled";
+};
+
+&usbh1 {
+ vbus-supply = <®_usb_host_vbus>;
+ status = "disabled";
+};
+
+&usbotg {
+ vbus-supply = <®_usb_otg_vbus>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usbotg>;
+ disable-over-current;
+ status = "disabled";
+};
+
+/* MMC1 */
+&usdhc1 {
+ label = "MMC1";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
+ cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
+ vmmc-supply = <®_3p3v>;
+ bus-width = <8>;
+ voltage-ranges = <3300 3300>;
+ status = "disabled";
+};
+
+/* SD1 */
+&usdhc2 {
+ label = "SD1";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>;
+ cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
+ vmmc-supply = <®_3p3v>;
+ bus-width = <4>;
+ voltage-ranges = <3300 3300>;
+ status = "disabled";
+};
+
+/* eMMC */
+&usdhc3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usdhc3>;
+ vmmc-supply = <®_3p3v>;
+ bus-width = <8>;
+ voltage-ranges = <3300 3300>;
+ non-removable;
+ status = "okay";
+};
+
+&weim {
+ status = "disabled"; /* weim signals not accessible on i.MX6 */
+};
--
2.5.0
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 2/2] ARM: dts: imx6: Add support for Toradex Ixora carrier board
2016-01-05 16:39 ` Marcel Ziswiler
@ 2016-01-05 16:39 ` Marcel Ziswiler
-1 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-05 16:39 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Lucas Stach, Russell King, Sascha Hauer, Petr Štetiar,
Shawn Guo, Fabio Estevam, Kumar Gala, Ian Campbell, Stefan Agner,
Joshua Clayton, Rob Herring, Pawel Moll, Mark Rutland,
Marcel Ziswiler, devicetree, linux-kernel, Shawn Guo
From: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v2: None
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/imx6q-apalis-ixora.dts | 256 +++++++++++++++++++++++++++++++
2 files changed, 257 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 44508dc..29b1aae 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -315,6 +315,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-udoo.dtb \
imx6dl-wandboard.dtb \
imx6dl-wandboard-revb1.dtb \
+ imx6q-apalis-ixora.dtb \
imx6q-apf6dev.dtb \
imx6q-arm2.dtb \
imx6q-cm-fx6.dtb \
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
new file mode 100644
index 0000000..5494a13
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -0,0 +1,256 @@
+/*
+ * Copyright 2014-2016 Toradex AG
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include "imx6q.dtsi"
+#include "imx6qdl-apalis.dtsi"
+
+/ {
+ model = "Toradex Apalis iMX6Q/D Module on Ixora Carrier Board";
+ compatible = "toradex,apalis_imx6q-ixora", "toradex,apalis_imx6q",
+ "fsl,imx6q";
+
+ aliases {
+ i2c0 = &i2cddc;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ };
+
+ aliases {
+ rtc0 = &rtc_i2c;
+ rtc1 = "/soc/aips-bus@02000000/snvs@020cc000/snvs-rtc-lp@34";
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpio_keys>;
+
+ wakeup {
+ label = "Wake-Up";
+ gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_WAKEUP>;
+ debounce-interval = <10>;
+ gpio-key,wakeup;
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_leds_ixora>;
+
+ led4-green {
+ label = "LED_4_GREEN";
+ gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
+ };
+
+ led4-red {
+ label = "LED_4_RED";
+ gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
+ };
+
+ led5-green {
+ label = "LED_5_GREEN";
+ gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+ };
+
+ led5-red {
+ label = "LED_5_RED";
+ gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ pwmleds {
+ compatible = "pwm-leds";
+ ledpwm1 {
+ label = "PWM1";
+ pwms = <&pwm1 0 50000>;
+ max-brightness = <255>;
+ };
+
+ ledpwm2 {
+ label = "PWM2";
+ pwms = <&pwm2 0 50000>;
+ max-brightness = <255>;
+ };
+
+ ledpwm3 {
+ label = "PWM3";
+ pwms = <&pwm3 0 50000>;
+ max-brightness = <255>;
+ };
+ };
+
+ regulators {
+ reg_usb_otg_vbus: usb_otg_vbus {
+ status = "okay";
+ };
+
+ reg_usb_host_vbus: usb_host_vbus {
+ status = "okay";
+ };
+ };
+};
+
+&backlight {
+ brightness-levels = <0 127 191 223 239 247 251 255>;
+ default-brightness-level = <1>;
+ status = "okay";
+};
+
+&can1 {
+ status = "okay";
+};
+
+&can2 {
+ status = "okay";
+};
+
+/* GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
+&i2c1 {
+ status = "okay";
+
+ cat24c02@50 {
+ compatible = "atmel,24c02";
+ reg = <0x50>;
+ };
+
+ /* M41T0M6 real time clock on carrier board */
+ rtc_i2c: rtc@68 {
+ compatible = "st,m41t00";
+ reg = <0x68>;
+ };
+};
+
+&iomuxc {
+ /*
+ * Mux the Apalis GPIOs, GPIO7 used for PCIe reset,
+ * GPIO5, 6 used by optional fusion_F0710A kernel module
+ */
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
+ &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
+ &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
+ &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8>;
+
+ leds_ixora {
+ pinctrl_leds_ixora: leds-ixora {
+ fsl,pins = <
+ MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 PAD_CTRL_HYS_PU
+ MX6QDL_PAD_SD1_DAT3__GPIO1_IO21 PAD_CTRL_HYS_PU
+ MX6QDL_PAD_NANDF_D1__GPIO2_IO01 PAD_CTRL_HYS_PU
+ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 PAD_CTRL_HYS_PU
+ >;
+ };
+ };
+};
+
+&pcie {
+ /* active-low meaning opposite of regular PERST# active-low polarity */
+ reset-gpio = <&gpio1 28 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
+
+&pwm1 {
+ status = "okay";
+};
+
+&pwm2 {
+ status = "okay";
+};
+
+&pwm3 {
+ status = "okay";
+};
+
+&pwm4 {
+ status = "okay";
+};
+
+&sata {
+ status = "okay";
+};
+
+&sound_spdif {
+ status = "okay";
+};
+
+&spdif {
+ status = "okay";
+};
+
+&uart1 {
+ status = "okay";
+};
+
+&uart2 {
+ status = "okay";
+};
+
+&uart4 {
+ status = "okay";
+};
+
+&uart5 {
+ status = "okay";
+};
+
+&usbh1 {
+ status = "okay";
+};
+
+&usbotg {
+ status = "okay";
+};
+
+/* SD1 */
+&usdhc2 {
+ status = "okay";
+};
--
2.5.0
^ permalink raw reply related [flat|nested] 36+ messages in thread
* [PATCH v2 2/2] ARM: dts: imx6: Add support for Toradex Ixora carrier board
@ 2016-01-05 16:39 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-05 16:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Petr ?tetiar <ynezz@true.cz>
Signed-off-by: Petr ?tetiar <ynezz@true.cz>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v2: None
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/imx6q-apalis-ixora.dts | 256 +++++++++++++++++++++++++++++++
2 files changed, 257 insertions(+)
create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 44508dc..29b1aae 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -315,6 +315,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
imx6dl-udoo.dtb \
imx6dl-wandboard.dtb \
imx6dl-wandboard-revb1.dtb \
+ imx6q-apalis-ixora.dtb \
imx6q-apf6dev.dtb \
imx6q-arm2.dtb \
imx6q-cm-fx6.dtb \
diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
new file mode 100644
index 0000000..5494a13
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -0,0 +1,256 @@
+/*
+ * Copyright 2014-2016 Toradex AG
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This file is distributed in the hope that it will be useful
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include "imx6q.dtsi"
+#include "imx6qdl-apalis.dtsi"
+
+/ {
+ model = "Toradex Apalis iMX6Q/D Module on Ixora Carrier Board";
+ compatible = "toradex,apalis_imx6q-ixora", "toradex,apalis_imx6q",
+ "fsl,imx6q";
+
+ aliases {
+ i2c0 = &i2cddc;
+ i2c1 = &i2c1;
+ i2c2 = &i2c2;
+ i2c3 = &i2c3;
+ };
+
+ aliases {
+ rtc0 = &rtc_i2c;
+ rtc1 = "/soc/aips-bus at 02000000/snvs at 020cc000/snvs-rtc-lp at 34";
+ };
+
+ gpio-keys {
+ compatible = "gpio-keys";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_gpio_keys>;
+
+ wakeup {
+ label = "Wake-Up";
+ gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_WAKEUP>;
+ debounce-interval = <10>;
+ gpio-key,wakeup;
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_leds_ixora>;
+
+ led4-green {
+ label = "LED_4_GREEN";
+ gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
+ };
+
+ led4-red {
+ label = "LED_4_RED";
+ gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
+ };
+
+ led5-green {
+ label = "LED_5_GREEN";
+ gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+ };
+
+ led5-red {
+ label = "LED_5_RED";
+ gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ pwmleds {
+ compatible = "pwm-leds";
+ ledpwm1 {
+ label = "PWM1";
+ pwms = <&pwm1 0 50000>;
+ max-brightness = <255>;
+ };
+
+ ledpwm2 {
+ label = "PWM2";
+ pwms = <&pwm2 0 50000>;
+ max-brightness = <255>;
+ };
+
+ ledpwm3 {
+ label = "PWM3";
+ pwms = <&pwm3 0 50000>;
+ max-brightness = <255>;
+ };
+ };
+
+ regulators {
+ reg_usb_otg_vbus: usb_otg_vbus {
+ status = "okay";
+ };
+
+ reg_usb_host_vbus: usb_host_vbus {
+ status = "okay";
+ };
+ };
+};
+
+&backlight {
+ brightness-levels = <0 127 191 223 239 247 251 255>;
+ default-brightness-level = <1>;
+ status = "okay";
+};
+
+&can1 {
+ status = "okay";
+};
+
+&can2 {
+ status = "okay";
+};
+
+/* GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
+&i2c1 {
+ status = "okay";
+
+ cat24c02 at 50 {
+ compatible = "atmel,24c02";
+ reg = <0x50>;
+ };
+
+ /* M41T0M6 real time clock on carrier board */
+ rtc_i2c: rtc at 68 {
+ compatible = "st,m41t00";
+ reg = <0x68>;
+ };
+};
+
+&iomuxc {
+ /*
+ * Mux the Apalis GPIOs, GPIO7 used for PCIe reset,
+ * GPIO5, 6 used by optional fusion_F0710A kernel module
+ */
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
+ &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
+ &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
+ &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8>;
+
+ leds_ixora {
+ pinctrl_leds_ixora: leds-ixora {
+ fsl,pins = <
+ MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 PAD_CTRL_HYS_PU
+ MX6QDL_PAD_SD1_DAT3__GPIO1_IO21 PAD_CTRL_HYS_PU
+ MX6QDL_PAD_NANDF_D1__GPIO2_IO01 PAD_CTRL_HYS_PU
+ MX6QDL_PAD_NANDF_D2__GPIO2_IO02 PAD_CTRL_HYS_PU
+ >;
+ };
+ };
+};
+
+&pcie {
+ /* active-low meaning opposite of regular PERST# active-low polarity */
+ reset-gpio = <&gpio1 28 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
+
+&pwm1 {
+ status = "okay";
+};
+
+&pwm2 {
+ status = "okay";
+};
+
+&pwm3 {
+ status = "okay";
+};
+
+&pwm4 {
+ status = "okay";
+};
+
+&sata {
+ status = "okay";
+};
+
+&sound_spdif {
+ status = "okay";
+};
+
+&spdif {
+ status = "okay";
+};
+
+&uart1 {
+ status = "okay";
+};
+
+&uart2 {
+ status = "okay";
+};
+
+&uart4 {
+ status = "okay";
+};
+
+&uart5 {
+ status = "okay";
+};
+
+&usbh1 {
+ status = "okay";
+};
+
+&usbotg {
+ status = "okay";
+};
+
+/* SD1 */
+&usdhc2 {
+ status = "okay";
+};
--
2.5.0
^ permalink raw reply related [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
2016-01-05 16:39 ` Marcel Ziswiler
(?)
@ 2016-01-06 8:03 ` Petr Štetiar
-1 siblings, 0 replies; 36+ messages in thread
From: Petr Štetiar @ 2016-01-06 8:03 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: linux-arm-kernel, Mark Rutland, devicetree, Joshua Clayton,
Russell King, Pawel Moll, Ian Campbell, Shawn Guo, linux-kernel,
Stefan Agner, Rob Herring, Sascha Hauer, Kumar Gala,
Petr Štetiar, Shawn Guo, Fabio Estevam, Lucas Stach
Marcel Ziswiler <marcel.ziswiler@toradex.com> [2016-01-05 17:39:01]:
Hi Marcel,
thanks for taking care of this, I'm quite busy with other tasks :(
> - integrated review feedback from Lucas
You've probably missed few of them :) See my nitpicks bellow.
> - left and even added some more comments as I don't see why putting any
> explanatory comments in dts' should be such a bad thing to do
You've marked this as v2 so I think, that you should only work on the
feedback. Ideally you shouldn't add any new stuff if it wasn't requested
otherwise you're wasting reviewer time.
> - completely got rid of the memory node as that is something typically filled
> in by the boot loader e.g. U-Boot
If I'm not mistaken, it wasn't requested by the reviewer.
> - without the regulators simple-bus it no longer boots
It works for me on 4.4.0-rc3 with following DTS[1]. BTW, this DTS is my
preparation for v2 patch series.
> - fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver to be
> enabled)
Great!
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
Hope you've some kind of ACK from FSL and Linaro :)
> + reg_usb_otg_vbus: usb_otg_vbus {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_regulator_usbotg_pwr>;
> + regulator-name = "usb_otg_vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + status = "disabled";
> + };
I'm not sure, but it seems to me, that we should move this regulator into the
carrier board DTS. On our custom carrier board we've this regulator always on
and we use this GPIO for heartbeat LED, so I've this in our carrier board
DTS[2]:
reg_usb_otg_vbus: usb_otg_vbus {
/* Regulator is always on, and we use GPIO for heartbeat LED */
pinctrl-0 = <>;
gpio = <>;
compatible = "regulator-fixed";
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
...
usbotg {
/* GPIO3_IO22 is Heartbeat LED */
pinctrl_regulator_usbotg_pwr: gpio_regulator_usbotg_pwr {
};
};
> +/* PAD Ctrl values for common settings */
> +/*
> + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE |
> + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> + */
> +#define PAD_CTRL_HYS_PU 0x1b0b0
This was requested to be reworked. I've simply replaced all the macros with
hex values.
> + pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /* 100Mhz */
> + fsl,pins = <
> + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170B9
As per review comments, all hex values should be lowercase.
1. https://github.com/ynezz/linux-2.6/blob/b27de46e67605fe1a8e386b065845a9708e8e792/arch/arm/boot/dts/imx6qdl-apalis.dtsi
2. https://github.com/ynezz/linux-2.6/blob/ec678e3734d9fff35f7ba9605469a68a3e424020/arch/arm/boot/dts/imx6qdl-apalis-gaben-flexisbc.dtsi#L143
Thanks!
-- ynezz
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-06 8:03 ` Petr Štetiar
0 siblings, 0 replies; 36+ messages in thread
From: Petr Štetiar @ 2016-01-06 8:03 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: Mark Rutland, devicetree, Joshua Clayton, Russell King,
Pawel Moll, Ian Campbell, Fabio Estevam, linux-kernel,
Stefan Agner, Rob Herring, Sascha Hauer, Kumar Gala,
Petr Štetiar, Shawn Guo, Shawn Guo, linux-arm-kernel,
Lucas Stach
Marcel Ziswiler <marcel.ziswiler@toradex.com> [2016-01-05 17:39:01]:
Hi Marcel,
thanks for taking care of this, I'm quite busy with other tasks :(
> - integrated review feedback from Lucas
You've probably missed few of them :) See my nitpicks bellow.
> - left and even added some more comments as I don't see why putting any
> explanatory comments in dts' should be such a bad thing to do
You've marked this as v2 so I think, that you should only work on the
feedback. Ideally you shouldn't add any new stuff if it wasn't requested
otherwise you're wasting reviewer time.
> - completely got rid of the memory node as that is something typically filled
> in by the boot loader e.g. U-Boot
If I'm not mistaken, it wasn't requested by the reviewer.
> - without the regulators simple-bus it no longer boots
It works for me on 4.4.0-rc3 with following DTS[1]. BTW, this DTS is my
preparation for v2 patch series.
> - fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver to be
> enabled)
Great!
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
Hope you've some kind of ACK from FSL and Linaro :)
> + reg_usb_otg_vbus: usb_otg_vbus {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_regulator_usbotg_pwr>;
> + regulator-name = "usb_otg_vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + status = "disabled";
> + };
I'm not sure, but it seems to me, that we should move this regulator into the
carrier board DTS. On our custom carrier board we've this regulator always on
and we use this GPIO for heartbeat LED, so I've this in our carrier board
DTS[2]:
reg_usb_otg_vbus: usb_otg_vbus {
/* Regulator is always on, and we use GPIO for heartbeat LED */
pinctrl-0 = <>;
gpio = <>;
compatible = "regulator-fixed";
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
...
usbotg {
/* GPIO3_IO22 is Heartbeat LED */
pinctrl_regulator_usbotg_pwr: gpio_regulator_usbotg_pwr {
};
};
> +/* PAD Ctrl values for common settings */
> +/*
> + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE |
> + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> + */
> +#define PAD_CTRL_HYS_PU 0x1b0b0
This was requested to be reworked. I've simply replaced all the macros with
hex values.
> + pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /* 100Mhz */
> + fsl,pins = <
> + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170B9
As per review comments, all hex values should be lowercase.
1. https://github.com/ynezz/linux-2.6/blob/b27de46e67605fe1a8e386b065845a9708e8e792/arch/arm/boot/dts/imx6qdl-apalis.dtsi
2. https://github.com/ynezz/linux-2.6/blob/ec678e3734d9fff35f7ba9605469a68a3e424020/arch/arm/boot/dts/imx6qdl-apalis-gaben-flexisbc.dtsi#L143
Thanks!
-- ynezz
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-06 8:03 ` Petr Štetiar
0 siblings, 0 replies; 36+ messages in thread
From: Petr Štetiar @ 2016-01-06 8:03 UTC (permalink / raw)
To: linux-arm-kernel
Marcel Ziswiler <marcel.ziswiler@toradex.com> [2016-01-05 17:39:01]:
Hi Marcel,
thanks for taking care of this, I'm quite busy with other tasks :(
> - integrated review feedback from Lucas
You've probably missed few of them :) See my nitpicks bellow.
> - left and even added some more comments as I don't see why putting any
> explanatory comments in dts' should be such a bad thing to do
You've marked this as v2 so I think, that you should only work on the
feedback. Ideally you shouldn't add any new stuff if it wasn't requested
otherwise you're wasting reviewer time.
> - completely got rid of the memory node as that is something typically filled
> in by the boot loader e.g. U-Boot
If I'm not mistaken, it wasn't requested by the reviewer.
> - without the regulators simple-bus it no longer boots
It works for me on 4.4.0-rc3 with following DTS[1]. BTW, this DTS is my
preparation for v2 patch series.
> - fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver to be
> enabled)
Great!
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
Hope you've some kind of ACK from FSL and Linaro :)
> + reg_usb_otg_vbus: usb_otg_vbus {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_regulator_usbotg_pwr>;
> + regulator-name = "usb_otg_vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + status = "disabled";
> + };
I'm not sure, but it seems to me, that we should move this regulator into the
carrier board DTS. On our custom carrier board we've this regulator always on
and we use this GPIO for heartbeat LED, so I've this in our carrier board
DTS[2]:
reg_usb_otg_vbus: usb_otg_vbus {
/* Regulator is always on, and we use GPIO for heartbeat LED */
pinctrl-0 = <>;
gpio = <>;
compatible = "regulator-fixed";
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-always-on;
};
...
usbotg {
/* GPIO3_IO22 is Heartbeat LED */
pinctrl_regulator_usbotg_pwr: gpio_regulator_usbotg_pwr {
};
};
> +/* PAD Ctrl values for common settings */
> +/*
> + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE |
> + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> + */
> +#define PAD_CTRL_HYS_PU 0x1b0b0
This was requested to be reworked. I've simply replaced all the macros with
hex values.
> + pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /* 100Mhz */
> + fsl,pins = <
> + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170B9
As per review comments, all hex values should be lowercase.
1. https://github.com/ynezz/linux-2.6/blob/b27de46e67605fe1a8e386b065845a9708e8e792/arch/arm/boot/dts/imx6qdl-apalis.dtsi
2. https://github.com/ynezz/linux-2.6/blob/ec678e3734d9fff35f7ba9605469a68a3e424020/arch/arm/boot/dts/imx6qdl-apalis-gaben-flexisbc.dtsi#L143
Thanks!
-- ynezz
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
2016-01-06 8:03 ` Petr Štetiar
(?)
@ 2016-01-06 9:15 ` Marcel Ziswiler
-1 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-06 9:15 UTC (permalink / raw)
To: ynezz
Cc: linux-kernel, robh+dt, pawel.moll, stefan, shawn.guo, devicetree,
festevam, mark.rutland, stillcompiling, ijc+devicetree, galak,
shawnguo, linux-arm-kernel, l.stach, kernel, linux
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 5159 bytes --]
Hi Petr
On Wed, 2016-01-06 at 09:03 +0100, Petr Å tetiar wrote:
> Marcel Ziswiler <marcel.ziswiler@toradex.com> [2016-01-05 17:39:01]:
>
> Hi Marcel,
>
> thanks for taking care of this, I'm quite busy with other tasks :(
You're welcome. I know that feeling.
> > - integrated review feedback from Lucas
>
> You've probably missed few of them :) See my nitpicks bellow.
I don't think so but we don't necessarily agree with all of Lucas'
findings plus the discussion about some of the stuff hasn't really
concluded.
> > - left and even added some more comments as I don't see why putting
> > any
> > Â explanatory comments in dts' should be such a bad thing to do
> You've marked this as v2
Well, as Stefan pointed out we at Toradex are/were working on this as
well and we discussed whether we should just ignore whatever you have
done or not done and post our own stuff but decided to rather join
efforts now as you already jumped ahead.
> so I think, that you should only work on the
> feedback. Ideally you shouldn't add any new stuff if it wasn't
> requested
> otherwise you're wasting reviewer time.
I don't think so. What is important is that any changes are clearly
declared which we did.
> > - completely got rid of the memory node as that is something
> > typically filled
> > Â in by the boot loader e.g. U-Boot
>
> If I'm not mistaken, it wasn't requested by the reviewer.
Lucas was actually nitpicking about the location thereof and rather
than moving it we decided to just get rid of it as it does not only not
add any value but is simply wrong on most of the modules featuring
different amount of memory.
> > - without the regulators simple-bus it no longer boots
>
> It works for me on 4.4.0-rc3 with following DTS[1]. BTW, this DTS is
> my
> preparation for v2 patch series.
I only tried with -next stuff so it might be something is just broken
there I guess.
> > - fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver
> > to be
> > Â enabled)
>
> Great!
Yeah, that one took us a day to figure it all out. At the end we
actually stumbled over your PCIe reset patch inverting the meaning of
active-low vs. active-high (;-p).
> > + * This file is dual-licensed: you can use it either under the
> > terms
> > + * of the GPL or the X11 license, at your option. Note that this
> > dual
> > + * licensing only applies to this file, and not this project as a
> > + * whole.
>
> Hope you've some kind of ACK from FSL and Linaro :)
Well, all new DTS' are now dual-licensed including several i.MX 6
related ones so we are not doing anything special there really.
> > + reg_usb_otg_vbus: usb_otg_vbus {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 =
> > <&pinctrl_regulator_usbotg_pwr>;
> > + regulator-name = "usb_otg_vbus";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > + enable-active-high;
> > + status = "disabled";
> > + };
>
> I'm not sure, but it seems to me, that we should move this regulator
> into the
> carrier board DTS. On our custom carrier board we've this regulator
> always on
> and we use this GPIO for heartbeat LED, so I've this in our carrier
> board
> DTS[2]:
Yes, you are absolutely right and e.g. on Apalis T30 [1] that is
exactly how we did it.
> reg_usb_otg_vbus: usb_otg_vbus {
> /* Regulator is always on, and we use GPIO for
> heartbeat LED */
> pinctrl-0 = <>;
> gpio = <>;
>
> compatible = "regulator-fixed";
> regulator-name = "usb_otg_vbus";
> regulator-min-microvolt = <5000000>;
> regulator-max-microvolt = <5000000>;
> regulator-always-on;
> };
>
> ...
>
> usbotg {
> /* GPIO3_IO22 is Heartbeat LED */
> pinctrl_regulator_usbotg_pwr: gpio_regulator_usbotg_pwr
> {
> };
> };
>
> > +/* PAD Ctrl values for common settings */
> > +/*
> > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE
> > |
> > + *Â Â PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > + */
> > +#define PAD_CTRL_HYS_PU 0x1b0b0
>
> This was requested to be reworked. I've simply replaced all the
> macros with
> hex values.
I don't think the reviewers really concluded on the action to be taken
on here and just using hex values is probably the most stupid solution.
> > + pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /*
> > 100Mhz */
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD
> > 0x170B9
>
> As per review comments, all hex values should be lowercase.
Yes, we probably missed that one.
> 1. https://github.com/ynezz/linux-2.6/blob/b27de46e67605fe1a8e386b065
> 845a9708e8e792/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> 2. https://github.com/ynezz/linux-2.6/blob/ec678e3734d9fff35f7ba96054
> 69a68a3e424020/arch/arm/boot/dts/imx6qdl-apalis-gaben-
> flexisbc.dtsi#L143
>
> Thanks!
Thank you.
> -- ynezz
[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/tegra30-apalis-eval.dts#n235
Cheers
Marcel
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-06 9:15 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-06 9:15 UTC (permalink / raw)
To: ynezz
Cc: mark.rutland, devicetree, stillcompiling, linux, pawel.moll,
ijc+devicetree, shawnguo, linux-kernel, stefan, robh+dt, kernel,
galak, shawn.guo, festevam, linux-arm-kernel, l.stach
Hi Petr
On Wed, 2016-01-06 at 09:03 +0100, Petr Štetiar wrote:
> Marcel Ziswiler <marcel.ziswiler@toradex.com> [2016-01-05 17:39:01]:
>
> Hi Marcel,
>
> thanks for taking care of this, I'm quite busy with other tasks :(
You're welcome. I know that feeling.
> > - integrated review feedback from Lucas
>
> You've probably missed few of them :) See my nitpicks bellow.
I don't think so but we don't necessarily agree with all of Lucas'
findings plus the discussion about some of the stuff hasn't really
concluded.
> > - left and even added some more comments as I don't see why putting
> > any
> > explanatory comments in dts' should be such a bad thing to do
> You've marked this as v2
Well, as Stefan pointed out we at Toradex are/were working on this as
well and we discussed whether we should just ignore whatever you have
done or not done and post our own stuff but decided to rather join
efforts now as you already jumped ahead.
> so I think, that you should only work on the
> feedback. Ideally you shouldn't add any new stuff if it wasn't
> requested
> otherwise you're wasting reviewer time.
I don't think so. What is important is that any changes are clearly
declared which we did.
> > - completely got rid of the memory node as that is something
> > typically filled
> > in by the boot loader e.g. U-Boot
>
> If I'm not mistaken, it wasn't requested by the reviewer.
Lucas was actually nitpicking about the location thereof and rather
than moving it we decided to just get rid of it as it does not only not
add any value but is simply wrong on most of the modules featuring
different amount of memory.
> > - without the regulators simple-bus it no longer boots
>
> It works for me on 4.4.0-rc3 with following DTS[1]. BTW, this DTS is
> my
> preparation for v2 patch series.
I only tried with -next stuff so it might be something is just broken
there I guess.
> > - fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver
> > to be
> > enabled)
>
> Great!
Yeah, that one took us a day to figure it all out. At the end we
actually stumbled over your PCIe reset patch inverting the meaning of
active-low vs. active-high (;-p).
> > + * This file is dual-licensed: you can use it either under the
> > terms
> > + * of the GPL or the X11 license, at your option. Note that this
> > dual
> > + * licensing only applies to this file, and not this project as a
> > + * whole.
>
> Hope you've some kind of ACK from FSL and Linaro :)
Well, all new DTS' are now dual-licensed including several i.MX 6
related ones so we are not doing anything special there really.
> > + reg_usb_otg_vbus: usb_otg_vbus {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 =
> > <&pinctrl_regulator_usbotg_pwr>;
> > + regulator-name = "usb_otg_vbus";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > + enable-active-high;
> > + status = "disabled";
> > + };
>
> I'm not sure, but it seems to me, that we should move this regulator
> into the
> carrier board DTS. On our custom carrier board we've this regulator
> always on
> and we use this GPIO for heartbeat LED, so I've this in our carrier
> board
> DTS[2]:
Yes, you are absolutely right and e.g. on Apalis T30 [1] that is
exactly how we did it.
> reg_usb_otg_vbus: usb_otg_vbus {
> /* Regulator is always on, and we use GPIO for
> heartbeat LED */
> pinctrl-0 = <>;
> gpio = <>;
>
> compatible = "regulator-fixed";
> regulator-name = "usb_otg_vbus";
> regulator-min-microvolt = <5000000>;
> regulator-max-microvolt = <5000000>;
> regulator-always-on;
> };
>
> ...
>
> usbotg {
> /* GPIO3_IO22 is Heartbeat LED */
> pinctrl_regulator_usbotg_pwr: gpio_regulator_usbotg_pwr
> {
> };
> };
>
> > +/* PAD Ctrl values for common settings */
> > +/*
> > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE
> > |
> > + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > + */
> > +#define PAD_CTRL_HYS_PU 0x1b0b0
>
> This was requested to be reworked. I've simply replaced all the
> macros with
> hex values.
I don't think the reviewers really concluded on the action to be taken
on here and just using hex values is probably the most stupid solution.
> > + pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /*
> > 100Mhz */
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD
> > 0x170B9
>
> As per review comments, all hex values should be lowercase.
Yes, we probably missed that one.
> 1. https://github.com/ynezz/linux-2.6/blob/b27de46e67605fe1a8e386b065
> 845a9708e8e792/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> 2. https://github.com/ynezz/linux-2.6/blob/ec678e3734d9fff35f7ba96054
> 69a68a3e424020/arch/arm/boot/dts/imx6qdl-apalis-gaben-
> flexisbc.dtsi#L143
>
> Thanks!
Thank you.
> -- ynezz
[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/tegra30-apalis-eval.dts#n235
Cheers
Marcel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-06 9:15 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-06 9:15 UTC (permalink / raw)
To: linux-arm-kernel
Hi Petr
On Wed, 2016-01-06 at 09:03 +0100, Petr ?tetiar wrote:
> Marcel Ziswiler <marcel.ziswiler@toradex.com> [2016-01-05 17:39:01]:
>
> Hi Marcel,
>
> thanks for taking care of this, I'm quite busy with other tasks :(
You're welcome. I know that feeling.
> > - integrated review feedback from Lucas
>
> You've probably missed few of them :) See my nitpicks bellow.
I don't think so but we don't necessarily agree with all of Lucas'
findings plus the discussion about some of the stuff hasn't really
concluded.
> > - left and even added some more comments as I don't see why putting
> > any
> > ? explanatory comments in dts' should be such a bad thing to do
> You've marked this as v2
Well, as Stefan pointed out we at Toradex are/were working on this as
well and we discussed whether we should just ignore whatever you have
done or not done and post our own stuff but decided to rather join
efforts now as you already jumped ahead.
> so I think, that you should only work on the
> feedback. Ideally you shouldn't add any new stuff if it wasn't
> requested
> otherwise you're wasting reviewer time.
I don't think so. What is important is that any changes are clearly
declared which we did.
> > - completely got rid of the memory node as that is something
> > typically filled
> > ? in by the boot loader e.g. U-Boot
>
> If I'm not mistaken, it wasn't requested by the reviewer.
Lucas was actually nitpicking about the location thereof and rather
than moving it we decided to just get rid of it as it does not only not
add any value but is simply wrong on most of the modules featuring
different amount of memory.
> > - without the regulators simple-bus it no longer boots
>
> It works for me on 4.4.0-rc3 with following DTS[1]. BTW, this DTS is
> my
> preparation for v2 patch series.
I only tried with -next stuff so it might be something is just broken
there I guess.
> > - fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver
> > to be
> > ? enabled)
>
> Great!
Yeah, that one took us a day to figure it all out. At the end we
actually stumbled over your PCIe reset patch inverting the meaning of
active-low vs. active-high (;-p).
> > + * This file is dual-licensed: you can use it either under the
> > terms
> > + * of the GPL or the X11 license, at your option. Note that this
> > dual
> > + * licensing only applies to this file, and not this project as a
> > + * whole.
>
> Hope you've some kind of ACK from FSL and Linaro :)
Well, all new DTS' are now dual-licensed including several i.MX 6
related ones so we are not doing anything special there really.
> > + reg_usb_otg_vbus: usb_otg_vbus {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 =
> > <&pinctrl_regulator_usbotg_pwr>;
> > + regulator-name = "usb_otg_vbus";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > + enable-active-high;
> > + status = "disabled";
> > + };
>
> I'm not sure, but it seems to me, that we should move this regulator
> into the
> carrier board DTS. On our custom carrier board we've this regulator
> always on
> and we use this GPIO for heartbeat LED, so I've this in our carrier
> board
> DTS[2]:
Yes, you are absolutely right and e.g. on Apalis T30 [1] that is
exactly how we did it.
> reg_usb_otg_vbus: usb_otg_vbus {
> /* Regulator is always on, and we use GPIO for
> heartbeat LED */
> pinctrl-0 = <>;
> gpio = <>;
>
> compatible = "regulator-fixed";
> regulator-name = "usb_otg_vbus";
> regulator-min-microvolt = <5000000>;
> regulator-max-microvolt = <5000000>;
> regulator-always-on;
> };
>
> ...
>
> usbotg {
> /* GPIO3_IO22 is Heartbeat LED */
> pinctrl_regulator_usbotg_pwr: gpio_regulator_usbotg_pwr
> {
> };
> };
>
> > +/* PAD Ctrl values for common settings */
> > +/*
> > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE
> > |
> > + *??PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > + */
> > +#define PAD_CTRL_HYS_PU 0x1b0b0
>
> This was requested to be reworked. I've simply replaced all the
> macros with
> hex values.
I don't think the reviewers really concluded on the action to be taken
on here and just using hex values is probably the most stupid solution.
> > + pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /*
> > 100Mhz */
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD
> > 0x170B9
>
> As per review comments, all hex values should be lowercase.
Yes, we probably missed that one.
> 1. https://github.com/ynezz/linux-2.6/blob/b27de46e67605fe1a8e386b065
> 845a9708e8e792/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> 2. https://github.com/ynezz/linux-2.6/blob/ec678e3734d9fff35f7ba96054
> 69a68a3e424020/arch/arm/boot/dts/imx6qdl-apalis-gaben-
> flexisbc.dtsi#L143
>
> Thanks!
Thank you.
> -- ynezz
[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/boot/dts/tegra30-apalis-eval.dts#n235
Cheers
Marcel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
2016-01-05 16:39 ` Marcel Ziswiler
@ 2016-01-07 6:29 ` Stefan Agner
-1 siblings, 0 replies; 36+ messages in thread
From: Stefan Agner @ 2016-01-07 6:29 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: linux-arm-kernel, Lucas Stach, Russell King, Sascha Hauer,
Petr Štetiar, Shawn Guo, Fabio Estevam, Kumar Gala,
Ian Campbell, Joshua Clayton, Rob Herring, Pawel Moll,
Mark Rutland, devicetree, linux-kernel, Shawn Guo
Hi Marcel,
On 2016-01-05 08:39, Marcel Ziswiler wrote:
> From: Petr Štetiar <ynezz@true.cz>
>
> Signed-off-by: Petr Štetiar <ynezz@true.cz>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
>
> Changes in v2:
> - clarify exact Apalis iMX6Q/D SoM type in cover letter
> - clarify exact Apalis iMX6Q/D module type and Ixora carrier board in model
> node
> - got rid of obsolete mmc aliases
> - working SGTL5000 audio/sound integration
> - working STMPE811 touch screen controller integration
> - integrated review feedback from Lucas
> - left and even added some more comments as I don't see why putting any
> explanatory comments in dts' should be such a bad thing to do
> - completely got rid of the memory node as that is something typically filled
> in by the boot loader e.g. U-Boot
> - without the regulators simple-bus it no longer boots
> - even though we supposedly shipped a few hundred V1.0a modules drop DCE UART
> support for now and simplify file layout
> - replaced obsolete no-1-8-v by mainline supported voltage-ranges = <3300 3300>
> usdhc property and yes card detects are indeed active low (;-p)
> - integrated review feedback from Stefan
> - fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver to be
> enabled)
> - fixed HDMI DDC (requires GPIO-based bitbanging I2C to be enabled)
> - fixed SPDIF
>
> arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1040 +++++++++++++++++++++++++++++++++
> 1 file changed, 1040 insertions(+)
> create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
>
> diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> new file mode 100644
> index 0000000..6104e2e
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> @@ -0,0 +1,1040 @@
> +/*
> + * Copyright 2014-2016 Toradex AG
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + * Copyright 2011 Linaro Ltd.
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + * a) This file is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This file is distributed in the hope that it will be useful
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Or, alternatively
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +#include <dt-bindings/gpio/gpio.h>
> +
> +/ {
> + model = "Toradex Apalis iMX6Q/D Module";
> + compatible = "toradex,apalis_imx6q", "fsl,imx6q";
> +
> + backlight: backlight {
> + compatible = "pwm-backlight";
> + pwms = <&pwm4 0 5000000>;
> + status = "disabled";
> + };
> +
> + /* DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 */
> + i2cddc: i2c@0 {
> + compatible = "i2c-gpio";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c_ddc>;
> + gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
> + &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
> + >;
> + i2c-gpio,delay-us = <2>; /* ~100 kHz */
> + status = "okay";
> + };
> +
> + regulators {
> + compatible = "simple-bus";
> +
> + reg_1p8v: 1p8v {
> + compatible = "regulator-fixed";
> + regulator-name = "1P8V";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-always-on;
> + };
> +
> + reg_2p5v: 2p5v {
> + compatible = "regulator-fixed";
> + regulator-name = "2P5V";
> + regulator-min-microvolt = <2500000>;
> + regulator-max-microvolt = <2500000>;
> + regulator-always-on;
> + };
> +
> + reg_3p3v: 3p3v {
> + compatible = "regulator-fixed";
> + regulator-name = "3P3V";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + reg_usb_otg_vbus: usb_otg_vbus {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_regulator_usbotg_pwr>;
> + regulator-name = "usb_otg_vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + status = "disabled";
> + };
> +
> + /* on module usb hub */
> + reg_usb_host_vbus_hub: usb_host_vbus_hub {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_regulator_usbhub_pwr>;
> + regulator-name = "usb_host_vbus_hub";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + gpio = <&gpio3 28 GPIO_ACTIVE_HIGH>;
> + startup-delay-us = <2000>;
> + enable-active-high;
> + status = "okay";
> + };
> +
> + reg_usb_host_vbus: usb_host_vbus {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_regulator_usbh_pwr>;
> + regulator-name = "usb_host_vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + vin-supply = <®_usb_host_vbus_hub>;
> + status = "disabled";
> + };
> + };
> +
> + sound {
> + compatible = "fsl,imx-audio-sgtl5000";
> + model = "imx6q-apalis-sgtl5000";
> + ssi-controller = <&ssi1>;
> + audio-codec = <&codec>;
> + audio-routing =
> + "LINE_IN", "Line In Jack",
> + "MIC_IN", "Mic Jack",
> + "Mic Jack", "Mic Bias",
> + "Headphone Jack", "HP_OUT";
> + mux-int-port = <1>;
> + mux-ext-port = <4>;
> + };
> +
> + sound_spdif: sound-spdif {
> + compatible = "fsl,imx-audio-spdif";
> + model = "imx-spdif";
> + spdif-controller = <&spdif>;
> + spdif-in;
> + spdif-out;
> + status = "disabled";
> + };
> +};
> +
> +&audmux {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_audmux &pinctrl_audmux_mclk>;
> + status = "okay";
> +};
> +
> +/* Apalis SPI1 */
> +&ecspi1 {
> + fsl,spi-num-chipselects = <1>;
> + cs-gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_spi_cs1>;
> + status = "disabled";
> +};
> +
> +/* Apalis SPI2 */
> +&ecspi2 {
> + fsl,spi-num-chipselects = <1>;
> + cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_ecspi2 &pinctrl_spi_cs2>;
> + status = "disabled";
> +};
> +
> +&fec {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_enet &pinctrl_enet_ctrl>;
> + phy-mode = "rgmii";
> + phy-handle = <ðphy>;
> + phy-reset-duration = <10>;
> + phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
> + status = "okay";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + ethphy: ethernet-phy@7 {
> + interrupt-parent = <&gpio1>;
> + interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
> + reg = <7>;
> + };
> + };
> +};
> +
> +&can1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_flexcan1>;
> + status = "disabled";
> +};
> +
> +&can2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_flexcan2>;
> + status = "disabled";
> +};
> +
> +&hdmi {
> + ddc-i2c-bus = <&i2cddc>;
> + status = "okay";
> +};
> +
> +/*
> + * GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier
> + * board)
> + */
> +&i2c1 {
> + clock-frequency = <100000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c1>;
> + status = "disabled";
> +};
> +
> +&i2c2 {
> + clock-frequency = <100000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c2>;
> + status = "okay";
> +
> + pmic: pfuze100@08 {
> + compatible = "fsl,pfuze100";
> + reg = <0x08>;
> +
> + regulators {
> + sw1a_reg: sw1ab {
> + regulator-min-microvolt = <300000>;
> + regulator-max-microvolt = <1875000>;
> + regulator-boot-on;
> + regulator-always-on;
> + regulator-ramp-delay = <6250>;
> + };
> +
> + sw1c_reg: sw1c {
> + regulator-min-microvolt = <300000>;
> + regulator-max-microvolt = <1875000>;
> + regulator-boot-on;
> + regulator-always-on;
> + regulator-ramp-delay = <6250>;
> + };
> +
> + sw3a_reg: sw3a {
> + regulator-min-microvolt = <400000>;
> + regulator-max-microvolt = <1975000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + swbst_reg: swbst {
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5150000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + snvs_reg: vsnvs {
> + regulator-min-microvolt = <1000000>;
> + regulator-max-microvolt = <3000000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vref_reg: vrefddr {
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen1_reg: vgen1 {
> + regulator-min-microvolt = <800000>;
> + regulator-max-microvolt = <1550000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen2_reg: vgen2 {
> + regulator-min-microvolt = <800000>;
> + regulator-max-microvolt = <1550000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen3_reg: vgen3 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen4_reg: vgen4 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen5_reg: vgen5 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen6_reg: vgen6 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> + };
> + };
> +
> + codec: sgtl5000@0a {
> + compatible = "fsl,sgtl5000";
> + reg = <0x0a>;
> + clocks = <&clks 201>;
> + VDDA-supply = <®_2p5v>;
> + VDDIO-supply = <®_3p3v>;
Nit: The device tree bindings mention two more properties as required
properties:
micbias-resistor-k-ohms
micbias-voltage-m-volts
However, both have "If this node is not mentioned", hence I guess they
are actually optional, but maybe we want to set an explicit value here?
> + };
> +
> + /* STMPE811 touch screen controller */
> + stmpe811@41 {
> + compatible = "st,stmpe811";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_touch_int>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <0x41>;
> + interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-parent = <&gpio4>;
> + interrupt-controller;
> + id = <0>;
> + blocks = <0x5>;
> + irq-trigger = <0x1>;
> + stmpe_touchscreen {
> + compatible = "st,stmpe-ts";
> + reg = <0>;
> + /* 3.25 MHz ADC clock speed */
> + st,adc-freq = <1>;
> + /* 8 sample average control */
> + st,ave-ctrl = <3>;
> + /* 7 length fractional part in z */
> + st,fraction-z = <7>;
> + /*
> + * 50 mA typical 80 mA max touchscreen drivers
> + * current limit value
> + */
> + st,i-drive = <1>;
> + /* 12-bit ADC */
> + st,mod-12b = <1>;
> + /* internal ADC reference */
> + st,ref-sel = <0>;
> + /* ADC converstion time: 80 clocks */
> + st,sample-time = <4>;
> + /* 1 ms panel driver settling time */
> + st,settling = <3>;
> + /* 5 ms touch detect interrupt delay */
> + st,touch-det-delay = <5>;
> + };
> + };
> +};
> +
> +/*
> + * GEN2_I2C, CAM: I2C3_SDA/SCL on MXM3 201/203 (unused)
> + */
> +&i2c3 {
> + clock-frequency = <100000>;
> + pinctrl-names = "default", "recovery";
> + pinctrl-0 = <&pinctrl_i2c3>;
> + pinctrl-1 = <&pinctrl_i2c3_recovery>;
> + scl-gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>;
> + sda-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
> + status = "disabled";
> +};
> +
> +/* PAD Ctrl values for common settings */
> +/*
> + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE |
> + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> + */
> +#define PAD_CTRL_HYS_PU 0x1b0b0
> +
> +/*
> + * (PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_MED |
> + * PAD_CTL_DSE_40ohm)
> + */
> +#define PAD_CTRL_HYS_PD 0x130b0
> +
> +/*
> + * (PAD_CTL_PUS_22K_UP | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_LOW |
> + * PAD_CTL_DSE_80ohm)
> + */
> +#define PAD_CTRL_PU_22k 0x0f058
> +
> +&iomuxc {
I think it is a convention to move iomuxc at the very end for better
readability of the rest. At least the Vybrid dts and the more recently
added imx7d-sdb.dts follow this rule.
> + ecspi {
> + pinctrl_ecspi1: ecspi1grp {
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT6__ECSPI1_MISO 0x100b1
> + MX6QDL_PAD_CSI0_DAT5__ECSPI1_MOSI 0x100b1
> + MX6QDL_PAD_CSI0_DAT4__ECSPI1_SCLK 0x100b1
> + >;
> + };
> + pinctrl_ecspi2: ecspi2grp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_OE__ECSPI2_MISO 0x100b1
> + MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI 0x100b1
> + MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK 0x100b1
> + >;
> + };
> + pinctrl_spi_cs1: spi_cs1 {
> + fsl,pins = <
> + /* SPI1 cs */
> + MX6QDL_PAD_CSI0_DAT7__GPIO5_IO25 0x000b1
> + >;
> + };
> + pinctrl_spi_cs2: spi_cs2 {
> + fsl,pins = <
> + /* SPI2 cs */
> + MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x000b1
> + >;
> + };
> + };
> +
> + flexcan {
> + pinctrl_flexcan1: flexcan1grp {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_7__FLEXCAN1_TX 0x1b0b0
> + MX6QDL_PAD_GPIO_8__FLEXCAN1_RX 0x1b0b0
> + >;
> + };
> + pinctrl_flexcan2: flexcan2grp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b0b0
> + MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0
> + >;
> + };
> + };
> +
> + gpio {
> + pinctrl_apalis_gpio1: apalis_gpio1 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_D4__GPIO2_IO04 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio2: apalis_gpio2 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_D5__GPIO2_IO05 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio3: apalis_gpio3 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_D6__GPIO2_IO06 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio4: apalis_gpio4 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_D7__GPIO2_IO07 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio5: apalis_gpio5 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_RB0__GPIO6_IO10 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio6: apalis_gpio6 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09
> + PAD_CTRL_HYS_PD
The 80 character limit normally is not enforced for device trees, hence
I would remove that line break here...
> + >;
> + };
> + pinctrl_apalis_gpio7: apalis_gpio7 {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_2__GPIO1_IO02 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio8: apalis_gpio8 {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_6__GPIO1_IO06 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_gpio_keys: gpio_keys {
> + fsl,pins = <
> + /* Power Button */
> + MX6QDL_PAD_GPIO_4__GPIO1_IO04 PAD_CTRL_HYS_PU
> + >;
> + };
> + };
> +
> + hdmi {
> + pinctrl_hdmi_cec: hdmicecgrp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
> + >;
> + };
> + };
> +
> + i2c {
> + pinctrl_i2c_ddc: i2c_ddc {
> + fsl,pins = <
> + /* DDC bitbang */
> + MX6QDL_PAD_EIM_EB2__GPIO2_IO30 PAD_CTRL_HYS_PU
> + MX6QDL_PAD_EIM_D16__GPIO3_IO16 PAD_CTRL_HYS_PU
> + >;
> + };
> + pinctrl_i2c1: i2c1grp {
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
> + MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
> + >;
> + };
> + pinctrl_i2c3: i2c3grp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
> + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
> + >;
> + };
> + pinctrl_i2c3_recovery: i2c3-recoverygrp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_D17__GPIO3_IO17 0x4001b8b1
> + MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x4001b8b1
> + >;
> + };
> + };
> +
> + /* pins used on module */
> + imx6q-apalis {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_reset_moci &pinctrl_emmc_reset>;
> + pinctrl_audmux: audmuxgrp {
> + fsl,pins = <
> + MX6QDL_PAD_DISP0_DAT20__AUD4_TXC 0x130b0
> + MX6QDL_PAD_DISP0_DAT21__AUD4_TXD 0x130b0
> + MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS 0x130b0
> + MX6QDL_PAD_DISP0_DAT23__AUD4_RXD 0x130b0
> + >;
> + };
> + pinctrl_audmux_mclk: audmux_mclk {
> + fsl,pins = <
> + /* SGTL5000 sys_mclk */
> + MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0
> + >;
> + };
> + pinctrl_emmc_reset: emmc_reset {
> + fsl,pins = <
> + /* eMMC reset, leave it alone */
> + MX6QDL_PAD_SD3_RST__GPIO7_IO08 PAD_CTRL_PU_22k
> + >;
> + };
> + pinctrl_enet: enetgrp {
> + fsl,pins = <
> + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x100b0
> + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x100b0
> + MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x100b0
> + MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x100b0
> + MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x100b0
> + MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x100b0
> + MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x100b0
> + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x100b0
> + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x100b0
> + MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
> + MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
> + MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
> + MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
> + MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
> + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
> + >;
> + };
> + pinctrl_enet_ctrl: enet_ctrlgrp {
> + fsl,pins = <
> + /* Ethernet PHY reset */
> + MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x000b0
> + /* Ethernet PHY interrupt */
> + MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x000b1
> + >;
> + };
> + pinctrl_i2c2: i2c2grp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
> + MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
> + >;
> + };
> + pinctrl_ipu2_vdac: ipu2vdacgrp {
> + fsl,pins = <
> + MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK 0xd1
> + MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN15 0xd1
> + MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN02 0xd1
> + MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN03 0xd1
> + MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_DATA00 0xf9
> + MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_DATA01 0xf9
> + MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_DATA02 0xf9
> + MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_DATA03 0xf9
> + MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_DATA04 0xf9
> + MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_DATA05 0xf9
> + MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_DATA06 0xf9
> + MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_DATA07 0xf9
> + MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_DATA08 0xf9
> + MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_DATA09 0xf9
> + MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0_DATA10 0xf9
> + MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0_DATA11 0xf9
> + MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0_DATA12 0xf9
> + MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0_DATA13 0xf9
> + MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0_DATA14 0xf9
> + MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0_DATA15 0xf9
> + >;
> + };
> + pinctrl_regulator_usbhub_pwr: gpio_regulator_usbhub_pwr {
> + fsl,pins = <
> + /* USBH_HUB_EN */
> + MX6QDL_PAD_EIM_D28__GPIO3_IO28 PAD_CTRL_PU_22k
> + >;
> + };
> + pinctrl_reset_moci: gpio_reset_moci {
> + fsl,pins = <
> + /* RESET_MOCI control */
> + MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28
> + PAD_CTRL_PU_22k
> + >;
> + };
> + pinctrl_touch_int: touch_intgrp {
> + fsl,pins = <
> + /* STMPE811 interrupt */
> + MX6QDL_PAD_KEY_COL2__GPIO4_IO10 PAD_CTRL_HYS_PU
> + >;
> + };
> + pinctrl_usdhc3: usdhc3grp {
> + fsl,pins = <
> + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
> + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
> + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
> + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
> + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
> + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
> + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
> + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
> + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
> + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
> + >;
> + };
> + pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /* 100Mhz */
I do not have a strong opinion on comments, but if they are pure
duplication of what is already there, I kind of prefer to not add
them...
> + fsl,pins = <
> + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170B9
> + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100B9
> + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170B9
> + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170B9
> + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170B9
> + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170B9
> + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170B9
> + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170B9
> + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170B9
> + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170B9
> + >;
> + };
> + pinctrl_usdhc3_200mhz: usdhc3grp-200mhz { /* 200Mhz */
> + fsl,pins = <
> + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170F9
> + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100F9
> + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170F9
> + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170F9
> + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170F9
> + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170F9
> + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170F9
> + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170F9
> + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170F9
> + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170F9
> + >;
> + };
> + };
> +
> + ipu1 {
> + pinctrl_ipu1_lcdif: ipu1lcdifgrp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_A16__IPU1_DI1_DISP_CLK 0x61
> + /* DE */
> + MX6QDL_PAD_EIM_DA10__IPU1_DI1_PIN15 0x61
> + /* HSync */
> + MX6QDL_PAD_EIM_DA11__IPU1_DI1_PIN02 0x61
> + /* VSync */
> + MX6QDL_PAD_EIM_DA12__IPU1_DI1_PIN03 0x61
> + MX6QDL_PAD_EIM_DA9__IPU1_DISP1_DATA00 0x61
> + MX6QDL_PAD_EIM_DA8__IPU1_DISP1_DATA01 0x61
> + MX6QDL_PAD_EIM_DA7__IPU1_DISP1_DATA02 0x61
> + MX6QDL_PAD_EIM_DA6__IPU1_DISP1_DATA03 0x61
> + MX6QDL_PAD_EIM_DA5__IPU1_DISP1_DATA04 0x61
> + MX6QDL_PAD_EIM_DA4__IPU1_DISP1_DATA05 0x61
> + MX6QDL_PAD_EIM_DA3__IPU1_DISP1_DATA06 0x61
> + MX6QDL_PAD_EIM_DA2__IPU1_DISP1_DATA07 0x61
> + MX6QDL_PAD_EIM_DA1__IPU1_DISP1_DATA08 0x61
> + MX6QDL_PAD_EIM_DA0__IPU1_DISP1_DATA09 0x61
> + MX6QDL_PAD_EIM_EB1__IPU1_DISP1_DATA10 0x61
> + MX6QDL_PAD_EIM_EB0__IPU1_DISP1_DATA11 0x61
> + MX6QDL_PAD_EIM_A17__IPU1_DISP1_DATA12 0x61
> + MX6QDL_PAD_EIM_A18__IPU1_DISP1_DATA13 0x61
> + MX6QDL_PAD_EIM_A19__IPU1_DISP1_DATA14 0x61
> + MX6QDL_PAD_EIM_A20__IPU1_DISP1_DATA15 0x61
> + MX6QDL_PAD_EIM_A21__IPU1_DISP1_DATA16 0x61
> + MX6QDL_PAD_EIM_A22__IPU1_DISP1_DATA17 0x61
> + MX6QDL_PAD_EIM_A23__IPU1_DISP1_DATA18 0x61
> + MX6QDL_PAD_EIM_A24__IPU1_DISP1_DATA19 0x61
> + MX6QDL_PAD_EIM_D31__IPU1_DISP1_DATA20 0x61
> + MX6QDL_PAD_EIM_D30__IPU1_DISP1_DATA21 0x61
> + MX6QDL_PAD_EIM_D26__IPU1_DISP1_DATA22 0x61
> + MX6QDL_PAD_EIM_D27__IPU1_DISP1_DATA23 0x61
> + >;
> + };
> + pinctrl_cam_mclk: cam_mclk {
> + fsl,pins = <
> + /* CAM sys_mclk */
> + MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x00b0
> + >;
> + };
> + pinctrl_ipu1_csi0: ipu1csi0grp { /* parallel camera */
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12 0xb0b1
> + MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13 0xb0b1
> + MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14 0xb0b1
> + MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15 0xb0b1
> + MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16 0xb0b1
> + MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17 0xb0b1
> + MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18 0xb0b1
> + MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19 0xb0b1
> + MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0xb0b1
> + MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC 0xb0b1
> + MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC 0xb0b1
> + >;
> + };
> + };
> +
> + pwm {
> + pinctrl_pwm1: pwm1grp {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_9__PWM1_OUT 0x1b0b1
> + >;
> + };
> + pinctrl_pwm2: pwm2grp {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_1__PWM2_OUT 0x1b0b1
> + >;
> + };
> + pinctrl_pwm3: pwm3grp {
> + fsl,pins = <
> + MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
> + >;
> + };
> + pinctrl_pwm4: pwm4grp {
> + fsl,pins = <
> + MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1
> + >;
> + };
> + };
> +
> + spdif {
> + pinctrl_spdif: spdifgrp {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_16__SPDIF_IN 0x1b0b0
> + MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0
> + >;
> + };
> + };
> +
> + uart1 {
> + pinctrl_uart1_dce: uart1-dcegrp {
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
> + MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
> + >;
> + };
> +
> + /* DTE mode */
> + pinctrl_uart1_dte: uart1-dtegrp {
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT10__UART1_RX_DATA 0x1b0b1
> + MX6QDL_PAD_CSI0_DAT11__UART1_TX_DATA 0x1b0b1
> + MX6QDL_PAD_EIM_D19__UART1_RTS_B 0x1b0b1
> + MX6QDL_PAD_EIM_D20__UART1_CTS_B 0x1b0b1
> + >;
> + };
> +
> + /* Additional DTR, DSR, DCD */
> + pinctrl_uart1_ctrl: uart1-ctrlgrp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_D23__UART1_DCD_B 0x1b0b0
> + MX6QDL_PAD_EIM_D24__UART1_DTR_B 0x1b0b0
> + MX6QDL_PAD_EIM_D25__UART1_DSR_B 0x1b0b0
> + >;
> + };
> + };
> +
> + uart2 {
> + pinctrl_uart2_dce: uart2-dcegrp {
> + fsl,pins = <
> + MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
> + MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
> + >;
> + };
> +
> + /* DTE mode */
> + pinctrl_uart2_dte: uart2grp-dte {
> + fsl,pins = <
> + MX6QDL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1
> + MX6QDL_PAD_SD4_DAT7__UART2_RX_DATA 0x1b0b1
> + MX6QDL_PAD_SD4_DAT6__UART2_RTS_B 0x1b0b1
> + MX6QDL_PAD_SD4_DAT5__UART2_CTS_B 0x1b0b1
> + >;
> + };
> + };
> +
> + uart4 {
> + pinctrl_uart4_dce: uart4-dcegrp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
> + MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
> + >;
> + };
> +
> + /* DTE mode */
> + pinctrl_uart4_dte: uart4-dtegrp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL0__UART4_RX_DATA 0x1b0b1
> + MX6QDL_PAD_KEY_ROW0__UART4_TX_DATA 0x1b0b1
> + >;
> + };
> + };
> +
> + uart5 {
> + pinctrl_uart5_dce: uart5-dcegrp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
> + MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
> + >;
> + };
> +
> + /* DTE mode */
> + pinctrl_uart5_dte: uart5-dtegrp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL1__UART5_RX_DATA 0x1b0b1
> + MX6QDL_PAD_KEY_ROW1__UART5_TX_DATA 0x1b0b1
> + >;
> + };
> + };
> +
> + usbh {
> + pinctrl_regulator_usbh_pwr: gpio_regulator_usbh_pwr {
> + fsl,pins = <
> + /* USBH_EN */
> + MX6QDL_PAD_GPIO_0__GPIO1_IO00 PAD_CTRL_PU_22k
> + >;
> + };
> + };
> +
> + usbotg {
> + pinctrl_usbotg: usbotggrp {
> + fsl,pins = <
> + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
> + >;
> + };
> + pinctrl_regulator_usbotg_pwr: gpio_regulator_usbotg_pwr {
> + fsl,pins = <
> + /* USBO power en */
> + MX6QDL_PAD_EIM_D22__GPIO3_IO22 PAD_CTRL_PU_22k
> + >;
> + };
> + };
> +
> + usdhc {
> + pinctrl_mmc_cd: gpio_mmc_cd {
> + fsl,pins = <
> + /* MMC1 CD */
> + MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x000b0
> + >;
> + };
> + pinctrl_sd_cd: gpio_sd_cd {
> + fsl,pins = <
> + /* SD1 CD */
> + MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x000b0
> + >;
> + };
> + pinctrl_usdhc1: usdhc1grp {
> + fsl,pins = <
> + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071
> + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10071
> + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17071
> + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17071
> + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17071
> + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17071
> + MX6QDL_PAD_NANDF_D0__SD1_DATA4 0x17071
> + MX6QDL_PAD_NANDF_D1__SD1_DATA5 0x17071
> + MX6QDL_PAD_NANDF_D2__SD1_DATA6 0x17071
> + MX6QDL_PAD_NANDF_D3__SD1_DATA7 0x17071
> + >;
> + };
> + pinctrl_usdhc2: usdhc2grp {
> + fsl,pins = <
> + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17071
> + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10071
> + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17071
> + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17071
> + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17071
> + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17071
> + >;
> + };
> + };
> +};
> +
> +&ldb {
> + status = "okay";
> +};
> +
> +&pwm1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_pwm1>;
> + status = "disabled";
> +};
> +
> +&pwm2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_pwm2>;
> + status = "disabled";
> +};
> +
> +&pwm3 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_pwm3>;
> + status = "disabled";
> +};
> +
> +&pwm4 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_pwm4>;
> + status = "disabled";
> +};
> +
> +&spdif {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spdif>;
> + status = "disabled";
> +};
> +
> +&ssi1 {
> + fsl,mode = "i2s-slave";
> + status = "okay";
> +};
> +
> +&uart1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart1_dte &pinctrl_uart1_ctrl>;
> + fsl,dte-mode;
> + fsl,uart-has-rtscts;
> + status = "disabled";
> +};
> +
> +&uart2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart2_dte>;
> + fsl,dte-mode;
> + fsl,uart-has-rtscts;
> + status = "disabled";
> +};
> +
> +&uart4 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart4_dte>;
> + fsl,dte-mode;
> + status = "disabled";
> +};
> +
> +&uart5 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart5_dte>;
> + fsl,dte-mode;
> + status = "disabled";
> +};
> +
> +&usbh1 {
> + vbus-supply = <®_usb_host_vbus>;
> + status = "disabled";
> +};
> +
> +&usbotg {
> + vbus-supply = <®_usb_otg_vbus>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usbotg>;
> + disable-over-current;
> + status = "disabled";
> +};
> +
> +/* MMC1 */
> +&usdhc1 {
> + label = "MMC1";
This...
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
> + cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
> + vmmc-supply = <®_3p3v>;
> + bus-width = <8>;
> + voltage-ranges = <3300 3300>;
> + status = "disabled";
> +};
> +
> +/* SD1 */
> +&usdhc2 {
> + label = "SD1";
...and this seem not to be specified upstream? (at least not in
Documentation/devicetree/bindings/mmc/mmc.txt?)
Not sure about this... Or is label a common convention and hence
available for all nodes?
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>;
> + cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
> + vmmc-supply = <®_3p3v>;
> + bus-width = <4>;
> + voltage-ranges = <3300 3300>;
> + status = "disabled";
> +};
> +
> +/* eMMC */
> +&usdhc3 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usdhc3>;
> + vmmc-supply = <®_3p3v>;
> + bus-width = <8>;
> + voltage-ranges = <3300 3300>;
> + non-removable;
> + status = "okay";
> +};
> +
> +&weim {
> + status = "disabled"; /* weim signals not accessible on i.MX6 */
They are accessible on the i.MX6 SoC.. but maybe "on Apalis iMX6Q/D". Or
just remove the comment, since that is kind of what disabled says?
> +};
Otherwise:
Reviewed-by: Stefan Agner <stefan@agner.ch>
--
Stefan
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-07 6:29 ` Stefan Agner
0 siblings, 0 replies; 36+ messages in thread
From: Stefan Agner @ 2016-01-07 6:29 UTC (permalink / raw)
To: linux-arm-kernel
Hi Marcel,
On 2016-01-05 08:39, Marcel Ziswiler wrote:
> From: Petr ?tetiar <ynezz@true.cz>
>
> Signed-off-by: Petr ?tetiar <ynezz@true.cz>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
>
> Changes in v2:
> - clarify exact Apalis iMX6Q/D SoM type in cover letter
> - clarify exact Apalis iMX6Q/D module type and Ixora carrier board in model
> node
> - got rid of obsolete mmc aliases
> - working SGTL5000 audio/sound integration
> - working STMPE811 touch screen controller integration
> - integrated review feedback from Lucas
> - left and even added some more comments as I don't see why putting any
> explanatory comments in dts' should be such a bad thing to do
> - completely got rid of the memory node as that is something typically filled
> in by the boot loader e.g. U-Boot
> - without the regulators simple-bus it no longer boots
> - even though we supposedly shipped a few hundred V1.0a modules drop DCE UART
> support for now and simplify file layout
> - replaced obsolete no-1-8-v by mainline supported voltage-ranges = <3300 3300>
> usdhc property and yes card detects are indeed active low (;-p)
> - integrated review feedback from Stefan
> - fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver to be
> enabled)
> - fixed HDMI DDC (requires GPIO-based bitbanging I2C to be enabled)
> - fixed SPDIF
>
> arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1040 +++++++++++++++++++++++++++++++++
> 1 file changed, 1040 insertions(+)
> create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
>
> diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> new file mode 100644
> index 0000000..6104e2e
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> @@ -0,0 +1,1040 @@
> +/*
> + * Copyright 2014-2016 Toradex AG
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + * Copyright 2011 Linaro Ltd.
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + * a) This file is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This file is distributed in the hope that it will be useful
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Or, alternatively
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +#include <dt-bindings/gpio/gpio.h>
> +
> +/ {
> + model = "Toradex Apalis iMX6Q/D Module";
> + compatible = "toradex,apalis_imx6q", "fsl,imx6q";
> +
> + backlight: backlight {
> + compatible = "pwm-backlight";
> + pwms = <&pwm4 0 5000000>;
> + status = "disabled";
> + };
> +
> + /* DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 */
> + i2cddc: i2c at 0 {
> + compatible = "i2c-gpio";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c_ddc>;
> + gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
> + &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
> + >;
> + i2c-gpio,delay-us = <2>; /* ~100 kHz */
> + status = "okay";
> + };
> +
> + regulators {
> + compatible = "simple-bus";
> +
> + reg_1p8v: 1p8v {
> + compatible = "regulator-fixed";
> + regulator-name = "1P8V";
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-always-on;
> + };
> +
> + reg_2p5v: 2p5v {
> + compatible = "regulator-fixed";
> + regulator-name = "2P5V";
> + regulator-min-microvolt = <2500000>;
> + regulator-max-microvolt = <2500000>;
> + regulator-always-on;
> + };
> +
> + reg_3p3v: 3p3v {
> + compatible = "regulator-fixed";
> + regulator-name = "3P3V";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + reg_usb_otg_vbus: usb_otg_vbus {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_regulator_usbotg_pwr>;
> + regulator-name = "usb_otg_vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + status = "disabled";
> + };
> +
> + /* on module usb hub */
> + reg_usb_host_vbus_hub: usb_host_vbus_hub {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_regulator_usbhub_pwr>;
> + regulator-name = "usb_host_vbus_hub";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + gpio = <&gpio3 28 GPIO_ACTIVE_HIGH>;
> + startup-delay-us = <2000>;
> + enable-active-high;
> + status = "okay";
> + };
> +
> + reg_usb_host_vbus: usb_host_vbus {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_regulator_usbh_pwr>;
> + regulator-name = "usb_host_vbus";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + vin-supply = <®_usb_host_vbus_hub>;
> + status = "disabled";
> + };
> + };
> +
> + sound {
> + compatible = "fsl,imx-audio-sgtl5000";
> + model = "imx6q-apalis-sgtl5000";
> + ssi-controller = <&ssi1>;
> + audio-codec = <&codec>;
> + audio-routing =
> + "LINE_IN", "Line In Jack",
> + "MIC_IN", "Mic Jack",
> + "Mic Jack", "Mic Bias",
> + "Headphone Jack", "HP_OUT";
> + mux-int-port = <1>;
> + mux-ext-port = <4>;
> + };
> +
> + sound_spdif: sound-spdif {
> + compatible = "fsl,imx-audio-spdif";
> + model = "imx-spdif";
> + spdif-controller = <&spdif>;
> + spdif-in;
> + spdif-out;
> + status = "disabled";
> + };
> +};
> +
> +&audmux {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_audmux &pinctrl_audmux_mclk>;
> + status = "okay";
> +};
> +
> +/* Apalis SPI1 */
> +&ecspi1 {
> + fsl,spi-num-chipselects = <1>;
> + cs-gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_spi_cs1>;
> + status = "disabled";
> +};
> +
> +/* Apalis SPI2 */
> +&ecspi2 {
> + fsl,spi-num-chipselects = <1>;
> + cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_ecspi2 &pinctrl_spi_cs2>;
> + status = "disabled";
> +};
> +
> +&fec {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_enet &pinctrl_enet_ctrl>;
> + phy-mode = "rgmii";
> + phy-handle = <ðphy>;
> + phy-reset-duration = <10>;
> + phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
> + status = "okay";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + ethphy: ethernet-phy at 7 {
> + interrupt-parent = <&gpio1>;
> + interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
> + reg = <7>;
> + };
> + };
> +};
> +
> +&can1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_flexcan1>;
> + status = "disabled";
> +};
> +
> +&can2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_flexcan2>;
> + status = "disabled";
> +};
> +
> +&hdmi {
> + ddc-i2c-bus = <&i2cddc>;
> + status = "okay";
> +};
> +
> +/*
> + * GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier
> + * board)
> + */
> +&i2c1 {
> + clock-frequency = <100000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c1>;
> + status = "disabled";
> +};
> +
> +&i2c2 {
> + clock-frequency = <100000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c2>;
> + status = "okay";
> +
> + pmic: pfuze100 at 08 {
> + compatible = "fsl,pfuze100";
> + reg = <0x08>;
> +
> + regulators {
> + sw1a_reg: sw1ab {
> + regulator-min-microvolt = <300000>;
> + regulator-max-microvolt = <1875000>;
> + regulator-boot-on;
> + regulator-always-on;
> + regulator-ramp-delay = <6250>;
> + };
> +
> + sw1c_reg: sw1c {
> + regulator-min-microvolt = <300000>;
> + regulator-max-microvolt = <1875000>;
> + regulator-boot-on;
> + regulator-always-on;
> + regulator-ramp-delay = <6250>;
> + };
> +
> + sw3a_reg: sw3a {
> + regulator-min-microvolt = <400000>;
> + regulator-max-microvolt = <1975000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + swbst_reg: swbst {
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5150000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + snvs_reg: vsnvs {
> + regulator-min-microvolt = <1000000>;
> + regulator-max-microvolt = <3000000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vref_reg: vrefddr {
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen1_reg: vgen1 {
> + regulator-min-microvolt = <800000>;
> + regulator-max-microvolt = <1550000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen2_reg: vgen2 {
> + regulator-min-microvolt = <800000>;
> + regulator-max-microvolt = <1550000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen3_reg: vgen3 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen4_reg: vgen4 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen5_reg: vgen5 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + vgen6_reg: vgen6 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> + };
> + };
> +
> + codec: sgtl5000 at 0a {
> + compatible = "fsl,sgtl5000";
> + reg = <0x0a>;
> + clocks = <&clks 201>;
> + VDDA-supply = <®_2p5v>;
> + VDDIO-supply = <®_3p3v>;
Nit: The device tree bindings mention two more properties as required
properties:
micbias-resistor-k-ohms
micbias-voltage-m-volts
However, both have "If this node is not mentioned", hence I guess they
are actually optional, but maybe we want to set an explicit value here?
> + };
> +
> + /* STMPE811 touch screen controller */
> + stmpe811 at 41 {
> + compatible = "st,stmpe811";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_touch_int>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <0x41>;
> + interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
> + interrupt-parent = <&gpio4>;
> + interrupt-controller;
> + id = <0>;
> + blocks = <0x5>;
> + irq-trigger = <0x1>;
> + stmpe_touchscreen {
> + compatible = "st,stmpe-ts";
> + reg = <0>;
> + /* 3.25 MHz ADC clock speed */
> + st,adc-freq = <1>;
> + /* 8 sample average control */
> + st,ave-ctrl = <3>;
> + /* 7 length fractional part in z */
> + st,fraction-z = <7>;
> + /*
> + * 50 mA typical 80 mA max touchscreen drivers
> + * current limit value
> + */
> + st,i-drive = <1>;
> + /* 12-bit ADC */
> + st,mod-12b = <1>;
> + /* internal ADC reference */
> + st,ref-sel = <0>;
> + /* ADC converstion time: 80 clocks */
> + st,sample-time = <4>;
> + /* 1 ms panel driver settling time */
> + st,settling = <3>;
> + /* 5 ms touch detect interrupt delay */
> + st,touch-det-delay = <5>;
> + };
> + };
> +};
> +
> +/*
> + * GEN2_I2C, CAM: I2C3_SDA/SCL on MXM3 201/203 (unused)
> + */
> +&i2c3 {
> + clock-frequency = <100000>;
> + pinctrl-names = "default", "recovery";
> + pinctrl-0 = <&pinctrl_i2c3>;
> + pinctrl-1 = <&pinctrl_i2c3_recovery>;
> + scl-gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>;
> + sda-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
> + status = "disabled";
> +};
> +
> +/* PAD Ctrl values for common settings */
> +/*
> + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE |
> + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> + */
> +#define PAD_CTRL_HYS_PU 0x1b0b0
> +
> +/*
> + * (PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_MED |
> + * PAD_CTL_DSE_40ohm)
> + */
> +#define PAD_CTRL_HYS_PD 0x130b0
> +
> +/*
> + * (PAD_CTL_PUS_22K_UP | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_LOW |
> + * PAD_CTL_DSE_80ohm)
> + */
> +#define PAD_CTRL_PU_22k 0x0f058
> +
> +&iomuxc {
I think it is a convention to move iomuxc at the very end for better
readability of the rest. At least the Vybrid dts and the more recently
added imx7d-sdb.dts follow this rule.
> + ecspi {
> + pinctrl_ecspi1: ecspi1grp {
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT6__ECSPI1_MISO 0x100b1
> + MX6QDL_PAD_CSI0_DAT5__ECSPI1_MOSI 0x100b1
> + MX6QDL_PAD_CSI0_DAT4__ECSPI1_SCLK 0x100b1
> + >;
> + };
> + pinctrl_ecspi2: ecspi2grp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_OE__ECSPI2_MISO 0x100b1
> + MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI 0x100b1
> + MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK 0x100b1
> + >;
> + };
> + pinctrl_spi_cs1: spi_cs1 {
> + fsl,pins = <
> + /* SPI1 cs */
> + MX6QDL_PAD_CSI0_DAT7__GPIO5_IO25 0x000b1
> + >;
> + };
> + pinctrl_spi_cs2: spi_cs2 {
> + fsl,pins = <
> + /* SPI2 cs */
> + MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x000b1
> + >;
> + };
> + };
> +
> + flexcan {
> + pinctrl_flexcan1: flexcan1grp {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_7__FLEXCAN1_TX 0x1b0b0
> + MX6QDL_PAD_GPIO_8__FLEXCAN1_RX 0x1b0b0
> + >;
> + };
> + pinctrl_flexcan2: flexcan2grp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b0b0
> + MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0
> + >;
> + };
> + };
> +
> + gpio {
> + pinctrl_apalis_gpio1: apalis_gpio1 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_D4__GPIO2_IO04 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio2: apalis_gpio2 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_D5__GPIO2_IO05 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio3: apalis_gpio3 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_D6__GPIO2_IO06 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio4: apalis_gpio4 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_D7__GPIO2_IO07 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio5: apalis_gpio5 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_RB0__GPIO6_IO10 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio6: apalis_gpio6 {
> + fsl,pins = <
> + MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09
> + PAD_CTRL_HYS_PD
The 80 character limit normally is not enforced for device trees, hence
I would remove that line break here...
> + >;
> + };
> + pinctrl_apalis_gpio7: apalis_gpio7 {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_2__GPIO1_IO02 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_apalis_gpio8: apalis_gpio8 {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_6__GPIO1_IO06 PAD_CTRL_HYS_PD
> + >;
> + };
> + pinctrl_gpio_keys: gpio_keys {
> + fsl,pins = <
> + /* Power Button */
> + MX6QDL_PAD_GPIO_4__GPIO1_IO04 PAD_CTRL_HYS_PU
> + >;
> + };
> + };
> +
> + hdmi {
> + pinctrl_hdmi_cec: hdmicecgrp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
> + >;
> + };
> + };
> +
> + i2c {
> + pinctrl_i2c_ddc: i2c_ddc {
> + fsl,pins = <
> + /* DDC bitbang */
> + MX6QDL_PAD_EIM_EB2__GPIO2_IO30 PAD_CTRL_HYS_PU
> + MX6QDL_PAD_EIM_D16__GPIO3_IO16 PAD_CTRL_HYS_PU
> + >;
> + };
> + pinctrl_i2c1: i2c1grp {
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
> + MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
> + >;
> + };
> + pinctrl_i2c3: i2c3grp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
> + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
> + >;
> + };
> + pinctrl_i2c3_recovery: i2c3-recoverygrp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_D17__GPIO3_IO17 0x4001b8b1
> + MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x4001b8b1
> + >;
> + };
> + };
> +
> + /* pins used on module */
> + imx6q-apalis {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_reset_moci &pinctrl_emmc_reset>;
> + pinctrl_audmux: audmuxgrp {
> + fsl,pins = <
> + MX6QDL_PAD_DISP0_DAT20__AUD4_TXC 0x130b0
> + MX6QDL_PAD_DISP0_DAT21__AUD4_TXD 0x130b0
> + MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS 0x130b0
> + MX6QDL_PAD_DISP0_DAT23__AUD4_RXD 0x130b0
> + >;
> + };
> + pinctrl_audmux_mclk: audmux_mclk {
> + fsl,pins = <
> + /* SGTL5000 sys_mclk */
> + MX6QDL_PAD_GPIO_5__CCM_CLKO1 0x130b0
> + >;
> + };
> + pinctrl_emmc_reset: emmc_reset {
> + fsl,pins = <
> + /* eMMC reset, leave it alone */
> + MX6QDL_PAD_SD3_RST__GPIO7_IO08 PAD_CTRL_PU_22k
> + >;
> + };
> + pinctrl_enet: enetgrp {
> + fsl,pins = <
> + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x100b0
> + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x100b0
> + MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x100b0
> + MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x100b0
> + MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x100b0
> + MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x100b0
> + MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x100b0
> + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x100b0
> + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x100b0
> + MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
> + MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
> + MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
> + MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
> + MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
> + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
> + >;
> + };
> + pinctrl_enet_ctrl: enet_ctrlgrp {
> + fsl,pins = <
> + /* Ethernet PHY reset */
> + MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x000b0
> + /* Ethernet PHY interrupt */
> + MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x000b1
> + >;
> + };
> + pinctrl_i2c2: i2c2grp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
> + MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
> + >;
> + };
> + pinctrl_ipu2_vdac: ipu2vdacgrp {
> + fsl,pins = <
> + MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK 0xd1
> + MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN15 0xd1
> + MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN02 0xd1
> + MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN03 0xd1
> + MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_DATA00 0xf9
> + MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_DATA01 0xf9
> + MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_DATA02 0xf9
> + MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_DATA03 0xf9
> + MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_DATA04 0xf9
> + MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_DATA05 0xf9
> + MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_DATA06 0xf9
> + MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_DATA07 0xf9
> + MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_DATA08 0xf9
> + MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_DATA09 0xf9
> + MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0_DATA10 0xf9
> + MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0_DATA11 0xf9
> + MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0_DATA12 0xf9
> + MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0_DATA13 0xf9
> + MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0_DATA14 0xf9
> + MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0_DATA15 0xf9
> + >;
> + };
> + pinctrl_regulator_usbhub_pwr: gpio_regulator_usbhub_pwr {
> + fsl,pins = <
> + /* USBH_HUB_EN */
> + MX6QDL_PAD_EIM_D28__GPIO3_IO28 PAD_CTRL_PU_22k
> + >;
> + };
> + pinctrl_reset_moci: gpio_reset_moci {
> + fsl,pins = <
> + /* RESET_MOCI control */
> + MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28
> + PAD_CTRL_PU_22k
> + >;
> + };
> + pinctrl_touch_int: touch_intgrp {
> + fsl,pins = <
> + /* STMPE811 interrupt */
> + MX6QDL_PAD_KEY_COL2__GPIO4_IO10 PAD_CTRL_HYS_PU
> + >;
> + };
> + pinctrl_usdhc3: usdhc3grp {
> + fsl,pins = <
> + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
> + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
> + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
> + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
> + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
> + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
> + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
> + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
> + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
> + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
> + >;
> + };
> + pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /* 100Mhz */
I do not have a strong opinion on comments, but if they are pure
duplication of what is already there, I kind of prefer to not add
them...
> + fsl,pins = <
> + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170B9
> + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100B9
> + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170B9
> + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170B9
> + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170B9
> + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170B9
> + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170B9
> + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170B9
> + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170B9
> + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170B9
> + >;
> + };
> + pinctrl_usdhc3_200mhz: usdhc3grp-200mhz { /* 200Mhz */
> + fsl,pins = <
> + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x170F9
> + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x100F9
> + MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x170F9
> + MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x170F9
> + MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x170F9
> + MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x170F9
> + MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x170F9
> + MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x170F9
> + MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x170F9
> + MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x170F9
> + >;
> + };
> + };
> +
> + ipu1 {
> + pinctrl_ipu1_lcdif: ipu1lcdifgrp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_A16__IPU1_DI1_DISP_CLK 0x61
> + /* DE */
> + MX6QDL_PAD_EIM_DA10__IPU1_DI1_PIN15 0x61
> + /* HSync */
> + MX6QDL_PAD_EIM_DA11__IPU1_DI1_PIN02 0x61
> + /* VSync */
> + MX6QDL_PAD_EIM_DA12__IPU1_DI1_PIN03 0x61
> + MX6QDL_PAD_EIM_DA9__IPU1_DISP1_DATA00 0x61
> + MX6QDL_PAD_EIM_DA8__IPU1_DISP1_DATA01 0x61
> + MX6QDL_PAD_EIM_DA7__IPU1_DISP1_DATA02 0x61
> + MX6QDL_PAD_EIM_DA6__IPU1_DISP1_DATA03 0x61
> + MX6QDL_PAD_EIM_DA5__IPU1_DISP1_DATA04 0x61
> + MX6QDL_PAD_EIM_DA4__IPU1_DISP1_DATA05 0x61
> + MX6QDL_PAD_EIM_DA3__IPU1_DISP1_DATA06 0x61
> + MX6QDL_PAD_EIM_DA2__IPU1_DISP1_DATA07 0x61
> + MX6QDL_PAD_EIM_DA1__IPU1_DISP1_DATA08 0x61
> + MX6QDL_PAD_EIM_DA0__IPU1_DISP1_DATA09 0x61
> + MX6QDL_PAD_EIM_EB1__IPU1_DISP1_DATA10 0x61
> + MX6QDL_PAD_EIM_EB0__IPU1_DISP1_DATA11 0x61
> + MX6QDL_PAD_EIM_A17__IPU1_DISP1_DATA12 0x61
> + MX6QDL_PAD_EIM_A18__IPU1_DISP1_DATA13 0x61
> + MX6QDL_PAD_EIM_A19__IPU1_DISP1_DATA14 0x61
> + MX6QDL_PAD_EIM_A20__IPU1_DISP1_DATA15 0x61
> + MX6QDL_PAD_EIM_A21__IPU1_DISP1_DATA16 0x61
> + MX6QDL_PAD_EIM_A22__IPU1_DISP1_DATA17 0x61
> + MX6QDL_PAD_EIM_A23__IPU1_DISP1_DATA18 0x61
> + MX6QDL_PAD_EIM_A24__IPU1_DISP1_DATA19 0x61
> + MX6QDL_PAD_EIM_D31__IPU1_DISP1_DATA20 0x61
> + MX6QDL_PAD_EIM_D30__IPU1_DISP1_DATA21 0x61
> + MX6QDL_PAD_EIM_D26__IPU1_DISP1_DATA22 0x61
> + MX6QDL_PAD_EIM_D27__IPU1_DISP1_DATA23 0x61
> + >;
> + };
> + pinctrl_cam_mclk: cam_mclk {
> + fsl,pins = <
> + /* CAM sys_mclk */
> + MX6QDL_PAD_NANDF_CS2__CCM_CLKO2 0x00b0
> + >;
> + };
> + pinctrl_ipu1_csi0: ipu1csi0grp { /* parallel camera */
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12 0xb0b1
> + MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13 0xb0b1
> + MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14 0xb0b1
> + MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15 0xb0b1
> + MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16 0xb0b1
> + MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17 0xb0b1
> + MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18 0xb0b1
> + MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19 0xb0b1
> + MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0xb0b1
> + MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC 0xb0b1
> + MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC 0xb0b1
> + >;
> + };
> + };
> +
> + pwm {
> + pinctrl_pwm1: pwm1grp {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_9__PWM1_OUT 0x1b0b1
> + >;
> + };
> + pinctrl_pwm2: pwm2grp {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_1__PWM2_OUT 0x1b0b1
> + >;
> + };
> + pinctrl_pwm3: pwm3grp {
> + fsl,pins = <
> + MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
> + >;
> + };
> + pinctrl_pwm4: pwm4grp {
> + fsl,pins = <
> + MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x1b0b1
> + >;
> + };
> + };
> +
> + spdif {
> + pinctrl_spdif: spdifgrp {
> + fsl,pins = <
> + MX6QDL_PAD_GPIO_16__SPDIF_IN 0x1b0b0
> + MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0
> + >;
> + };
> + };
> +
> + uart1 {
> + pinctrl_uart1_dce: uart1-dcegrp {
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
> + MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
> + >;
> + };
> +
> + /* DTE mode */
> + pinctrl_uart1_dte: uart1-dtegrp {
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT10__UART1_RX_DATA 0x1b0b1
> + MX6QDL_PAD_CSI0_DAT11__UART1_TX_DATA 0x1b0b1
> + MX6QDL_PAD_EIM_D19__UART1_RTS_B 0x1b0b1
> + MX6QDL_PAD_EIM_D20__UART1_CTS_B 0x1b0b1
> + >;
> + };
> +
> + /* Additional DTR, DSR, DCD */
> + pinctrl_uart1_ctrl: uart1-ctrlgrp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_D23__UART1_DCD_B 0x1b0b0
> + MX6QDL_PAD_EIM_D24__UART1_DTR_B 0x1b0b0
> + MX6QDL_PAD_EIM_D25__UART1_DSR_B 0x1b0b0
> + >;
> + };
> + };
> +
> + uart2 {
> + pinctrl_uart2_dce: uart2-dcegrp {
> + fsl,pins = <
> + MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
> + MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
> + >;
> + };
> +
> + /* DTE mode */
> + pinctrl_uart2_dte: uart2grp-dte {
> + fsl,pins = <
> + MX6QDL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1
> + MX6QDL_PAD_SD4_DAT7__UART2_RX_DATA 0x1b0b1
> + MX6QDL_PAD_SD4_DAT6__UART2_RTS_B 0x1b0b1
> + MX6QDL_PAD_SD4_DAT5__UART2_CTS_B 0x1b0b1
> + >;
> + };
> + };
> +
> + uart4 {
> + pinctrl_uart4_dce: uart4-dcegrp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
> + MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
> + >;
> + };
> +
> + /* DTE mode */
> + pinctrl_uart4_dte: uart4-dtegrp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL0__UART4_RX_DATA 0x1b0b1
> + MX6QDL_PAD_KEY_ROW0__UART4_TX_DATA 0x1b0b1
> + >;
> + };
> + };
> +
> + uart5 {
> + pinctrl_uart5_dce: uart5-dcegrp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
> + MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
> + >;
> + };
> +
> + /* DTE mode */
> + pinctrl_uart5_dte: uart5-dtegrp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL1__UART5_RX_DATA 0x1b0b1
> + MX6QDL_PAD_KEY_ROW1__UART5_TX_DATA 0x1b0b1
> + >;
> + };
> + };
> +
> + usbh {
> + pinctrl_regulator_usbh_pwr: gpio_regulator_usbh_pwr {
> + fsl,pins = <
> + /* USBH_EN */
> + MX6QDL_PAD_GPIO_0__GPIO1_IO00 PAD_CTRL_PU_22k
> + >;
> + };
> + };
> +
> + usbotg {
> + pinctrl_usbotg: usbotggrp {
> + fsl,pins = <
> + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
> + >;
> + };
> + pinctrl_regulator_usbotg_pwr: gpio_regulator_usbotg_pwr {
> + fsl,pins = <
> + /* USBO power en */
> + MX6QDL_PAD_EIM_D22__GPIO3_IO22 PAD_CTRL_PU_22k
> + >;
> + };
> + };
> +
> + usdhc {
> + pinctrl_mmc_cd: gpio_mmc_cd {
> + fsl,pins = <
> + /* MMC1 CD */
> + MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x000b0
> + >;
> + };
> + pinctrl_sd_cd: gpio_sd_cd {
> + fsl,pins = <
> + /* SD1 CD */
> + MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x000b0
> + >;
> + };
> + pinctrl_usdhc1: usdhc1grp {
> + fsl,pins = <
> + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071
> + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10071
> + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17071
> + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17071
> + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17071
> + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17071
> + MX6QDL_PAD_NANDF_D0__SD1_DATA4 0x17071
> + MX6QDL_PAD_NANDF_D1__SD1_DATA5 0x17071
> + MX6QDL_PAD_NANDF_D2__SD1_DATA6 0x17071
> + MX6QDL_PAD_NANDF_D3__SD1_DATA7 0x17071
> + >;
> + };
> + pinctrl_usdhc2: usdhc2grp {
> + fsl,pins = <
> + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17071
> + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10071
> + MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17071
> + MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17071
> + MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17071
> + MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17071
> + >;
> + };
> + };
> +};
> +
> +&ldb {
> + status = "okay";
> +};
> +
> +&pwm1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_pwm1>;
> + status = "disabled";
> +};
> +
> +&pwm2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_pwm2>;
> + status = "disabled";
> +};
> +
> +&pwm3 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_pwm3>;
> + status = "disabled";
> +};
> +
> +&pwm4 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_pwm4>;
> + status = "disabled";
> +};
> +
> +&spdif {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spdif>;
> + status = "disabled";
> +};
> +
> +&ssi1 {
> + fsl,mode = "i2s-slave";
> + status = "okay";
> +};
> +
> +&uart1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart1_dte &pinctrl_uart1_ctrl>;
> + fsl,dte-mode;
> + fsl,uart-has-rtscts;
> + status = "disabled";
> +};
> +
> +&uart2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart2_dte>;
> + fsl,dte-mode;
> + fsl,uart-has-rtscts;
> + status = "disabled";
> +};
> +
> +&uart4 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart4_dte>;
> + fsl,dte-mode;
> + status = "disabled";
> +};
> +
> +&uart5 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart5_dte>;
> + fsl,dte-mode;
> + status = "disabled";
> +};
> +
> +&usbh1 {
> + vbus-supply = <®_usb_host_vbus>;
> + status = "disabled";
> +};
> +
> +&usbotg {
> + vbus-supply = <®_usb_otg_vbus>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usbotg>;
> + disable-over-current;
> + status = "disabled";
> +};
> +
> +/* MMC1 */
> +&usdhc1 {
> + label = "MMC1";
This...
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
> + cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
> + vmmc-supply = <®_3p3v>;
> + bus-width = <8>;
> + voltage-ranges = <3300 3300>;
> + status = "disabled";
> +};
> +
> +/* SD1 */
> +&usdhc2 {
> + label = "SD1";
...and this seem not to be specified upstream? (at least not in
Documentation/devicetree/bindings/mmc/mmc.txt?)
Not sure about this... Or is label a common convention and hence
available for all nodes?
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>;
> + cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
> + vmmc-supply = <®_3p3v>;
> + bus-width = <4>;
> + voltage-ranges = <3300 3300>;
> + status = "disabled";
> +};
> +
> +/* eMMC */
> +&usdhc3 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usdhc3>;
> + vmmc-supply = <®_3p3v>;
> + bus-width = <8>;
> + voltage-ranges = <3300 3300>;
> + non-removable;
> + status = "okay";
> +};
> +
> +&weim {
> + status = "disabled"; /* weim signals not accessible on i.MX6 */
They are accessible on the i.MX6 SoC.. but maybe "on Apalis iMX6Q/D". Or
just remove the comment, since that is kind of what disabled says?
> +};
Otherwise:
Reviewed-by: Stefan Agner <stefan@agner.ch>
--
Stefan
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: imx6: Add support for Toradex Ixora carrier board
@ 2016-01-07 6:38 ` Stefan Agner
0 siblings, 0 replies; 36+ messages in thread
From: Stefan Agner @ 2016-01-07 6:38 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: linux-arm-kernel, Lucas Stach, Russell King, Sascha Hauer,
Petr Štetiar, Shawn Guo, Fabio Estevam, Kumar Gala,
Ian Campbell, Joshua Clayton, Rob Herring, Pawel Moll,
Mark Rutland, devicetree, linux-kernel, Shawn Guo
Hi Marcel,
On 2016-01-05 08:39, Marcel Ziswiler wrote:
> From: Petr Štetiar <ynezz@true.cz>
>
> Signed-off-by: Petr Štetiar <ynezz@true.cz>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
>
> Changes in v2: None
>
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/imx6q-apalis-ixora.dts | 256 +++++++++++++++++++++++++++++++
> 2 files changed, 257 insertions(+)
> create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 44508dc..29b1aae 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -315,6 +315,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
> imx6dl-udoo.dtb \
> imx6dl-wandboard.dtb \
> imx6dl-wandboard-revb1.dtb \
> + imx6q-apalis-ixora.dtb \
> imx6q-apf6dev.dtb \
> imx6q-arm2.dtb \
> imx6q-cm-fx6.dtb \
> diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> new file mode 100644
> index 0000000..5494a13
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> @@ -0,0 +1,256 @@
> +/*
> + * Copyright 2014-2016 Toradex AG
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + * Copyright 2011 Linaro Ltd.
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + * a) This file is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This file is distributed in the hope that it will be useful
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Or, alternatively
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +/dts-v1/;
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +#include <dt-bindings/interrupt-controller/irq.h>
> +#include "imx6q.dtsi"
> +#include "imx6qdl-apalis.dtsi"
> +
> +/ {
> + model = "Toradex Apalis iMX6Q/D Module on Ixora Carrier Board";
> + compatible = "toradex,apalis_imx6q-ixora", "toradex,apalis_imx6q",
> + "fsl,imx6q";
> +
> + aliases {
> + i2c0 = &i2cddc;
> + i2c1 = &i2c1;
> + i2c2 = &i2c2;
> + i2c3 = &i2c3;
> + };
> +
> + aliases {
> + rtc0 = &rtc_i2c;
> + rtc1 = "/soc/aips-bus@02000000/snvs@020cc000/snvs-rtc-lp@34";
Probably easier and better readable when using the label here
("&snvs_rtc").
> + };
> +
> + gpio-keys {
> + compatible = "gpio-keys";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_gpio_keys>;
> +
> + wakeup {
> + label = "Wake-Up";
> + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
> + linux,code = <KEY_WAKEUP>;
> + debounce-interval = <10>;
> + gpio-key,wakeup;
> + };
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_leds_ixora>;
> +
> + led4-green {
> + label = "LED_4_GREEN";
> + gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
> + };
> +
> + led4-red {
> + label = "LED_4_RED";
> + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
> + };
> +
> + led5-green {
> + label = "LED_5_GREEN";
> + gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
> + };
> +
> + led5-red {
> + label = "LED_5_RED";
> + gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
> + };
> + };
> +
> + pwmleds {
> + compatible = "pwm-leds";
> + ledpwm1 {
> + label = "PWM1";
> + pwms = <&pwm1 0 50000>;
> + max-brightness = <255>;
> + };
> +
> + ledpwm2 {
> + label = "PWM2";
> + pwms = <&pwm2 0 50000>;
> + max-brightness = <255>;
> + };
> +
> + ledpwm3 {
> + label = "PWM3";
> + pwms = <&pwm3 0 50000>;
> + max-brightness = <255>;
> + };
> + };
> +
> + regulators {
> + reg_usb_otg_vbus: usb_otg_vbus {
> + status = "okay";
> + };
> +
> + reg_usb_host_vbus: usb_host_vbus {
> + status = "okay";
> + };
> + };
> +};
> +
> +&backlight {
> + brightness-levels = <0 127 191 223 239 247 251 255>;
> + default-brightness-level = <1>;
> + status = "okay";
> +};
> +
> +&can1 {
> + status = "okay";
> +};
> +
> +&can2 {
> + status = "okay";
> +};
> +
> +/* GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
> +&i2c1 {
> + status = "okay";
> +
> + cat24c02@50 {
According to devicetree.org, nodes are named according to what kind of
device it represents. Hence this should be eeprom@50.
> + compatible = "atmel,24c02";
> + reg = <0x50>;
> + };
> +
> + /* M41T0M6 real time clock on carrier board */
> + rtc_i2c: rtc@68 {
> + compatible = "st,m41t00";
> + reg = <0x68>;
> + };
> +};
> +
> +&iomuxc {
This should go to the end of the device tree.
Otherwise looks good to me:
Reviewed-by: Stefan Agner <stefan@agner.ch>
--
Stefan
> + /*
> + * Mux the Apalis GPIOs, GPIO7 used for PCIe reset,
> + * GPIO5, 6 used by optional fusion_F0710A kernel module
> + */
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
> + &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
> + &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
> + &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8>;
> +
> + leds_ixora {
> + pinctrl_leds_ixora: leds-ixora {
> + fsl,pins = <
> + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 PAD_CTRL_HYS_PU
> + MX6QDL_PAD_SD1_DAT3__GPIO1_IO21 PAD_CTRL_HYS_PU
> + MX6QDL_PAD_NANDF_D1__GPIO2_IO01 PAD_CTRL_HYS_PU
> + MX6QDL_PAD_NANDF_D2__GPIO2_IO02 PAD_CTRL_HYS_PU
> + >;
> + };
> + };
> +};
> +
> +&pcie {
> + /* active-low meaning opposite of regular PERST# active-low polarity */
> + reset-gpio = <&gpio1 28 GPIO_ACTIVE_LOW>;
> + status = "okay";
> +};
> +
> +&pwm1 {
> + status = "okay";
> +};
> +
> +&pwm2 {
> + status = "okay";
> +};
> +
> +&pwm3 {
> + status = "okay";
> +};
> +
> +&pwm4 {
> + status = "okay";
> +};
> +
> +&sata {
> + status = "okay";
> +};
> +
> +&sound_spdif {
> + status = "okay";
> +};
> +
> +&spdif {
> + status = "okay";
> +};
> +
> +&uart1 {
> + status = "okay";
> +};
> +
> +&uart2 {
> + status = "okay";
> +};
> +
> +&uart4 {
> + status = "okay";
> +};
> +
> +&uart5 {
> + status = "okay";
> +};
> +
> +&usbh1 {
> + status = "okay";
> +};
> +
> +&usbotg {
> + status = "okay";
> +};
> +
> +/* SD1 */
> +&usdhc2 {
> + status = "okay";
> +};
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: imx6: Add support for Toradex Ixora carrier board
@ 2016-01-07 6:38 ` Stefan Agner
0 siblings, 0 replies; 36+ messages in thread
From: Stefan Agner @ 2016-01-07 6:38 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Lucas Stach,
Russell King, Sascha Hauer, Petr Štetiar, Shawn Guo,
Fabio Estevam, Kumar Gala, Ian Campbell, Joshua Clayton,
Rob Herring, Pawel Moll, Mark Rutland,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Shawn Guo
Hi Marcel,
On 2016-01-05 08:39, Marcel Ziswiler wrote:
> From: Petr Štetiar <ynezz-knWk7/PSn+s@public.gmane.org>
>
> Signed-off-by: Petr Štetiar <ynezz-knWk7/PSn+s@public.gmane.org>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler-2KBjVHiyJgBBDgjK7y7TUQ@public.gmane.org>
> ---
>
> Changes in v2: None
>
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/imx6q-apalis-ixora.dts | 256 +++++++++++++++++++++++++++++++
> 2 files changed, 257 insertions(+)
> create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 44508dc..29b1aae 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -315,6 +315,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
> imx6dl-udoo.dtb \
> imx6dl-wandboard.dtb \
> imx6dl-wandboard-revb1.dtb \
> + imx6q-apalis-ixora.dtb \
> imx6q-apf6dev.dtb \
> imx6q-arm2.dtb \
> imx6q-cm-fx6.dtb \
> diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> new file mode 100644
> index 0000000..5494a13
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> @@ -0,0 +1,256 @@
> +/*
> + * Copyright 2014-2016 Toradex AG
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + * Copyright 2011 Linaro Ltd.
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + * a) This file is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This file is distributed in the hope that it will be useful
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Or, alternatively
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +/dts-v1/;
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +#include <dt-bindings/interrupt-controller/irq.h>
> +#include "imx6q.dtsi"
> +#include "imx6qdl-apalis.dtsi"
> +
> +/ {
> + model = "Toradex Apalis iMX6Q/D Module on Ixora Carrier Board";
> + compatible = "toradex,apalis_imx6q-ixora", "toradex,apalis_imx6q",
> + "fsl,imx6q";
> +
> + aliases {
> + i2c0 = &i2cddc;
> + i2c1 = &i2c1;
> + i2c2 = &i2c2;
> + i2c3 = &i2c3;
> + };
> +
> + aliases {
> + rtc0 = &rtc_i2c;
> + rtc1 = "/soc/aips-bus@02000000/snvs@020cc000/snvs-rtc-lp@34";
Probably easier and better readable when using the label here
("&snvs_rtc").
> + };
> +
> + gpio-keys {
> + compatible = "gpio-keys";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_gpio_keys>;
> +
> + wakeup {
> + label = "Wake-Up";
> + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
> + linux,code = <KEY_WAKEUP>;
> + debounce-interval = <10>;
> + gpio-key,wakeup;
> + };
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_leds_ixora>;
> +
> + led4-green {
> + label = "LED_4_GREEN";
> + gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
> + };
> +
> + led4-red {
> + label = "LED_4_RED";
> + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
> + };
> +
> + led5-green {
> + label = "LED_5_GREEN";
> + gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
> + };
> +
> + led5-red {
> + label = "LED_5_RED";
> + gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
> + };
> + };
> +
> + pwmleds {
> + compatible = "pwm-leds";
> + ledpwm1 {
> + label = "PWM1";
> + pwms = <&pwm1 0 50000>;
> + max-brightness = <255>;
> + };
> +
> + ledpwm2 {
> + label = "PWM2";
> + pwms = <&pwm2 0 50000>;
> + max-brightness = <255>;
> + };
> +
> + ledpwm3 {
> + label = "PWM3";
> + pwms = <&pwm3 0 50000>;
> + max-brightness = <255>;
> + };
> + };
> +
> + regulators {
> + reg_usb_otg_vbus: usb_otg_vbus {
> + status = "okay";
> + };
> +
> + reg_usb_host_vbus: usb_host_vbus {
> + status = "okay";
> + };
> + };
> +};
> +
> +&backlight {
> + brightness-levels = <0 127 191 223 239 247 251 255>;
> + default-brightness-level = <1>;
> + status = "okay";
> +};
> +
> +&can1 {
> + status = "okay";
> +};
> +
> +&can2 {
> + status = "okay";
> +};
> +
> +/* GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
> +&i2c1 {
> + status = "okay";
> +
> + cat24c02@50 {
According to devicetree.org, nodes are named according to what kind of
device it represents. Hence this should be eeprom@50.
> + compatible = "atmel,24c02";
> + reg = <0x50>;
> + };
> +
> + /* M41T0M6 real time clock on carrier board */
> + rtc_i2c: rtc@68 {
> + compatible = "st,m41t00";
> + reg = <0x68>;
> + };
> +};
> +
> +&iomuxc {
This should go to the end of the device tree.
Otherwise looks good to me:
Reviewed-by: Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>
--
Stefan
> + /*
> + * Mux the Apalis GPIOs, GPIO7 used for PCIe reset,
> + * GPIO5, 6 used by optional fusion_F0710A kernel module
> + */
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
> + &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
> + &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
> + &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8>;
> +
> + leds_ixora {
> + pinctrl_leds_ixora: leds-ixora {
> + fsl,pins = <
> + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 PAD_CTRL_HYS_PU
> + MX6QDL_PAD_SD1_DAT3__GPIO1_IO21 PAD_CTRL_HYS_PU
> + MX6QDL_PAD_NANDF_D1__GPIO2_IO01 PAD_CTRL_HYS_PU
> + MX6QDL_PAD_NANDF_D2__GPIO2_IO02 PAD_CTRL_HYS_PU
> + >;
> + };
> + };
> +};
> +
> +&pcie {
> + /* active-low meaning opposite of regular PERST# active-low polarity */
> + reset-gpio = <&gpio1 28 GPIO_ACTIVE_LOW>;
> + status = "okay";
> +};
> +
> +&pwm1 {
> + status = "okay";
> +};
> +
> +&pwm2 {
> + status = "okay";
> +};
> +
> +&pwm3 {
> + status = "okay";
> +};
> +
> +&pwm4 {
> + status = "okay";
> +};
> +
> +&sata {
> + status = "okay";
> +};
> +
> +&sound_spdif {
> + status = "okay";
> +};
> +
> +&spdif {
> + status = "okay";
> +};
> +
> +&uart1 {
> + status = "okay";
> +};
> +
> +&uart2 {
> + status = "okay";
> +};
> +
> +&uart4 {
> + status = "okay";
> +};
> +
> +&uart5 {
> + status = "okay";
> +};
> +
> +&usbh1 {
> + status = "okay";
> +};
> +
> +&usbotg {
> + status = "okay";
> +};
> +
> +/* SD1 */
> +&usdhc2 {
> + status = "okay";
> +};
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 2/2] ARM: dts: imx6: Add support for Toradex Ixora carrier board
@ 2016-01-07 6:38 ` Stefan Agner
0 siblings, 0 replies; 36+ messages in thread
From: Stefan Agner @ 2016-01-07 6:38 UTC (permalink / raw)
To: linux-arm-kernel
Hi Marcel,
On 2016-01-05 08:39, Marcel Ziswiler wrote:
> From: Petr ?tetiar <ynezz@true.cz>
>
> Signed-off-by: Petr ?tetiar <ynezz@true.cz>
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> ---
>
> Changes in v2: None
>
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/imx6q-apalis-ixora.dts | 256 +++++++++++++++++++++++++++++++
> 2 files changed, 257 insertions(+)
> create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 44508dc..29b1aae 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -315,6 +315,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
> imx6dl-udoo.dtb \
> imx6dl-wandboard.dtb \
> imx6dl-wandboard-revb1.dtb \
> + imx6q-apalis-ixora.dtb \
> imx6q-apf6dev.dtb \
> imx6q-arm2.dtb \
> imx6q-cm-fx6.dtb \
> diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> new file mode 100644
> index 0000000..5494a13
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> @@ -0,0 +1,256 @@
> +/*
> + * Copyright 2014-2016 Toradex AG
> + * Copyright 2012 Freescale Semiconductor, Inc.
> + * Copyright 2011 Linaro Ltd.
> + *
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> + *
> + * a) This file is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This file is distributed in the hope that it will be useful
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Or, alternatively
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + */
> +
> +/dts-v1/;
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +#include <dt-bindings/interrupt-controller/irq.h>
> +#include "imx6q.dtsi"
> +#include "imx6qdl-apalis.dtsi"
> +
> +/ {
> + model = "Toradex Apalis iMX6Q/D Module on Ixora Carrier Board";
> + compatible = "toradex,apalis_imx6q-ixora", "toradex,apalis_imx6q",
> + "fsl,imx6q";
> +
> + aliases {
> + i2c0 = &i2cddc;
> + i2c1 = &i2c1;
> + i2c2 = &i2c2;
> + i2c3 = &i2c3;
> + };
> +
> + aliases {
> + rtc0 = &rtc_i2c;
> + rtc1 = "/soc/aips-bus at 02000000/snvs at 020cc000/snvs-rtc-lp at 34";
Probably easier and better readable when using the label here
("&snvs_rtc").
> + };
> +
> + gpio-keys {
> + compatible = "gpio-keys";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_gpio_keys>;
> +
> + wakeup {
> + label = "Wake-Up";
> + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
> + linux,code = <KEY_WAKEUP>;
> + debounce-interval = <10>;
> + gpio-key,wakeup;
> + };
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_leds_ixora>;
> +
> + led4-green {
> + label = "LED_4_GREEN";
> + gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
> + };
> +
> + led4-red {
> + label = "LED_4_RED";
> + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
> + };
> +
> + led5-green {
> + label = "LED_5_GREEN";
> + gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
> + };
> +
> + led5-red {
> + label = "LED_5_RED";
> + gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
> + };
> + };
> +
> + pwmleds {
> + compatible = "pwm-leds";
> + ledpwm1 {
> + label = "PWM1";
> + pwms = <&pwm1 0 50000>;
> + max-brightness = <255>;
> + };
> +
> + ledpwm2 {
> + label = "PWM2";
> + pwms = <&pwm2 0 50000>;
> + max-brightness = <255>;
> + };
> +
> + ledpwm3 {
> + label = "PWM3";
> + pwms = <&pwm3 0 50000>;
> + max-brightness = <255>;
> + };
> + };
> +
> + regulators {
> + reg_usb_otg_vbus: usb_otg_vbus {
> + status = "okay";
> + };
> +
> + reg_usb_host_vbus: usb_host_vbus {
> + status = "okay";
> + };
> + };
> +};
> +
> +&backlight {
> + brightness-levels = <0 127 191 223 239 247 251 255>;
> + default-brightness-level = <1>;
> + status = "okay";
> +};
> +
> +&can1 {
> + status = "okay";
> +};
> +
> +&can2 {
> + status = "okay";
> +};
> +
> +/* GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
> +&i2c1 {
> + status = "okay";
> +
> + cat24c02 at 50 {
According to devicetree.org, nodes are named according to what kind of
device it represents. Hence this should be eeprom at 50.
> + compatible = "atmel,24c02";
> + reg = <0x50>;
> + };
> +
> + /* M41T0M6 real time clock on carrier board */
> + rtc_i2c: rtc at 68 {
> + compatible = "st,m41t00";
> + reg = <0x68>;
> + };
> +};
> +
> +&iomuxc {
This should go to the end of the device tree.
Otherwise looks good to me:
Reviewed-by: Stefan Agner <stefan@agner.ch>
--
Stefan
> + /*
> + * Mux the Apalis GPIOs, GPIO7 used for PCIe reset,
> + * GPIO5, 6 used by optional fusion_F0710A kernel module
> + */
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
> + &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
> + &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
> + &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8>;
> +
> + leds_ixora {
> + pinctrl_leds_ixora: leds-ixora {
> + fsl,pins = <
> + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17 PAD_CTRL_HYS_PU
> + MX6QDL_PAD_SD1_DAT3__GPIO1_IO21 PAD_CTRL_HYS_PU
> + MX6QDL_PAD_NANDF_D1__GPIO2_IO01 PAD_CTRL_HYS_PU
> + MX6QDL_PAD_NANDF_D2__GPIO2_IO02 PAD_CTRL_HYS_PU
> + >;
> + };
> + };
> +};
> +
> +&pcie {
> + /* active-low meaning opposite of regular PERST# active-low polarity */
> + reset-gpio = <&gpio1 28 GPIO_ACTIVE_LOW>;
> + status = "okay";
> +};
> +
> +&pwm1 {
> + status = "okay";
> +};
> +
> +&pwm2 {
> + status = "okay";
> +};
> +
> +&pwm3 {
> + status = "okay";
> +};
> +
> +&pwm4 {
> + status = "okay";
> +};
> +
> +&sata {
> + status = "okay";
> +};
> +
> +&sound_spdif {
> + status = "okay";
> +};
> +
> +&spdif {
> + status = "okay";
> +};
> +
> +&uart1 {
> + status = "okay";
> +};
> +
> +&uart2 {
> + status = "okay";
> +};
> +
> +&uart4 {
> + status = "okay";
> +};
> +
> +&uart5 {
> + status = "okay";
> +};
> +
> +&usbh1 {
> + status = "okay";
> +};
> +
> +&usbotg {
> + status = "okay";
> +};
> +
> +/* SD1 */
> +&usdhc2 {
> + status = "okay";
> +};
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
2016-01-07 6:29 ` Stefan Agner
(?)
@ 2016-01-08 8:28 ` Marcel Ziswiler
-1 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 8:28 UTC (permalink / raw)
To: stefan
Cc: linux-kernel, shawn.guo, robh+dt, pawel.moll, devicetree,
festevam, mark.rutland, galak, ijc+devicetree, stillcompiling,
ynezz, linux-arm-kernel, shawnguo, l.stach, kernel, linux
Hi Stefan
On Wed, 2016-01-06 at 22:29 -0800, Stefan Agner wrote:
> Hi Marcel,
>
> On 2016-01-05 08:39, Marcel Ziswiler wrote:
> > From: Petr Štetiar <ynezz@true.cz>
> >
> > Signed-off-by: Petr Štetiar <ynezz@true.cz>
> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > ---
> >
> > Changes in v2:
> > - clarify exact Apalis iMX6Q/D SoM type in cover letter
> > - clarify exact Apalis iMX6Q/D module type and Ixora carrier board
> > in model
> > node
> > - got rid of obsolete mmc aliases
> > - working SGTL5000 audio/sound integration
> > - working STMPE811 touch screen controller integration
> > - integrated review feedback from Lucas
> > - left and even added some more comments as I don't see why putting
> > any
> > explanatory comments in dts' should be such a bad thing to do
> > - completely got rid of the memory node as that is something
> > typically filled
> > in by the boot loader e.g. U-Boot
> > - without the regulators simple-bus it no longer boots
> > - even though we supposedly shipped a few hundred V1.0a modules
> > drop DCE UART
> > support for now and simplify file layout
> > - replaced obsolete no-1-8-v by mainline supported voltage-ranges =
> > <3300 3300>
> > usdhc property and yes card detects are indeed active low (;-p)
> > - integrated review feedback from Stefan
> > - fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver
> > to be
> > enabled)
> > - fixed HDMI DDC (requires GPIO-based bitbanging I2C to be enabled)
> > - fixed SPDIF
> >
> > arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1040
> > +++++++++++++++++++++++++++++++++
> > 1 file changed, 1040 insertions(+)
> > create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
> >
> > diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> > b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> > new file mode 100644
> > index 0000000..6104e2e
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> > @@ -0,0 +1,1040 @@
> > +/*
> > + * Copyright 2014-2016 Toradex AG
> > + * Copyright 2012 Freescale Semiconductor, Inc.
> > + * Copyright 2011 Linaro Ltd.
> > + *
> > + * This file is dual-licensed: you can use it either under the
> > terms
> > + * of the GPL or the X11 license, at your option. Note that this
> > dual
> > + * licensing only applies to this file, and not this project as a
> > + * whole.
> > + *
> > + * a) This file is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU General Public License
> > + * version 2 as published by the Free Software Foundation.
> > + *
> > + * This file is distributed in the hope that it will be useful
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty
> > of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
> > the
> > + * GNU General Public License for more details.
> > + *
> > + * Or, alternatively
> > + *
> > + * b) Permission is hereby granted, free of charge, to any person
> > + * obtaining a copy of this software and associated
> > documentation
> > + * files (the "Software"), to deal in the Software without
> > + * restriction, including without limitation the rights to use
> > + * copy, modify, merge, publish, distribute, sublicense,
> > and/or
> > + * sell copies of the Software, and to permit persons to whom
> > the
> > + * Software is furnished to do so, subject to the following
> > + * conditions:
> > + *
> > + * The above copyright notice and this permission notice shall
> > be
> > + * included in all copies or substantial portions of the
> > Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
> > WARRANTIES
> > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > ARISING
> > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
> > OR
> > + * OTHER DEALINGS IN THE SOFTWARE.
> > + */
> > +
> > +#include <dt-bindings/gpio/gpio.h>
> > +
> > +/ {
> > + model = "Toradex Apalis iMX6Q/D Module";
> > + compatible = "toradex,apalis_imx6q", "fsl,imx6q";
> > +
> > + backlight: backlight {
> > + compatible = "pwm-backlight";
> > + pwms = <&pwm4 0 5000000>;
> > + status = "disabled";
> > + };
> > +
> > + /* DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 */
> > + i2cddc: i2c@0 {
> > + compatible = "i2c-gpio";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_i2c_ddc>;
> > + gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
> > + &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
> > + >;
> > + i2c-gpio,delay-us = <2>; /* ~100 kHz */
> > + status = "okay";
> > + };
> > +
> > + regulators {
> > + compatible = "simple-bus";
> > +
> > + reg_1p8v: 1p8v {
> > + compatible = "regulator-fixed";
> > + regulator-name = "1P8V";
> > + regulator-min-microvolt = <1800000>;
> > + regulator-max-microvolt = <1800000>;
> > + regulator-always-on;
> > + };
> > +
> > + reg_2p5v: 2p5v {
> > + compatible = "regulator-fixed";
> > + regulator-name = "2P5V";
> > + regulator-min-microvolt = <2500000>;
> > + regulator-max-microvolt = <2500000>;
> > + regulator-always-on;
> > + };
> > +
> > + reg_3p3v: 3p3v {
> > + compatible = "regulator-fixed";
> > + regulator-name = "3P3V";
> > + regulator-min-microvolt = <3300000>;
> > + regulator-max-microvolt = <3300000>;
> > + regulator-always-on;
> > + };
> > +
> > + reg_usb_otg_vbus: usb_otg_vbus {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 =
> > <&pinctrl_regulator_usbotg_pwr>;
> > + regulator-name = "usb_otg_vbus";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > + enable-active-high;
> > + status = "disabled";
> > + };
> > +
> > + /* on module usb hub */
> > + reg_usb_host_vbus_hub: usb_host_vbus_hub {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 =
> > <&pinctrl_regulator_usbhub_pwr>;
> > + regulator-name = "usb_host_vbus_hub";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio = <&gpio3 28 GPIO_ACTIVE_HIGH>;
> > + startup-delay-us = <2000>;
> > + enable-active-high;
> > + status = "okay";
> > + };
> > +
> > + reg_usb_host_vbus: usb_host_vbus {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_regulator_usbh_pwr>;
> > + regulator-name = "usb_host_vbus";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
> > + enable-active-high;
> > + vin-supply = <®_usb_host_vbus_hub>;
> > + status = "disabled";
> > + };
> > + };
> > +
> > + sound {
> > + compatible = "fsl,imx-audio-sgtl5000";
> > + model = "imx6q-apalis-sgtl5000";
> > + ssi-controller = <&ssi1>;
> > + audio-codec = <&codec>;
> > + audio-routing =
> > + "LINE_IN", "Line In Jack",
> > + "MIC_IN", "Mic Jack",
> > + "Mic Jack", "Mic Bias",
> > + "Headphone Jack", "HP_OUT";
> > + mux-int-port = <1>;
> > + mux-ext-port = <4>;
> > + };
> > +
> > + sound_spdif: sound-spdif {
> > + compatible = "fsl,imx-audio-spdif";
> > + model = "imx-spdif";
> > + spdif-controller = <&spdif>;
> > + spdif-in;
> > + spdif-out;
> > + status = "disabled";
> > + };
> > +};
> > +
> > +&audmux {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_audmux &pinctrl_audmux_mclk>;
> > + status = "okay";
> > +};
> > +
> > +/* Apalis SPI1 */
> > +&ecspi1 {
> > + fsl,spi-num-chipselects = <1>;
> > + cs-gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_spi_cs1>;
> > + status = "disabled";
> > +};
> > +
> > +/* Apalis SPI2 */
> > +&ecspi2 {
> > + fsl,spi-num-chipselects = <1>;
> > + cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_ecspi2 &pinctrl_spi_cs2>;
> > + status = "disabled";
> > +};
> > +
> > +&fec {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_enet &pinctrl_enet_ctrl>;
> > + phy-mode = "rgmii";
> > + phy-handle = <ðphy>;
> > + phy-reset-duration = <10>;
> > + phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
> > + status = "okay";
> > +
> > + mdio {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + ethphy: ethernet-phy@7 {
> > + interrupt-parent = <&gpio1>;
> > + interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
> > + reg = <7>;
> > + };
> > + };
> > +};
> > +
> > +&can1 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_flexcan1>;
> > + status = "disabled";
> > +};
> > +
> > +&can2 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_flexcan2>;
> > + status = "disabled";
> > +};
> > +
> > +&hdmi {
> > + ddc-i2c-bus = <&i2cddc>;
> > + status = "okay";
> > +};
> > +
> > +/*
> > + * GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier
> > + * board)
> > + */
> > +&i2c1 {
> > + clock-frequency = <100000>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_i2c1>;
> > + status = "disabled";
> > +};
> > +
> > +&i2c2 {
> > + clock-frequency = <100000>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_i2c2>;
> > + status = "okay";
> > +
> > + pmic: pfuze100@08 {
> > + compatible = "fsl,pfuze100";
> > + reg = <0x08>;
> > +
> > + regulators {
> > + sw1a_reg: sw1ab {
> > + regulator-min-microvolt =
> > <300000>;
> > + regulator-max-microvolt =
> > <1875000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + regulator-ramp-delay = <6250>;
> > + };
> > +
> > + sw1c_reg: sw1c {
> > + regulator-min-microvolt =
> > <300000>;
> > + regulator-max-microvolt =
> > <1875000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + regulator-ramp-delay = <6250>;
> > + };
> > +
> > + sw3a_reg: sw3a {
> > + regulator-min-microvolt =
> > <400000>;
> > + regulator-max-microvolt =
> > <1975000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + swbst_reg: swbst {
> > + regulator-min-microvolt =
> > <5000000>;
> > + regulator-max-microvolt =
> > <5150000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + snvs_reg: vsnvs {
> > + regulator-min-microvolt =
> > <1000000>;
> > + regulator-max-microvolt =
> > <3000000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vref_reg: vrefddr {
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen1_reg: vgen1 {
> > + regulator-min-microvolt =
> > <800000>;
> > + regulator-max-microvolt =
> > <1550000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen2_reg: vgen2 {
> > + regulator-min-microvolt =
> > <800000>;
> > + regulator-max-microvolt =
> > <1550000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen3_reg: vgen3 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen4_reg: vgen4 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen5_reg: vgen5 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen6_reg: vgen6 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > + };
> > + };
> > +
> > + codec: sgtl5000@0a {
> > + compatible = "fsl,sgtl5000";
> > + reg = <0x0a>;
> > + clocks = <&clks 201>;
> > + VDDA-supply = <®_2p5v>;
> > + VDDIO-supply = <®_3p3v>;
>
> Nit: The device tree bindings mention two more properties as required
> properties:
> micbias-resistor-k-ohms
> micbias-voltage-m-volts
>
> However, both have "If this node is not mentioned", hence I guess
> they
> are actually optional, but maybe we want to set an explicit value
> here?
Remember we don't make use of any of that microphone bias stuff on any
of our Apalis hardware.
> > + };
> > +
> > + /* STMPE811 touch screen controller */
> > + stmpe811@41 {
> > + compatible = "st,stmpe811";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_touch_int>;
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + reg = <0x41>;
> > + interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
> > + interrupt-parent = <&gpio4>;
> > + interrupt-controller;
> > + id = <0>;
> > + blocks = <0x5>;
> > + irq-trigger = <0x1>;
> > + stmpe_touchscreen {
> > + compatible = "st,stmpe-ts";
> > + reg = <0>;
> > + /* 3.25 MHz ADC clock speed */
> > + st,adc-freq = <1>;
> > + /* 8 sample average control */
> > + st,ave-ctrl = <3>;
> > + /* 7 length fractional part in z */
> > + st,fraction-z = <7>;
> > + /*
> > + * 50 mA typical 80 mA max touchscreen
> > drivers
> > + * current limit value
> > + */
> > + st,i-drive = <1>;
> > + /* 12-bit ADC */
> > + st,mod-12b = <1>;
> > + /* internal ADC reference */
> > + st,ref-sel = <0>;
> > + /* ADC converstion time: 80 clocks */
> > + st,sample-time = <4>;
> > + /* 1 ms panel driver settling time */
> > + st,settling = <3>;
> > + /* 5 ms touch detect interrupt delay */
> > + st,touch-det-delay = <5>;
> > + };
> > + };
> > +};
> > +
> > +/*
> > + * GEN2_I2C, CAM: I2C3_SDA/SCL on MXM3 201/203 (unused)
> > + */
> > +&i2c3 {
> > + clock-frequency = <100000>;
> > + pinctrl-names = "default", "recovery";
> > + pinctrl-0 = <&pinctrl_i2c3>;
> > + pinctrl-1 = <&pinctrl_i2c3_recovery>;
> > + scl-gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>;
> > + sda-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
> > + status = "disabled";
> > +};
> > +
> > +/* PAD Ctrl values for common settings */
> > +/*
> > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE
> > |
> > + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > + */
> > +#define PAD_CTRL_HYS_PU 0x1b0b0
> > +
> > +/*
> > + * (PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_MED |
> > + * PAD_CTL_DSE_40ohm)
> > + */
> > +#define PAD_CTRL_HYS_PD 0x130b0
> > +
> > +/*
> > + * (PAD_CTL_PUS_22K_UP | PAD_CTL_PUE | PAD_CTL_PKE |
> > PAD_CTL_SPEED_LOW |
> > + * PAD_CTL_DSE_80ohm)
> > + */
> > +#define PAD_CTRL_PU_22k 0x0f058
> > +
> > +&iomuxc {
>
> I think it is a convention to move iomuxc at the very end for better
> readability of the rest. At least the Vybrid dts and the more
> recently
> added imx7d-sdb.dts follow this rule.
Yes, while the Tegras have it at the beginning NXP wants it at the end
(;-p).
> > + ecspi {
> > + pinctrl_ecspi1: ecspi1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT6__ECSPI1_MISO
> > 0x100b1
> > + MX6QDL_PAD_CSI0_DAT5__ECSPI1_MOSI
> > 0x100b1
> > + MX6QDL_PAD_CSI0_DAT4__ECSPI1_SCLK
> > 0x100b1
> > + >;
> > + };
> > + pinctrl_ecspi2: ecspi2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_OE__ECSPI2_MISO
> > 0x100b1
> > + MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI
> > 0x100b1
> > + MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK
> > 0x100b1
> > + >;
> > + };
> > + pinctrl_spi_cs1: spi_cs1 {
> > + fsl,pins = <
> > + /* SPI1 cs */
> > + MX6QDL_PAD_CSI0_DAT7__GPIO5_IO25
> > 0x000b1
> > + >;
> > + };
> > + pinctrl_spi_cs2: spi_cs2 {
> > + fsl,pins = <
> > + /* SPI2 cs */
> > + MX6QDL_PAD_EIM_RW__GPIO2_IO26
> > 0x000b1
> > + >;
> > + };
> > + };
> > +
> > + flexcan {
> > + pinctrl_flexcan1: flexcan1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_7__FLEXCAN1_TX
> > 0x1b0b0
> > + MX6QDL_PAD_GPIO_8__FLEXCAN1_RX
> > 0x1b0b0
> > + >;
> > + };
> > + pinctrl_flexcan2: flexcan2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX
> > 0x1b0b0
> > + MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX
> > 0x1b0b0
> > + >;
> > + };
> > + };
> > +
> > + gpio {
> > + pinctrl_apalis_gpio1: apalis_gpio1 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D4__GPIO2_IO04
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio2: apalis_gpio2 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D5__GPIO2_IO05
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio3: apalis_gpio3 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D6__GPIO2_IO06
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio4: apalis_gpio4 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D7__GPIO2_IO07
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio5: apalis_gpio5 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_RB0__GPIO6_IO10
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio6: apalis_gpio6 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09
> > + PAD_CTRL_HYS_PD
>
> The 80 character limit normally is not enforced for device trees,
> hence
> I would remove that line break here...
Yes, and then trying to teach patman to actually ignore that warning
(;-p).
> > + >;
> > + };
> > + pinctrl_apalis_gpio7: apalis_gpio7 {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_2__GPIO1_IO02
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio8: apalis_gpio8 {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_6__GPIO1_IO06
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_gpio_keys: gpio_keys {
> > + fsl,pins = <
> > + /* Power Button */
> > + MX6QDL_PAD_GPIO_4__GPIO1_IO04
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + };
> > +
> > + hdmi {
> > + pinctrl_hdmi_cec: hdmicecgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_L
> > INE 0x1f8b0
> > + >;
> > + };
> > + };
> > +
> > + i2c {
> > + pinctrl_i2c_ddc: i2c_ddc {
> > + fsl,pins = <
> > + /* DDC bitbang */
> > + MX6QDL_PAD_EIM_EB2__GPIO2_IO30
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_EIM_D16__GPIO3_IO16
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + pinctrl_i2c1: i2c1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT8__I2C1_SDA
> > 0x4001b8b1
> > + MX6QDL_PAD_CSI0_DAT9__I2C1_SCL
> > 0x4001b8b1
> > + >;
> > + };
> > + pinctrl_i2c3: i2c3grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_D17__I2C3_SCL
> > 0x4001b8b1
> > + MX6QDL_PAD_EIM_D18__I2C3_SDA
> > 0x4001b8b1
> > + >;
> > + };
> > + pinctrl_i2c3_recovery: i2c3-recoverygrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_D17__GPIO3_IO17
> > 0x4001b8b1
> > + MX6QDL_PAD_EIM_D18__GPIO3_IO18
> > 0x4001b8b1
> > + >;
> > + };
> > + };
> > +
> > + /* pins used on module */
> > + imx6q-apalis {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_reset_moci
> > &pinctrl_emmc_reset>;
> > + pinctrl_audmux: audmuxgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_DISP0_DAT20__AUD4_TXC
> > 0x130b0
> > + MX6QDL_PAD_DISP0_DAT21__AUD4_TXD
> > 0x130b0
> > + MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS
> > 0x130b0
> > + MX6QDL_PAD_DISP0_DAT23__AUD4_RXD
> > 0x130b0
> > + >;
> > + };
> > + pinctrl_audmux_mclk: audmux_mclk {
> > + fsl,pins = <
> > + /* SGTL5000 sys_mclk */
> > + MX6QDL_PAD_GPIO_5__CCM_CLKO1
> > 0x130b0
> > + >;
> > + };
> > + pinctrl_emmc_reset: emmc_reset {
> > + fsl,pins = <
> > + /* eMMC reset, leave it alone */
> > + MX6QDL_PAD_SD3_RST__GPIO7_IO08
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + pinctrl_enet: enetgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_ENET_MDIO__ENET_MDIO
> > 0x100b0
> > + MX6QDL_PAD_ENET_MDC__ENET_MDC
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TXC__RGMII_TXC
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD0__RGMII_TD0
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD1__RGMII_TD1
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD2__RGMII_TD2
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD3__RGMII_TD3
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_
> > CTL 0x100b0
> > + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_C
> > LK 0x100b0
> > + MX6QDL_PAD_RGMII_RXC__RGMII_RXC
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD0__RGMII_RD0
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD1__RGMII_RD1
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD2__RGMII_RD2
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD3__RGMII_RD3
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_
> > CTL 0x1b0b0
> > + >;
> > + };
> > + pinctrl_enet_ctrl: enet_ctrlgrp {
> > + fsl,pins = <
> > + /* Ethernet PHY reset */
> > + MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25
> > 0x000b0
> > + /* Ethernet PHY interrupt */
> > + MX6QDL_PAD_ENET_TXD0__GPIO1_IO30
> > 0x000b1
> > + >;
> > + };
> > + pinctrl_i2c2: i2c2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL3__I2C2_SCL
> > 0x4001b8b1
> > + MX6QDL_PAD_KEY_ROW3__I2C2_SDA
> > 0x4001b8b1
> > + >;
> > + };
> > + pinctrl_ipu2_vdac: ipu2vdacgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_
> > DISP_CLK 0xd1
> > + MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN
> > 15 0xd1
> > + MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN0
> > 2 0xd1
> > + MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN0
> > 3 0xd1
> > + MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_
> > DATA00 0xf9
> > + MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_
> > DATA01 0xf9
> > + MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_
> > DATA02 0xf9
> > + MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_
> > DATA03 0xf9
> > + MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_
> > DATA04 0xf9
> > + MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_
> > DATA05 0xf9
> > + MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_
> > DATA06 0xf9
> > + MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_
> > DATA07 0xf9
> > + MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_
> > DATA08 0xf9
> > + MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_
> > DATA09 0xf9
> > + MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0
> > _DATA10 0xf9
> > + MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0
> > _DATA11 0xf9
> > + MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0
> > _DATA12 0xf9
> > + MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0
> > _DATA13 0xf9
> > + MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0
> > _DATA14 0xf9
> > + MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0
> > _DATA15 0xf9
> > + >;
> > + };
> > + pinctrl_regulator_usbhub_pwr:
> > gpio_regulator_usbhub_pwr {
> > + fsl,pins = <
> > + /* USBH_HUB_EN */
> > + MX6QDL_PAD_EIM_D28__GPIO3_IO28
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + pinctrl_reset_moci: gpio_reset_moci {
> > + fsl,pins = <
> > + /* RESET_MOCI control */
> > + MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28
> > + PAD_CTRL_PU_22k
> > + >;
> > + };
> > + pinctrl_touch_int: touch_intgrp {
> > + fsl,pins = <
> > + /* STMPE811 interrupt */
> > + MX6QDL_PAD_KEY_COL2__GPIO4_IO10
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + pinctrl_usdhc3: usdhc3grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x1
> > 7059
> > + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x1
> > 0059
> > + MX6QDL_PAD_SD3_DAT0__SD3_DATA0
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT1__SD3_DATA1
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT2__SD3_DATA2
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT3__SD3_DATA3
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT4__SD3_DATA4
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT5__SD3_DATA5
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT6__SD3_DATA6
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT7__SD3_DATA7
> > 0x17059
> > + >;
> > + };
> > + pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /*
> > 100Mhz */
>
> I do not have a strong opinion on comments, but if they are pure
> duplication of what is already there, I kind of prefer to not add
> them...
Agreed.
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD
> > 0x170B9
> > + MX6QDL_PAD_SD3_CLK__SD3_CLK
> > 0x100B9
> > + MX6QDL_PAD_SD3_DAT0__SD3_DATA0
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT1__SD3_DATA1
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT2__SD3_DATA2
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT3__SD3_DATA3
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT4__SD3_DATA4
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT5__SD3_DATA5
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT6__SD3_DATA6
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT7__SD3_DATA7
> > 0x170B9
> > + >;
> > + };
> > + pinctrl_usdhc3_200mhz: usdhc3grp-200mhz { /*
> > 200Mhz */
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD
> > 0x170F9
> > + MX6QDL_PAD_SD3_CLK__SD3_CLK
> > 0x100F9
> > + MX6QDL_PAD_SD3_DAT0__SD3_DATA0
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT1__SD3_DATA1
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT2__SD3_DATA2
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT3__SD3_DATA3
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT4__SD3_DATA4
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT5__SD3_DATA5
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT6__SD3_DATA6
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT7__SD3_DATA7
> > 0x170F9
> > + >;
> > + };
> > + };
> > +
> > + ipu1 {
> > + pinctrl_ipu1_lcdif: ipu1lcdifgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_A16__IPU1_DI1_DISP_
> > CLK 0x61
> > + /* DE */
> > + MX6QDL_PAD_EIM_DA10__IPU1_DI1_PIN1
> > 5 0x61
> > + /* HSync */
> > + MX6QDL_PAD_EIM_DA11__IPU1_DI1_PIN0
> > 2 0x61
> > + /* VSync */
> > + MX6QDL_PAD_EIM_DA12__IPU1_DI1_PIN0
> > 3 0x61
> > + MX6QDL_PAD_EIM_DA9__IPU1_DISP1_DAT
> > A00 0x61
> > + MX6QDL_PAD_EIM_DA8__IPU1_DISP1_DAT
> > A01 0x61
> > + MX6QDL_PAD_EIM_DA7__IPU1_DISP1_DAT
> > A02 0x61
> > + MX6QDL_PAD_EIM_DA6__IPU1_DISP1_DAT
> > A03 0x61
> > + MX6QDL_PAD_EIM_DA5__IPU1_DISP1_DAT
> > A04 0x61
> > + MX6QDL_PAD_EIM_DA4__IPU1_DISP1_DAT
> > A05 0x61
> > + MX6QDL_PAD_EIM_DA3__IPU1_DISP1_DAT
> > A06 0x61
> > + MX6QDL_PAD_EIM_DA2__IPU1_DISP1_DAT
> > A07 0x61
> > + MX6QDL_PAD_EIM_DA1__IPU1_DISP1_DAT
> > A08 0x61
> > + MX6QDL_PAD_EIM_DA0__IPU1_DISP1_DAT
> > A09 0x61
> > + MX6QDL_PAD_EIM_EB1__IPU1_DISP1_DAT
> > A10 0x61
> > + MX6QDL_PAD_EIM_EB0__IPU1_DISP1_DAT
> > A11 0x61
> > + MX6QDL_PAD_EIM_A17__IPU1_DISP1_DAT
> > A12 0x61
> > + MX6QDL_PAD_EIM_A18__IPU1_DISP1_DAT
> > A13 0x61
> > + MX6QDL_PAD_EIM_A19__IPU1_DISP1_DAT
> > A14 0x61
> > + MX6QDL_PAD_EIM_A20__IPU1_DISP1_DAT
> > A15 0x61
> > + MX6QDL_PAD_EIM_A21__IPU1_DISP1_DAT
> > A16 0x61
> > + MX6QDL_PAD_EIM_A22__IPU1_DISP1_DAT
> > A17 0x61
> > + MX6QDL_PAD_EIM_A23__IPU1_DISP1_DAT
> > A18 0x61
> > + MX6QDL_PAD_EIM_A24__IPU1_DISP1_DAT
> > A19 0x61
> > + MX6QDL_PAD_EIM_D31__IPU1_DISP1_DAT
> > A20 0x61
> > + MX6QDL_PAD_EIM_D30__IPU1_DISP1_DAT
> > A21 0x61
> > + MX6QDL_PAD_EIM_D26__IPU1_DISP1_DAT
> > A22 0x61
> > + MX6QDL_PAD_EIM_D27__IPU1_DISP1_DAT
> > A23 0x61
> > + >;
> > + };
> > + pinctrl_cam_mclk: cam_mclk {
> > + fsl,pins = <
> > + /* CAM sys_mclk */
> > + MX6QDL_PAD_NANDF_CS2__CCM_CLKO2
> > 0x00b0
> > + >;
> > + };
> > + pinctrl_ipu1_csi0: ipu1csi0grp { /* parallel
> > camera */
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_D
> > ATA12 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_D
> > ATA13 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_D
> > ATA14 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_D
> > ATA15 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_D
> > ATA16 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_D
> > ATA17 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_D
> > ATA18 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_D
> > ATA19 0xb0b1
> > + MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_
> > PIXCLK 0xb0b1
> > + MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HS
> > YNC 0xb0b1
> > + MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_V
> > SYNC 0xb0b1
> > + >;
> > + };
> > + };
> > +
> > + pwm {
> > + pinctrl_pwm1: pwm1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_9__PWM1_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + pinctrl_pwm2: pwm2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_1__PWM2_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + pinctrl_pwm3: pwm3grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT1__PWM3_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + pinctrl_pwm4: pwm4grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT2__PWM4_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + spdif {
> > + pinctrl_spdif: spdifgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_16__SPDIF_IN 0x1b
> > 0b0
> > + MX6QDL_PAD_GPIO_17__SPDIF_OUT
> > 0x1b0b0
> > + >;
> > + };
> > + };
> > +
> > + uart1 {
> > + pinctrl_uart1_dce: uart1-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT10__UART1_TX_DA
> > TA 0x1b0b1
> > + MX6QDL_PAD_CSI0_DAT11__UART1_RX_DA
> > TA 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart1_dte: uart1-dtegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT10__UART1_RX_DA
> > TA 0x1b0b1
> > + MX6QDL_PAD_CSI0_DAT11__UART1_TX_DA
> > TA 0x1b0b1
> > + MX6QDL_PAD_EIM_D19__UART1_RTS_B
> > 0x1b0b1
> > + MX6QDL_PAD_EIM_D20__UART1_CTS_B
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* Additional DTR, DSR, DCD */
> > + pinctrl_uart1_ctrl: uart1-ctrlgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_D23__UART1_DCD_B
> > 0x1b0b0
> > + MX6QDL_PAD_EIM_D24__UART1_DTR_B
> > 0x1b0b0
> > + MX6QDL_PAD_EIM_D25__UART1_DSR_B
> > 0x1b0b0
> > + >;
> > + };
> > + };
> > +
> > + uart2 {
> > + pinctrl_uart2_dce: uart2-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart2_dte: uart2grp-dte {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT4__UART2_TX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT7__UART2_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT6__UART2_RTS_B
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT5__UART2_CTS_B
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + uart4 {
> > + pinctrl_uart4_dce: uart4-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL0__UART4_TX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart4_dte: uart4-dtegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL0__UART4_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW0__UART4_TX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + uart5 {
> > + pinctrl_uart5_dce: uart5-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL1__UART5_TX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart5_dte: uart5-dtegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL1__UART5_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW1__UART5_TX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + usbh {
> > + pinctrl_regulator_usbh_pwr:
> > gpio_regulator_usbh_pwr {
> > + fsl,pins = <
> > + /* USBH_EN */
> > + MX6QDL_PAD_GPIO_0__GPIO1_IO00
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + };
> > +
> > + usbotg {
> > + pinctrl_usbotg: usbotggrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID
> > 0x17059
> > + >;
> > + };
> > + pinctrl_regulator_usbotg_pwr:
> > gpio_regulator_usbotg_pwr {
> > + fsl,pins = <
> > + /* USBO power en */
> > + MX6QDL_PAD_EIM_D22__GPIO3_IO22
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + };
> > +
> > + usdhc {
> > + pinctrl_mmc_cd: gpio_mmc_cd {
> > + fsl,pins = <
> > + /* MMC1 CD */
> > + MX6QDL_PAD_DI0_PIN4__GPIO4_IO20
> > 0x000b0
> > + >;
> > + };
> > + pinctrl_sd_cd: gpio_sd_cd {
> > + fsl,pins = <
> > + /* SD1 CD */
> > + MX6QDL_PAD_NANDF_CS1__GPIO6_IO14
> > 0x000b0
> > + >;
> > + };
> > + pinctrl_usdhc1: usdhc1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x1
> > 7071
> > + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x1
> > 0071
> > + MX6QDL_PAD_SD1_DAT0__SD1_DATA0
> > 0x17071
> > + MX6QDL_PAD_SD1_DAT1__SD1_DATA1
> > 0x17071
> > + MX6QDL_PAD_SD1_DAT2__SD1_DATA2
> > 0x17071
> > + MX6QDL_PAD_SD1_DAT3__SD1_DATA3
> > 0x17071
> > + MX6QDL_PAD_NANDF_D0__SD1_DATA4
> > 0x17071
> > + MX6QDL_PAD_NANDF_D1__SD1_DATA5
> > 0x17071
> > + MX6QDL_PAD_NANDF_D2__SD1_DATA6
> > 0x17071
> > + MX6QDL_PAD_NANDF_D3__SD1_DATA7
> > 0x17071
> > + >;
> > + };
> > + pinctrl_usdhc2: usdhc2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x1
> > 7071
> > + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x1
> > 0071
> > + MX6QDL_PAD_SD2_DAT0__SD2_DATA0
> > 0x17071
> > + MX6QDL_PAD_SD2_DAT1__SD2_DATA1
> > 0x17071
> > + MX6QDL_PAD_SD2_DAT2__SD2_DATA2
> > 0x17071
> > + MX6QDL_PAD_SD2_DAT3__SD2_DATA3
> > 0x17071
> > + >;
> > + };
> > + };
> > +};
> > +
> > +&ldb {
> > + status = "okay";
> > +};
> > +
> > +&pwm1 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm1>;
> > + status = "disabled";
> > +};
> > +
> > +&pwm2 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm2>;
> > + status = "disabled";
> > +};
> > +
> > +&pwm3 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm3>;
> > + status = "disabled";
> > +};
> > +
> > +&pwm4 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm4>;
> > + status = "disabled";
> > +};
> > +
> > +&spdif {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_spdif>;
> > + status = "disabled";
> > +};
> > +
> > +&ssi1 {
> > + fsl,mode = "i2s-slave";
> > + status = "okay";
> > +};
> > +
> > +&uart1 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart1_dte &pinctrl_uart1_ctrl>;
> > + fsl,dte-mode;
> > + fsl,uart-has-rtscts;
> > + status = "disabled";
> > +};
> > +
> > +&uart2 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart2_dte>;
> > + fsl,dte-mode;
> > + fsl,uart-has-rtscts;
> > + status = "disabled";
> > +};
> > +
> > +&uart4 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart4_dte>;
> > + fsl,dte-mode;
> > + status = "disabled";
> > +};
> > +
> > +&uart5 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart5_dte>;
> > + fsl,dte-mode;
> > + status = "disabled";
> > +};
> > +
> > +&usbh1 {
> > + vbus-supply = <®_usb_host_vbus>;
> > + status = "disabled";
> > +};
> > +
> > +&usbotg {
> > + vbus-supply = <®_usb_otg_vbus>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usbotg>;
> > + disable-over-current;
> > + status = "disabled";
> > +};
> > +
> > +/* MMC1 */
> > +&usdhc1 {
> > + label = "MMC1";
>
> This...
>
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
> > + cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
> > + vmmc-supply = <®_3p3v>;
> > + bus-width = <8>;
> > + voltage-ranges = <3300 3300>;
> > + status = "disabled";
> > +};
> > +
> > +/* SD1 */
> > +&usdhc2 {
> > + label = "SD1";
>
> ...and this seem not to be specified upstream? (at least not in
> Documentation/devicetree/bindings/mmc/mmc.txt?)
> Not sure about this... Or is label a common convention and hence
> available for all nodes?
Yes, I guess one can put labels anywhere but I also don't see what the
exact purpose of them should be in this case so I will drop them.
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>;
> > + cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
> > + vmmc-supply = <®_3p3v>;
> > + bus-width = <4>;
> > + voltage-ranges = <3300 3300>;
> > + status = "disabled";
> > +};
> > +
> > +/* eMMC */
> > +&usdhc3 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usdhc3>;
> > + vmmc-supply = <®_3p3v>;
> > + bus-width = <8>;
> > + voltage-ranges = <3300 3300>;
> > + non-removable;
> > + status = "okay";
> > +};
> > +
> > +&weim {
> > + status = "disabled"; /* weim signals not accessible on
> > i.MX6 */
>
> They are accessible on the i.MX6 SoC.. but maybe "on Apalis iMX6Q/D".
> Or
> just remove the comment, since that is kind of what disabled says?
Yes, that comment seems bogus and will be dropped.
> > +};
>
> Otherwise:
> Reviewed-by: Stefan Agner <stefan@agner.ch>
Thanks!
> --
> Stefan
Cheers
Marcel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 8:28 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 8:28 UTC (permalink / raw)
To: stefan
Cc: mark.rutland, devicetree, stillcompiling, linux, pawel.moll,
ijc+devicetree, shawnguo, linux-kernel, robh+dt, kernel, galak,
ynezz, shawn.guo, festevam, linux-arm-kernel, l.stach
Hi Stefan
On Wed, 2016-01-06 at 22:29 -0800, Stefan Agner wrote:
> Hi Marcel,
>
> On 2016-01-05 08:39, Marcel Ziswiler wrote:
> > From: Petr Štetiar <ynezz@true.cz>
> >
> > Signed-off-by: Petr Štetiar <ynezz@true.cz>
> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > ---
> >
> > Changes in v2:
> > - clarify exact Apalis iMX6Q/D SoM type in cover letter
> > - clarify exact Apalis iMX6Q/D module type and Ixora carrier board
> > in model
> > node
> > - got rid of obsolete mmc aliases
> > - working SGTL5000 audio/sound integration
> > - working STMPE811 touch screen controller integration
> > - integrated review feedback from Lucas
> > - left and even added some more comments as I don't see why putting
> > any
> > explanatory comments in dts' should be such a bad thing to do
> > - completely got rid of the memory node as that is something
> > typically filled
> > in by the boot loader e.g. U-Boot
> > - without the regulators simple-bus it no longer boots
> > - even though we supposedly shipped a few hundred V1.0a modules
> > drop DCE UART
> > support for now and simplify file layout
> > - replaced obsolete no-1-8-v by mainline supported voltage-ranges =
> > <3300 3300>
> > usdhc property and yes card detects are indeed active low (;-p)
> > - integrated review feedback from Stefan
> > - fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver
> > to be
> > enabled)
> > - fixed HDMI DDC (requires GPIO-based bitbanging I2C to be enabled)
> > - fixed SPDIF
> >
> > arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1040
> > +++++++++++++++++++++++++++++++++
> > 1 file changed, 1040 insertions(+)
> > create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
> >
> > diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> > b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> > new file mode 100644
> > index 0000000..6104e2e
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> > @@ -0,0 +1,1040 @@
> > +/*
> > + * Copyright 2014-2016 Toradex AG
> > + * Copyright 2012 Freescale Semiconductor, Inc.
> > + * Copyright 2011 Linaro Ltd.
> > + *
> > + * This file is dual-licensed: you can use it either under the
> > terms
> > + * of the GPL or the X11 license, at your option. Note that this
> > dual
> > + * licensing only applies to this file, and not this project as a
> > + * whole.
> > + *
> > + * a) This file is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU General Public License
> > + * version 2 as published by the Free Software Foundation.
> > + *
> > + * This file is distributed in the hope that it will be useful
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty
> > of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
> > the
> > + * GNU General Public License for more details.
> > + *
> > + * Or, alternatively
> > + *
> > + * b) Permission is hereby granted, free of charge, to any person
> > + * obtaining a copy of this software and associated
> > documentation
> > + * files (the "Software"), to deal in the Software without
> > + * restriction, including without limitation the rights to use
> > + * copy, modify, merge, publish, distribute, sublicense,
> > and/or
> > + * sell copies of the Software, and to permit persons to whom
> > the
> > + * Software is furnished to do so, subject to the following
> > + * conditions:
> > + *
> > + * The above copyright notice and this permission notice shall
> > be
> > + * included in all copies or substantial portions of the
> > Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
> > WARRANTIES
> > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > ARISING
> > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
> > OR
> > + * OTHER DEALINGS IN THE SOFTWARE.
> > + */
> > +
> > +#include <dt-bindings/gpio/gpio.h>
> > +
> > +/ {
> > + model = "Toradex Apalis iMX6Q/D Module";
> > + compatible = "toradex,apalis_imx6q", "fsl,imx6q";
> > +
> > + backlight: backlight {
> > + compatible = "pwm-backlight";
> > + pwms = <&pwm4 0 5000000>;
> > + status = "disabled";
> > + };
> > +
> > + /* DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 */
> > + i2cddc: i2c@0 {
> > + compatible = "i2c-gpio";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_i2c_ddc>;
> > + gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
> > + &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
> > + >;
> > + i2c-gpio,delay-us = <2>; /* ~100 kHz */
> > + status = "okay";
> > + };
> > +
> > + regulators {
> > + compatible = "simple-bus";
> > +
> > + reg_1p8v: 1p8v {
> > + compatible = "regulator-fixed";
> > + regulator-name = "1P8V";
> > + regulator-min-microvolt = <1800000>;
> > + regulator-max-microvolt = <1800000>;
> > + regulator-always-on;
> > + };
> > +
> > + reg_2p5v: 2p5v {
> > + compatible = "regulator-fixed";
> > + regulator-name = "2P5V";
> > + regulator-min-microvolt = <2500000>;
> > + regulator-max-microvolt = <2500000>;
> > + regulator-always-on;
> > + };
> > +
> > + reg_3p3v: 3p3v {
> > + compatible = "regulator-fixed";
> > + regulator-name = "3P3V";
> > + regulator-min-microvolt = <3300000>;
> > + regulator-max-microvolt = <3300000>;
> > + regulator-always-on;
> > + };
> > +
> > + reg_usb_otg_vbus: usb_otg_vbus {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 =
> > <&pinctrl_regulator_usbotg_pwr>;
> > + regulator-name = "usb_otg_vbus";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > + enable-active-high;
> > + status = "disabled";
> > + };
> > +
> > + /* on module usb hub */
> > + reg_usb_host_vbus_hub: usb_host_vbus_hub {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 =
> > <&pinctrl_regulator_usbhub_pwr>;
> > + regulator-name = "usb_host_vbus_hub";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio = <&gpio3 28 GPIO_ACTIVE_HIGH>;
> > + startup-delay-us = <2000>;
> > + enable-active-high;
> > + status = "okay";
> > + };
> > +
> > + reg_usb_host_vbus: usb_host_vbus {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_regulator_usbh_pwr>;
> > + regulator-name = "usb_host_vbus";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
> > + enable-active-high;
> > + vin-supply = <®_usb_host_vbus_hub>;
> > + status = "disabled";
> > + };
> > + };
> > +
> > + sound {
> > + compatible = "fsl,imx-audio-sgtl5000";
> > + model = "imx6q-apalis-sgtl5000";
> > + ssi-controller = <&ssi1>;
> > + audio-codec = <&codec>;
> > + audio-routing =
> > + "LINE_IN", "Line In Jack",
> > + "MIC_IN", "Mic Jack",
> > + "Mic Jack", "Mic Bias",
> > + "Headphone Jack", "HP_OUT";
> > + mux-int-port = <1>;
> > + mux-ext-port = <4>;
> > + };
> > +
> > + sound_spdif: sound-spdif {
> > + compatible = "fsl,imx-audio-spdif";
> > + model = "imx-spdif";
> > + spdif-controller = <&spdif>;
> > + spdif-in;
> > + spdif-out;
> > + status = "disabled";
> > + };
> > +};
> > +
> > +&audmux {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_audmux &pinctrl_audmux_mclk>;
> > + status = "okay";
> > +};
> > +
> > +/* Apalis SPI1 */
> > +&ecspi1 {
> > + fsl,spi-num-chipselects = <1>;
> > + cs-gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_spi_cs1>;
> > + status = "disabled";
> > +};
> > +
> > +/* Apalis SPI2 */
> > +&ecspi2 {
> > + fsl,spi-num-chipselects = <1>;
> > + cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_ecspi2 &pinctrl_spi_cs2>;
> > + status = "disabled";
> > +};
> > +
> > +&fec {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_enet &pinctrl_enet_ctrl>;
> > + phy-mode = "rgmii";
> > + phy-handle = <ðphy>;
> > + phy-reset-duration = <10>;
> > + phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
> > + status = "okay";
> > +
> > + mdio {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + ethphy: ethernet-phy@7 {
> > + interrupt-parent = <&gpio1>;
> > + interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
> > + reg = <7>;
> > + };
> > + };
> > +};
> > +
> > +&can1 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_flexcan1>;
> > + status = "disabled";
> > +};
> > +
> > +&can2 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_flexcan2>;
> > + status = "disabled";
> > +};
> > +
> > +&hdmi {
> > + ddc-i2c-bus = <&i2cddc>;
> > + status = "okay";
> > +};
> > +
> > +/*
> > + * GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier
> > + * board)
> > + */
> > +&i2c1 {
> > + clock-frequency = <100000>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_i2c1>;
> > + status = "disabled";
> > +};
> > +
> > +&i2c2 {
> > + clock-frequency = <100000>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_i2c2>;
> > + status = "okay";
> > +
> > + pmic: pfuze100@08 {
> > + compatible = "fsl,pfuze100";
> > + reg = <0x08>;
> > +
> > + regulators {
> > + sw1a_reg: sw1ab {
> > + regulator-min-microvolt =
> > <300000>;
> > + regulator-max-microvolt =
> > <1875000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + regulator-ramp-delay = <6250>;
> > + };
> > +
> > + sw1c_reg: sw1c {
> > + regulator-min-microvolt =
> > <300000>;
> > + regulator-max-microvolt =
> > <1875000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + regulator-ramp-delay = <6250>;
> > + };
> > +
> > + sw3a_reg: sw3a {
> > + regulator-min-microvolt =
> > <400000>;
> > + regulator-max-microvolt =
> > <1975000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + swbst_reg: swbst {
> > + regulator-min-microvolt =
> > <5000000>;
> > + regulator-max-microvolt =
> > <5150000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + snvs_reg: vsnvs {
> > + regulator-min-microvolt =
> > <1000000>;
> > + regulator-max-microvolt =
> > <3000000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vref_reg: vrefddr {
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen1_reg: vgen1 {
> > + regulator-min-microvolt =
> > <800000>;
> > + regulator-max-microvolt =
> > <1550000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen2_reg: vgen2 {
> > + regulator-min-microvolt =
> > <800000>;
> > + regulator-max-microvolt =
> > <1550000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen3_reg: vgen3 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen4_reg: vgen4 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen5_reg: vgen5 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen6_reg: vgen6 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > + };
> > + };
> > +
> > + codec: sgtl5000@0a {
> > + compatible = "fsl,sgtl5000";
> > + reg = <0x0a>;
> > + clocks = <&clks 201>;
> > + VDDA-supply = <®_2p5v>;
> > + VDDIO-supply = <®_3p3v>;
>
> Nit: The device tree bindings mention two more properties as required
> properties:
> micbias-resistor-k-ohms
> micbias-voltage-m-volts
>
> However, both have "If this node is not mentioned", hence I guess
> they
> are actually optional, but maybe we want to set an explicit value
> here?
Remember we don't make use of any of that microphone bias stuff on any
of our Apalis hardware.
> > + };
> > +
> > + /* STMPE811 touch screen controller */
> > + stmpe811@41 {
> > + compatible = "st,stmpe811";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_touch_int>;
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + reg = <0x41>;
> > + interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
> > + interrupt-parent = <&gpio4>;
> > + interrupt-controller;
> > + id = <0>;
> > + blocks = <0x5>;
> > + irq-trigger = <0x1>;
> > + stmpe_touchscreen {
> > + compatible = "st,stmpe-ts";
> > + reg = <0>;
> > + /* 3.25 MHz ADC clock speed */
> > + st,adc-freq = <1>;
> > + /* 8 sample average control */
> > + st,ave-ctrl = <3>;
> > + /* 7 length fractional part in z */
> > + st,fraction-z = <7>;
> > + /*
> > + * 50 mA typical 80 mA max touchscreen
> > drivers
> > + * current limit value
> > + */
> > + st,i-drive = <1>;
> > + /* 12-bit ADC */
> > + st,mod-12b = <1>;
> > + /* internal ADC reference */
> > + st,ref-sel = <0>;
> > + /* ADC converstion time: 80 clocks */
> > + st,sample-time = <4>;
> > + /* 1 ms panel driver settling time */
> > + st,settling = <3>;
> > + /* 5 ms touch detect interrupt delay */
> > + st,touch-det-delay = <5>;
> > + };
> > + };
> > +};
> > +
> > +/*
> > + * GEN2_I2C, CAM: I2C3_SDA/SCL on MXM3 201/203 (unused)
> > + */
> > +&i2c3 {
> > + clock-frequency = <100000>;
> > + pinctrl-names = "default", "recovery";
> > + pinctrl-0 = <&pinctrl_i2c3>;
> > + pinctrl-1 = <&pinctrl_i2c3_recovery>;
> > + scl-gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>;
> > + sda-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
> > + status = "disabled";
> > +};
> > +
> > +/* PAD Ctrl values for common settings */
> > +/*
> > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE
> > |
> > + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > + */
> > +#define PAD_CTRL_HYS_PU 0x1b0b0
> > +
> > +/*
> > + * (PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_MED |
> > + * PAD_CTL_DSE_40ohm)
> > + */
> > +#define PAD_CTRL_HYS_PD 0x130b0
> > +
> > +/*
> > + * (PAD_CTL_PUS_22K_UP | PAD_CTL_PUE | PAD_CTL_PKE |
> > PAD_CTL_SPEED_LOW |
> > + * PAD_CTL_DSE_80ohm)
> > + */
> > +#define PAD_CTRL_PU_22k 0x0f058
> > +
> > +&iomuxc {
>
> I think it is a convention to move iomuxc at the very end for better
> readability of the rest. At least the Vybrid dts and the more
> recently
> added imx7d-sdb.dts follow this rule.
Yes, while the Tegras have it at the beginning NXP wants it at the end
(;-p).
> > + ecspi {
> > + pinctrl_ecspi1: ecspi1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT6__ECSPI1_MISO
> > 0x100b1
> > + MX6QDL_PAD_CSI0_DAT5__ECSPI1_MOSI
> > 0x100b1
> > + MX6QDL_PAD_CSI0_DAT4__ECSPI1_SCLK
> > 0x100b1
> > + >;
> > + };
> > + pinctrl_ecspi2: ecspi2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_OE__ECSPI2_MISO
> > 0x100b1
> > + MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI
> > 0x100b1
> > + MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK
> > 0x100b1
> > + >;
> > + };
> > + pinctrl_spi_cs1: spi_cs1 {
> > + fsl,pins = <
> > + /* SPI1 cs */
> > + MX6QDL_PAD_CSI0_DAT7__GPIO5_IO25
> > 0x000b1
> > + >;
> > + };
> > + pinctrl_spi_cs2: spi_cs2 {
> > + fsl,pins = <
> > + /* SPI2 cs */
> > + MX6QDL_PAD_EIM_RW__GPIO2_IO26
> > 0x000b1
> > + >;
> > + };
> > + };
> > +
> > + flexcan {
> > + pinctrl_flexcan1: flexcan1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_7__FLEXCAN1_TX
> > 0x1b0b0
> > + MX6QDL_PAD_GPIO_8__FLEXCAN1_RX
> > 0x1b0b0
> > + >;
> > + };
> > + pinctrl_flexcan2: flexcan2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX
> > 0x1b0b0
> > + MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX
> > 0x1b0b0
> > + >;
> > + };
> > + };
> > +
> > + gpio {
> > + pinctrl_apalis_gpio1: apalis_gpio1 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D4__GPIO2_IO04
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio2: apalis_gpio2 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D5__GPIO2_IO05
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio3: apalis_gpio3 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D6__GPIO2_IO06
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio4: apalis_gpio4 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D7__GPIO2_IO07
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio5: apalis_gpio5 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_RB0__GPIO6_IO10
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio6: apalis_gpio6 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09
> > + PAD_CTRL_HYS_PD
>
> The 80 character limit normally is not enforced for device trees,
> hence
> I would remove that line break here...
Yes, and then trying to teach patman to actually ignore that warning
(;-p).
> > + >;
> > + };
> > + pinctrl_apalis_gpio7: apalis_gpio7 {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_2__GPIO1_IO02
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio8: apalis_gpio8 {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_6__GPIO1_IO06
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_gpio_keys: gpio_keys {
> > + fsl,pins = <
> > + /* Power Button */
> > + MX6QDL_PAD_GPIO_4__GPIO1_IO04
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + };
> > +
> > + hdmi {
> > + pinctrl_hdmi_cec: hdmicecgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_L
> > INE 0x1f8b0
> > + >;
> > + };
> > + };
> > +
> > + i2c {
> > + pinctrl_i2c_ddc: i2c_ddc {
> > + fsl,pins = <
> > + /* DDC bitbang */
> > + MX6QDL_PAD_EIM_EB2__GPIO2_IO30
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_EIM_D16__GPIO3_IO16
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + pinctrl_i2c1: i2c1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT8__I2C1_SDA
> > 0x4001b8b1
> > + MX6QDL_PAD_CSI0_DAT9__I2C1_SCL
> > 0x4001b8b1
> > + >;
> > + };
> > + pinctrl_i2c3: i2c3grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_D17__I2C3_SCL
> > 0x4001b8b1
> > + MX6QDL_PAD_EIM_D18__I2C3_SDA
> > 0x4001b8b1
> > + >;
> > + };
> > + pinctrl_i2c3_recovery: i2c3-recoverygrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_D17__GPIO3_IO17
> > 0x4001b8b1
> > + MX6QDL_PAD_EIM_D18__GPIO3_IO18
> > 0x4001b8b1
> > + >;
> > + };
> > + };
> > +
> > + /* pins used on module */
> > + imx6q-apalis {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_reset_moci
> > &pinctrl_emmc_reset>;
> > + pinctrl_audmux: audmuxgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_DISP0_DAT20__AUD4_TXC
> > 0x130b0
> > + MX6QDL_PAD_DISP0_DAT21__AUD4_TXD
> > 0x130b0
> > + MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS
> > 0x130b0
> > + MX6QDL_PAD_DISP0_DAT23__AUD4_RXD
> > 0x130b0
> > + >;
> > + };
> > + pinctrl_audmux_mclk: audmux_mclk {
> > + fsl,pins = <
> > + /* SGTL5000 sys_mclk */
> > + MX6QDL_PAD_GPIO_5__CCM_CLKO1
> > 0x130b0
> > + >;
> > + };
> > + pinctrl_emmc_reset: emmc_reset {
> > + fsl,pins = <
> > + /* eMMC reset, leave it alone */
> > + MX6QDL_PAD_SD3_RST__GPIO7_IO08
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + pinctrl_enet: enetgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_ENET_MDIO__ENET_MDIO
> > 0x100b0
> > + MX6QDL_PAD_ENET_MDC__ENET_MDC
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TXC__RGMII_TXC
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD0__RGMII_TD0
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD1__RGMII_TD1
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD2__RGMII_TD2
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD3__RGMII_TD3
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_
> > CTL 0x100b0
> > + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_C
> > LK 0x100b0
> > + MX6QDL_PAD_RGMII_RXC__RGMII_RXC
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD0__RGMII_RD0
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD1__RGMII_RD1
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD2__RGMII_RD2
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD3__RGMII_RD3
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_
> > CTL 0x1b0b0
> > + >;
> > + };
> > + pinctrl_enet_ctrl: enet_ctrlgrp {
> > + fsl,pins = <
> > + /* Ethernet PHY reset */
> > + MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25
> > 0x000b0
> > + /* Ethernet PHY interrupt */
> > + MX6QDL_PAD_ENET_TXD0__GPIO1_IO30
> > 0x000b1
> > + >;
> > + };
> > + pinctrl_i2c2: i2c2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL3__I2C2_SCL
> > 0x4001b8b1
> > + MX6QDL_PAD_KEY_ROW3__I2C2_SDA
> > 0x4001b8b1
> > + >;
> > + };
> > + pinctrl_ipu2_vdac: ipu2vdacgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_
> > DISP_CLK 0xd1
> > + MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN
> > 15 0xd1
> > + MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN0
> > 2 0xd1
> > + MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN0
> > 3 0xd1
> > + MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_
> > DATA00 0xf9
> > + MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_
> > DATA01 0xf9
> > + MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_
> > DATA02 0xf9
> > + MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_
> > DATA03 0xf9
> > + MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_
> > DATA04 0xf9
> > + MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_
> > DATA05 0xf9
> > + MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_
> > DATA06 0xf9
> > + MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_
> > DATA07 0xf9
> > + MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_
> > DATA08 0xf9
> > + MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_
> > DATA09 0xf9
> > + MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0
> > _DATA10 0xf9
> > + MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0
> > _DATA11 0xf9
> > + MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0
> > _DATA12 0xf9
> > + MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0
> > _DATA13 0xf9
> > + MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0
> > _DATA14 0xf9
> > + MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0
> > _DATA15 0xf9
> > + >;
> > + };
> > + pinctrl_regulator_usbhub_pwr:
> > gpio_regulator_usbhub_pwr {
> > + fsl,pins = <
> > + /* USBH_HUB_EN */
> > + MX6QDL_PAD_EIM_D28__GPIO3_IO28
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + pinctrl_reset_moci: gpio_reset_moci {
> > + fsl,pins = <
> > + /* RESET_MOCI control */
> > + MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28
> > + PAD_CTRL_PU_22k
> > + >;
> > + };
> > + pinctrl_touch_int: touch_intgrp {
> > + fsl,pins = <
> > + /* STMPE811 interrupt */
> > + MX6QDL_PAD_KEY_COL2__GPIO4_IO10
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + pinctrl_usdhc3: usdhc3grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD 0x1
> > 7059
> > + MX6QDL_PAD_SD3_CLK__SD3_CLK 0x1
> > 0059
> > + MX6QDL_PAD_SD3_DAT0__SD3_DATA0
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT1__SD3_DATA1
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT2__SD3_DATA2
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT3__SD3_DATA3
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT4__SD3_DATA4
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT5__SD3_DATA5
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT6__SD3_DATA6
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT7__SD3_DATA7
> > 0x17059
> > + >;
> > + };
> > + pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /*
> > 100Mhz */
>
> I do not have a strong opinion on comments, but if they are pure
> duplication of what is already there, I kind of prefer to not add
> them...
Agreed.
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD
> > 0x170B9
> > + MX6QDL_PAD_SD3_CLK__SD3_CLK
> > 0x100B9
> > + MX6QDL_PAD_SD3_DAT0__SD3_DATA0
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT1__SD3_DATA1
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT2__SD3_DATA2
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT3__SD3_DATA3
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT4__SD3_DATA4
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT5__SD3_DATA5
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT6__SD3_DATA6
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT7__SD3_DATA7
> > 0x170B9
> > + >;
> > + };
> > + pinctrl_usdhc3_200mhz: usdhc3grp-200mhz { /*
> > 200Mhz */
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD
> > 0x170F9
> > + MX6QDL_PAD_SD3_CLK__SD3_CLK
> > 0x100F9
> > + MX6QDL_PAD_SD3_DAT0__SD3_DATA0
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT1__SD3_DATA1
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT2__SD3_DATA2
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT3__SD3_DATA3
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT4__SD3_DATA4
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT5__SD3_DATA5
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT6__SD3_DATA6
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT7__SD3_DATA7
> > 0x170F9
> > + >;
> > + };
> > + };
> > +
> > + ipu1 {
> > + pinctrl_ipu1_lcdif: ipu1lcdifgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_A16__IPU1_DI1_DISP_
> > CLK 0x61
> > + /* DE */
> > + MX6QDL_PAD_EIM_DA10__IPU1_DI1_PIN1
> > 5 0x61
> > + /* HSync */
> > + MX6QDL_PAD_EIM_DA11__IPU1_DI1_PIN0
> > 2 0x61
> > + /* VSync */
> > + MX6QDL_PAD_EIM_DA12__IPU1_DI1_PIN0
> > 3 0x61
> > + MX6QDL_PAD_EIM_DA9__IPU1_DISP1_DAT
> > A00 0x61
> > + MX6QDL_PAD_EIM_DA8__IPU1_DISP1_DAT
> > A01 0x61
> > + MX6QDL_PAD_EIM_DA7__IPU1_DISP1_DAT
> > A02 0x61
> > + MX6QDL_PAD_EIM_DA6__IPU1_DISP1_DAT
> > A03 0x61
> > + MX6QDL_PAD_EIM_DA5__IPU1_DISP1_DAT
> > A04 0x61
> > + MX6QDL_PAD_EIM_DA4__IPU1_DISP1_DAT
> > A05 0x61
> > + MX6QDL_PAD_EIM_DA3__IPU1_DISP1_DAT
> > A06 0x61
> > + MX6QDL_PAD_EIM_DA2__IPU1_DISP1_DAT
> > A07 0x61
> > + MX6QDL_PAD_EIM_DA1__IPU1_DISP1_DAT
> > A08 0x61
> > + MX6QDL_PAD_EIM_DA0__IPU1_DISP1_DAT
> > A09 0x61
> > + MX6QDL_PAD_EIM_EB1__IPU1_DISP1_DAT
> > A10 0x61
> > + MX6QDL_PAD_EIM_EB0__IPU1_DISP1_DAT
> > A11 0x61
> > + MX6QDL_PAD_EIM_A17__IPU1_DISP1_DAT
> > A12 0x61
> > + MX6QDL_PAD_EIM_A18__IPU1_DISP1_DAT
> > A13 0x61
> > + MX6QDL_PAD_EIM_A19__IPU1_DISP1_DAT
> > A14 0x61
> > + MX6QDL_PAD_EIM_A20__IPU1_DISP1_DAT
> > A15 0x61
> > + MX6QDL_PAD_EIM_A21__IPU1_DISP1_DAT
> > A16 0x61
> > + MX6QDL_PAD_EIM_A22__IPU1_DISP1_DAT
> > A17 0x61
> > + MX6QDL_PAD_EIM_A23__IPU1_DISP1_DAT
> > A18 0x61
> > + MX6QDL_PAD_EIM_A24__IPU1_DISP1_DAT
> > A19 0x61
> > + MX6QDL_PAD_EIM_D31__IPU1_DISP1_DAT
> > A20 0x61
> > + MX6QDL_PAD_EIM_D30__IPU1_DISP1_DAT
> > A21 0x61
> > + MX6QDL_PAD_EIM_D26__IPU1_DISP1_DAT
> > A22 0x61
> > + MX6QDL_PAD_EIM_D27__IPU1_DISP1_DAT
> > A23 0x61
> > + >;
> > + };
> > + pinctrl_cam_mclk: cam_mclk {
> > + fsl,pins = <
> > + /* CAM sys_mclk */
> > + MX6QDL_PAD_NANDF_CS2__CCM_CLKO2
> > 0x00b0
> > + >;
> > + };
> > + pinctrl_ipu1_csi0: ipu1csi0grp { /* parallel
> > camera */
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_D
> > ATA12 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_D
> > ATA13 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_D
> > ATA14 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_D
> > ATA15 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_D
> > ATA16 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_D
> > ATA17 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_D
> > ATA18 0xb0b1
> > + MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_D
> > ATA19 0xb0b1
> > + MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_
> > PIXCLK 0xb0b1
> > + MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HS
> > YNC 0xb0b1
> > + MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_V
> > SYNC 0xb0b1
> > + >;
> > + };
> > + };
> > +
> > + pwm {
> > + pinctrl_pwm1: pwm1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_9__PWM1_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + pinctrl_pwm2: pwm2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_1__PWM2_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + pinctrl_pwm3: pwm3grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT1__PWM3_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + pinctrl_pwm4: pwm4grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT2__PWM4_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + spdif {
> > + pinctrl_spdif: spdifgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_16__SPDIF_IN 0x1b
> > 0b0
> > + MX6QDL_PAD_GPIO_17__SPDIF_OUT
> > 0x1b0b0
> > + >;
> > + };
> > + };
> > +
> > + uart1 {
> > + pinctrl_uart1_dce: uart1-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT10__UART1_TX_DA
> > TA 0x1b0b1
> > + MX6QDL_PAD_CSI0_DAT11__UART1_RX_DA
> > TA 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart1_dte: uart1-dtegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT10__UART1_RX_DA
> > TA 0x1b0b1
> > + MX6QDL_PAD_CSI0_DAT11__UART1_TX_DA
> > TA 0x1b0b1
> > + MX6QDL_PAD_EIM_D19__UART1_RTS_B
> > 0x1b0b1
> > + MX6QDL_PAD_EIM_D20__UART1_CTS_B
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* Additional DTR, DSR, DCD */
> > + pinctrl_uart1_ctrl: uart1-ctrlgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_D23__UART1_DCD_B
> > 0x1b0b0
> > + MX6QDL_PAD_EIM_D24__UART1_DTR_B
> > 0x1b0b0
> > + MX6QDL_PAD_EIM_D25__UART1_DSR_B
> > 0x1b0b0
> > + >;
> > + };
> > + };
> > +
> > + uart2 {
> > + pinctrl_uart2_dce: uart2-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart2_dte: uart2grp-dte {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT4__UART2_TX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT7__UART2_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT6__UART2_RTS_B
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT5__UART2_CTS_B
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + uart4 {
> > + pinctrl_uart4_dce: uart4-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL0__UART4_TX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart4_dte: uart4-dtegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL0__UART4_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW0__UART4_TX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + uart5 {
> > + pinctrl_uart5_dce: uart5-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL1__UART5_TX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart5_dte: uart5-dtegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL1__UART5_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW1__UART5_TX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + usbh {
> > + pinctrl_regulator_usbh_pwr:
> > gpio_regulator_usbh_pwr {
> > + fsl,pins = <
> > + /* USBH_EN */
> > + MX6QDL_PAD_GPIO_0__GPIO1_IO00
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + };
> > +
> > + usbotg {
> > + pinctrl_usbotg: usbotggrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID
> > 0x17059
> > + >;
> > + };
> > + pinctrl_regulator_usbotg_pwr:
> > gpio_regulator_usbotg_pwr {
> > + fsl,pins = <
> > + /* USBO power en */
> > + MX6QDL_PAD_EIM_D22__GPIO3_IO22
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + };
> > +
> > + usdhc {
> > + pinctrl_mmc_cd: gpio_mmc_cd {
> > + fsl,pins = <
> > + /* MMC1 CD */
> > + MX6QDL_PAD_DI0_PIN4__GPIO4_IO20
> > 0x000b0
> > + >;
> > + };
> > + pinctrl_sd_cd: gpio_sd_cd {
> > + fsl,pins = <
> > + /* SD1 CD */
> > + MX6QDL_PAD_NANDF_CS1__GPIO6_IO14
> > 0x000b0
> > + >;
> > + };
> > + pinctrl_usdhc1: usdhc1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x1
> > 7071
> > + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x1
> > 0071
> > + MX6QDL_PAD_SD1_DAT0__SD1_DATA0
> > 0x17071
> > + MX6QDL_PAD_SD1_DAT1__SD1_DATA1
> > 0x17071
> > + MX6QDL_PAD_SD1_DAT2__SD1_DATA2
> > 0x17071
> > + MX6QDL_PAD_SD1_DAT3__SD1_DATA3
> > 0x17071
> > + MX6QDL_PAD_NANDF_D0__SD1_DATA4
> > 0x17071
> > + MX6QDL_PAD_NANDF_D1__SD1_DATA5
> > 0x17071
> > + MX6QDL_PAD_NANDF_D2__SD1_DATA6
> > 0x17071
> > + MX6QDL_PAD_NANDF_D3__SD1_DATA7
> > 0x17071
> > + >;
> > + };
> > + pinctrl_usdhc2: usdhc2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD2_CMD__SD2_CMD 0x1
> > 7071
> > + MX6QDL_PAD_SD2_CLK__SD2_CLK 0x1
> > 0071
> > + MX6QDL_PAD_SD2_DAT0__SD2_DATA0
> > 0x17071
> > + MX6QDL_PAD_SD2_DAT1__SD2_DATA1
> > 0x17071
> > + MX6QDL_PAD_SD2_DAT2__SD2_DATA2
> > 0x17071
> > + MX6QDL_PAD_SD2_DAT3__SD2_DATA3
> > 0x17071
> > + >;
> > + };
> > + };
> > +};
> > +
> > +&ldb {
> > + status = "okay";
> > +};
> > +
> > +&pwm1 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm1>;
> > + status = "disabled";
> > +};
> > +
> > +&pwm2 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm2>;
> > + status = "disabled";
> > +};
> > +
> > +&pwm3 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm3>;
> > + status = "disabled";
> > +};
> > +
> > +&pwm4 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm4>;
> > + status = "disabled";
> > +};
> > +
> > +&spdif {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_spdif>;
> > + status = "disabled";
> > +};
> > +
> > +&ssi1 {
> > + fsl,mode = "i2s-slave";
> > + status = "okay";
> > +};
> > +
> > +&uart1 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart1_dte &pinctrl_uart1_ctrl>;
> > + fsl,dte-mode;
> > + fsl,uart-has-rtscts;
> > + status = "disabled";
> > +};
> > +
> > +&uart2 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart2_dte>;
> > + fsl,dte-mode;
> > + fsl,uart-has-rtscts;
> > + status = "disabled";
> > +};
> > +
> > +&uart4 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart4_dte>;
> > + fsl,dte-mode;
> > + status = "disabled";
> > +};
> > +
> > +&uart5 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart5_dte>;
> > + fsl,dte-mode;
> > + status = "disabled";
> > +};
> > +
> > +&usbh1 {
> > + vbus-supply = <®_usb_host_vbus>;
> > + status = "disabled";
> > +};
> > +
> > +&usbotg {
> > + vbus-supply = <®_usb_otg_vbus>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usbotg>;
> > + disable-over-current;
> > + status = "disabled";
> > +};
> > +
> > +/* MMC1 */
> > +&usdhc1 {
> > + label = "MMC1";
>
> This...
>
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
> > + cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
> > + vmmc-supply = <®_3p3v>;
> > + bus-width = <8>;
> > + voltage-ranges = <3300 3300>;
> > + status = "disabled";
> > +};
> > +
> > +/* SD1 */
> > +&usdhc2 {
> > + label = "SD1";
>
> ...and this seem not to be specified upstream? (at least not in
> Documentation/devicetree/bindings/mmc/mmc.txt?)
> Not sure about this... Or is label a common convention and hence
> available for all nodes?
Yes, I guess one can put labels anywhere but I also don't see what the
exact purpose of them should be in this case so I will drop them.
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>;
> > + cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
> > + vmmc-supply = <®_3p3v>;
> > + bus-width = <4>;
> > + voltage-ranges = <3300 3300>;
> > + status = "disabled";
> > +};
> > +
> > +/* eMMC */
> > +&usdhc3 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usdhc3>;
> > + vmmc-supply = <®_3p3v>;
> > + bus-width = <8>;
> > + voltage-ranges = <3300 3300>;
> > + non-removable;
> > + status = "okay";
> > +};
> > +
> > +&weim {
> > + status = "disabled"; /* weim signals not accessible on
> > i.MX6 */
>
> They are accessible on the i.MX6 SoC.. but maybe "on Apalis iMX6Q/D".
> Or
> just remove the comment, since that is kind of what disabled says?
Yes, that comment seems bogus and will be dropped.
> > +};
>
> Otherwise:
> Reviewed-by: Stefan Agner <stefan@agner.ch>
Thanks!
> --
> Stefan
Cheers
Marcel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 8:28 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 8:28 UTC (permalink / raw)
To: linux-arm-kernel
Hi Stefan
On Wed, 2016-01-06 at 22:29 -0800, Stefan Agner wrote:
> Hi Marcel,
>
> On 2016-01-05 08:39, Marcel Ziswiler wrote:
> > From: Petr ?tetiar <ynezz@true.cz>
> >
> > Signed-off-by: Petr ?tetiar <ynezz@true.cz>
> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > ---
> >
> > Changes in v2:
> > - clarify exact Apalis iMX6Q/D SoM type in cover letter
> > - clarify exact Apalis iMX6Q/D module type and Ixora carrier board
> > in model
> > ? node
> > - got rid of obsolete mmc aliases
> > - working SGTL5000 audio/sound integration
> > - working STMPE811 touch screen controller integration
> > - integrated review feedback from Lucas
> > - left and even added some more comments as I don't see why putting
> > any
> > ? explanatory comments in dts' should be such a bad thing to do
> > - completely got rid of the memory node as that is something
> > typically filled
> > ? in by the boot loader e.g. U-Boot
> > - without the regulators simple-bus it no longer boots
> > - even though we supposedly shipped a few hundred V1.0a modules
> > drop DCE UART
> > ? support for now and simplify file layout
> > - replaced obsolete no-1-8-v by mainline supported voltage-ranges =
> > <3300 3300>
> > ? usdhc property and yes card detects are indeed active low (;-p)
> > - integrated review feedback from Stefan
> > - fixed Ethernet PHY reset & interrupt (requires Micrel PHY driver
> > to be
> > ? enabled)
> > - fixed HDMI DDC (requires GPIO-based bitbanging I2C to be enabled)
> > - fixed SPDIF
> >
> > ?arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1040
> > +++++++++++++++++++++++++++++++++
> > ?1 file changed, 1040 insertions(+)
> > ?create mode 100644 arch/arm/boot/dts/imx6qdl-apalis.dtsi
> >
> > diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> > b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> > new file mode 100644
> > index 0000000..6104e2e
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> > @@ -0,0 +1,1040 @@
> > +/*
> > + * Copyright 2014-2016 Toradex AG
> > + * Copyright 2012 Freescale Semiconductor, Inc.
> > + * Copyright 2011 Linaro Ltd.
> > + *
> > + * This file is dual-licensed: you can use it either under the
> > terms
> > + * of the GPL or the X11 license, at your option. Note that this
> > dual
> > + * licensing only applies to this file, and not this project as a
> > + * whole.
> > + *
> > + *??a) This file is free software; you can redistribute it and/or
> > + *?????modify it under the terms of the GNU General Public License
> > + *?????version 2 as published by the Free Software Foundation.
> > + *
> > + *?????This file is distributed in the hope that it will be useful
> > + *?????but WITHOUT ANY WARRANTY; without even the implied warranty
> > of
> > + *?????MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See
> > the
> > + *?????GNU General Public License for more details.
> > + *
> > + * Or, alternatively
> > + *
> > + *??b) Permission is hereby granted, free of charge, to any person
> > + *?????obtaining a copy of this software and associated
> > documentation
> > + *?????files (the "Software"), to deal in the Software without
> > + *?????restriction, including without limitation the rights to use
> > + *?????copy, modify, merge, publish, distribute, sublicense,
> > and/or
> > + *?????sell copies of the Software, and to permit persons to whom
> > the
> > + *?????Software is furnished to do so, subject to the following
> > + *?????conditions:
> > + *
> > + *?????The above copyright notice and this permission notice shall
> > be
> > + *?????included in all copies or substantial portions of the
> > Software.
> > + *
> > + *?????THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> > + *?????EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
> > WARRANTIES
> > + *?????OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> > + *?????NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> > + *?????HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> > + *?????WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > ARISING
> > + *?????FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
> > OR
> > + *?????OTHER DEALINGS IN THE SOFTWARE.
> > + */
> > +
> > +#include <dt-bindings/gpio/gpio.h>
> > +
> > +/ {
> > + model = "Toradex Apalis iMX6Q/D Module";
> > + compatible = "toradex,apalis_imx6q", "fsl,imx6q";
> > +
> > + backlight: backlight {
> > + compatible = "pwm-backlight";
> > + pwms = <&pwm4 0 5000000>;
> > + status = "disabled";
> > + };
> > +
> > + /* DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 */
> > + i2cddc: i2c at 0 {
> > + compatible = "i2c-gpio";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_i2c_ddc>;
> > + gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
> > + ?&gpio2 30 GPIO_ACTIVE_HIGH /* scl */
> > + >;
> > + i2c-gpio,delay-us = <2>; /* ~100 kHz */
> > + status = "okay";
> > + };
> > +
> > + regulators {
> > + compatible = "simple-bus";
> > +
> > + reg_1p8v: 1p8v {
> > + compatible = "regulator-fixed";
> > + regulator-name = "1P8V";
> > + regulator-min-microvolt = <1800000>;
> > + regulator-max-microvolt = <1800000>;
> > + regulator-always-on;
> > + };
> > +
> > + reg_2p5v: 2p5v {
> > + compatible = "regulator-fixed";
> > + regulator-name = "2P5V";
> > + regulator-min-microvolt = <2500000>;
> > + regulator-max-microvolt = <2500000>;
> > + regulator-always-on;
> > + };
> > +
> > + reg_3p3v: 3p3v {
> > + compatible = "regulator-fixed";
> > + regulator-name = "3P3V";
> > + regulator-min-microvolt = <3300000>;
> > + regulator-max-microvolt = <3300000>;
> > + regulator-always-on;
> > + };
> > +
> > + reg_usb_otg_vbus: usb_otg_vbus {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 =
> > <&pinctrl_regulator_usbotg_pwr>;
> > + regulator-name = "usb_otg_vbus";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > + enable-active-high;
> > + status = "disabled";
> > + };
> > +
> > + /* on module usb hub */
> > + reg_usb_host_vbus_hub: usb_host_vbus_hub {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 =
> > <&pinctrl_regulator_usbhub_pwr>;
> > + regulator-name = "usb_host_vbus_hub";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio = <&gpio3 28 GPIO_ACTIVE_HIGH>;
> > + startup-delay-us = <2000>;
> > + enable-active-high;
> > + status = "okay";
> > + };
> > +
> > + reg_usb_host_vbus: usb_host_vbus {
> > + compatible = "regulator-fixed";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_regulator_usbh_pwr>;
> > + regulator-name = "usb_host_vbus";
> > + regulator-min-microvolt = <5000000>;
> > + regulator-max-microvolt = <5000000>;
> > + gpio =??<&gpio1 0 GPIO_ACTIVE_HIGH>;
> > + enable-active-high;
> > + vin-supply = <®_usb_host_vbus_hub>;
> > + status = "disabled";
> > + };
> > + };
> > +
> > + sound {
> > + compatible = "fsl,imx-audio-sgtl5000";
> > + model = "imx6q-apalis-sgtl5000";
> > + ssi-controller = <&ssi1>;
> > + audio-codec = <&codec>;
> > + audio-routing =
> > + "LINE_IN", "Line In Jack",
> > + "MIC_IN", "Mic Jack",
> > + "Mic Jack", "Mic Bias",
> > + "Headphone Jack", "HP_OUT";
> > + mux-int-port = <1>;
> > + mux-ext-port = <4>;
> > + };
> > +
> > + sound_spdif: sound-spdif {
> > + compatible = "fsl,imx-audio-spdif";
> > + model = "imx-spdif";
> > + spdif-controller = <&spdif>;
> > + spdif-in;
> > + spdif-out;
> > + status = "disabled";
> > + };
> > +};
> > +
> > +&audmux {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_audmux &pinctrl_audmux_mclk>;
> > + status = "okay";
> > +};
> > +
> > +/* Apalis SPI1 */
> > +&ecspi1 {
> > + fsl,spi-num-chipselects = <1>;
> > + cs-gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_spi_cs1>;
> > + status = "disabled";
> > +};
> > +
> > +/* Apalis SPI2 */
> > +&ecspi2 {
> > + fsl,spi-num-chipselects = <1>;
> > + cs-gpios = <&gpio2 26 GPIO_ACTIVE_HIGH>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_ecspi2 &pinctrl_spi_cs2>;
> > + status = "disabled";
> > +};
> > +
> > +&fec {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_enet &pinctrl_enet_ctrl>;
> > + phy-mode = "rgmii";
> > + phy-handle = <ðphy>;
> > + phy-reset-duration = <10>;
> > + phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
> > + status = "okay";
> > +
> > + mdio {
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > +
> > + ethphy: ethernet-phy at 7 {
> > + interrupt-parent = <&gpio1>;
> > + interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
> > + reg = <7>;
> > + };
> > + };
> > +};
> > +
> > +&can1 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_flexcan1>;
> > + status = "disabled";
> > +};
> > +
> > +&can2 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_flexcan2>;
> > + status = "disabled";
> > +};
> > +
> > +&hdmi {
> > + ddc-i2c-bus = <&i2cddc>;
> > + status = "okay";
> > +};
> > +
> > +/*
> > + * GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier
> > + * board)
> > + */
> > +&i2c1 {
> > + clock-frequency = <100000>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_i2c1>;
> > + status = "disabled";
> > +};
> > +
> > +&i2c2 {
> > + clock-frequency = <100000>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_i2c2>;
> > + status = "okay";
> > +
> > + pmic: pfuze100 at 08 {
> > + compatible = "fsl,pfuze100";
> > + reg = <0x08>;
> > +
> > + regulators {
> > + sw1a_reg: sw1ab {
> > + regulator-min-microvolt =
> > <300000>;
> > + regulator-max-microvolt =
> > <1875000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + regulator-ramp-delay = <6250>;
> > + };
> > +
> > + sw1c_reg: sw1c {
> > + regulator-min-microvolt =
> > <300000>;
> > + regulator-max-microvolt =
> > <1875000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + regulator-ramp-delay = <6250>;
> > + };
> > +
> > + sw3a_reg: sw3a {
> > + regulator-min-microvolt =
> > <400000>;
> > + regulator-max-microvolt =
> > <1975000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + swbst_reg: swbst {
> > + regulator-min-microvolt =
> > <5000000>;
> > + regulator-max-microvolt =
> > <5150000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + snvs_reg: vsnvs {
> > + regulator-min-microvolt =
> > <1000000>;
> > + regulator-max-microvolt =
> > <3000000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vref_reg: vrefddr {
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen1_reg: vgen1 {
> > + regulator-min-microvolt =
> > <800000>;
> > + regulator-max-microvolt =
> > <1550000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen2_reg: vgen2 {
> > + regulator-min-microvolt =
> > <800000>;
> > + regulator-max-microvolt =
> > <1550000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen3_reg: vgen3 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen4_reg: vgen4 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen5_reg: vgen5 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > +
> > + vgen6_reg: vgen6 {
> > + regulator-min-microvolt =
> > <1800000>;
> > + regulator-max-microvolt =
> > <3300000>;
> > + regulator-boot-on;
> > + regulator-always-on;
> > + };
> > + };
> > + };
> > +
> > + codec: sgtl5000 at 0a {
> > + compatible = "fsl,sgtl5000";
> > + reg = <0x0a>;
> > + clocks = <&clks 201>;
> > + VDDA-supply = <®_2p5v>;
> > + VDDIO-supply = <®_3p3v>;
>
> Nit: The device tree bindings mention two more properties as required
> properties:
> micbias-resistor-k-ohms
> micbias-voltage-m-volts
>
> However, both have "If this node is not mentioned", hence I guess
> they
> are actually optional, but maybe we want to set an explicit value
> here?
Remember we don't make use of any of that microphone bias stuff on any
of our Apalis hardware.
> > + };
> > +
> > + /* STMPE811 touch screen controller */
> > + stmpe811 at 41 {
> > + compatible = "st,stmpe811";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_touch_int>;
> > + #address-cells = <1>;
> > + #size-cells = <0>;
> > + reg = <0x41>;
> > + interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
> > + interrupt-parent = <&gpio4>;
> > + interrupt-controller;
> > + id = <0>;
> > + blocks = <0x5>;
> > + irq-trigger = <0x1>;
> > + stmpe_touchscreen {
> > + compatible = "st,stmpe-ts";
> > + reg = <0>;
> > + /* 3.25 MHz ADC clock speed */
> > + st,adc-freq = <1>;
> > + /* 8 sample average control */
> > + st,ave-ctrl = <3>;
> > + /* 7 length fractional part in z */
> > + st,fraction-z = <7>;
> > + /*
> > + ?* 50 mA typical 80 mA max touchscreen
> > drivers
> > + ?* current limit value
> > + ?*/
> > + st,i-drive = <1>;
> > + /* 12-bit ADC */
> > + st,mod-12b = <1>;
> > + /* internal ADC reference */
> > + st,ref-sel = <0>;
> > + /* ADC converstion time: 80 clocks */
> > + st,sample-time = <4>;
> > + /* 1 ms panel driver settling time */
> > + st,settling = <3>;
> > + /* 5 ms touch detect interrupt delay */
> > + st,touch-det-delay = <5>;
> > + };
> > + };
> > +};
> > +
> > +/*
> > + * GEN2_I2C, CAM: I2C3_SDA/SCL on MXM3 201/203 (unused)
> > + */
> > +&i2c3 {
> > + clock-frequency = <100000>;
> > + pinctrl-names = "default", "recovery";
> > + pinctrl-0 = <&pinctrl_i2c3>;
> > + pinctrl-1 = <&pinctrl_i2c3_recovery>;
> > + scl-gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>;
> > + sda-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;
> > + status = "disabled";
> > +};
> > +
> > +/* PAD Ctrl values for common settings */
> > +/*
> > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE
> > |
> > + *??PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > + */
> > +#define PAD_CTRL_HYS_PU 0x1b0b0
> > +
> > +/*
> > + * (PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_MED |
> > + *??PAD_CTL_DSE_40ohm)
> > + */
> > +#define PAD_CTRL_HYS_PD 0x130b0
> > +
> > +/*
> > + * (PAD_CTL_PUS_22K_UP | PAD_CTL_PUE | PAD_CTL_PKE |
> > PAD_CTL_SPEED_LOW |
> > + *??PAD_CTL_DSE_80ohm)
> > + */
> > +#define PAD_CTRL_PU_22k 0x0f058
> > +
> > +&iomuxc {
>
> I think it is a convention to move iomuxc at the very end for better
> readability of the rest. At least the Vybrid dts and the more
> recently
> added imx7d-sdb.dts follow this rule.
Yes, while the Tegras have it at the beginning NXP wants it at the end
(;-p).
> > + ecspi {
> > + pinctrl_ecspi1: ecspi1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT6__ECSPI1_MISO
> > 0x100b1
> > + MX6QDL_PAD_CSI0_DAT5__ECSPI1_MOSI
> > 0x100b1
> > + MX6QDL_PAD_CSI0_DAT4__ECSPI1_SCLK
> > 0x100b1
> > + >;
> > + };
> > + pinctrl_ecspi2: ecspi2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_OE__ECSPI2_MISO
> > 0x100b1
> > + MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI
> > 0x100b1
> > + MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK
> > 0x100b1
> > + >;
> > + };
> > + pinctrl_spi_cs1: spi_cs1 {
> > + fsl,pins = <
> > + /* SPI1 cs */
> > + MX6QDL_PAD_CSI0_DAT7__GPIO5_IO25
> > 0x000b1
> > + >;
> > + };
> > + pinctrl_spi_cs2: spi_cs2 {
> > + fsl,pins = <
> > + /* SPI2 cs */
> > + MX6QDL_PAD_EIM_RW__GPIO2_IO26
> > 0x000b1
> > + >;
> > + };
> > + };
> > +
> > + flexcan {
> > + pinctrl_flexcan1: flexcan1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_7__FLEXCAN1_TX
> > 0x1b0b0
> > + MX6QDL_PAD_GPIO_8__FLEXCAN1_RX
> > 0x1b0b0
> > + >;
> > + };
> > + pinctrl_flexcan2: flexcan2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX
> > 0x1b0b0
> > + MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX
> > 0x1b0b0
> > + >;
> > + };
> > + };
> > +
> > + gpio {
> > + pinctrl_apalis_gpio1: apalis_gpio1 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D4__GPIO2_IO04
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio2: apalis_gpio2 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D5__GPIO2_IO05
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio3: apalis_gpio3 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D6__GPIO2_IO06
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio4: apalis_gpio4 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_D7__GPIO2_IO07
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio5: apalis_gpio5 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_RB0__GPIO6_IO10
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio6: apalis_gpio6 {
> > + fsl,pins = <
> > + MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09
> > + PAD_CTRL_HYS_PD
>
> The 80 character limit normally is not enforced for device trees,
> hence
> I would remove that line break here...
Yes, and then trying to teach patman to actually ignore that warning
(;-p).
> > + >;
> > + };
> > + pinctrl_apalis_gpio7: apalis_gpio7 {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_2__GPIO1_IO02
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_apalis_gpio8: apalis_gpio8 {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_6__GPIO1_IO06
> > PAD_CTRL_HYS_PD
> > + >;
> > + };
> > + pinctrl_gpio_keys: gpio_keys {
> > + fsl,pins = <
> > + /* Power Button */
> > + MX6QDL_PAD_GPIO_4__GPIO1_IO04
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + };
> > +
> > + hdmi {
> > + pinctrl_hdmi_cec: hdmicecgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_L
> > INE 0x1f8b0
> > + >;
> > + };
> > + };
> > +
> > + i2c {
> > + pinctrl_i2c_ddc: i2c_ddc {
> > + fsl,pins = <
> > + /* DDC bitbang */
> > + MX6QDL_PAD_EIM_EB2__GPIO2_IO30
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_EIM_D16__GPIO3_IO16
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + pinctrl_i2c1: i2c1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT8__I2C1_SDA
> > 0x4001b8b1
> > + MX6QDL_PAD_CSI0_DAT9__I2C1_SCL
> > 0x4001b8b1
> > + >;
> > + };
> > + pinctrl_i2c3: i2c3grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_D17__I2C3_SCL
> > 0x4001b8b1
> > + MX6QDL_PAD_EIM_D18__I2C3_SDA
> > 0x4001b8b1
> > + >;
> > + };
> > + pinctrl_i2c3_recovery: i2c3-recoverygrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_D17__GPIO3_IO17
> > 0x4001b8b1
> > + MX6QDL_PAD_EIM_D18__GPIO3_IO18
> > 0x4001b8b1
> > + >;
> > + };
> > + };
> > +
> > + /* pins used on module */
> > + imx6q-apalis {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_reset_moci
> > &pinctrl_emmc_reset>;
> > + pinctrl_audmux: audmuxgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_DISP0_DAT20__AUD4_TXC
> > 0x130b0
> > + MX6QDL_PAD_DISP0_DAT21__AUD4_TXD
> > 0x130b0
> > + MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS
> > 0x130b0
> > + MX6QDL_PAD_DISP0_DAT23__AUD4_RXD
> > 0x130b0
> > + >;
> > + };
> > + pinctrl_audmux_mclk: audmux_mclk {
> > + fsl,pins = <
> > + /* SGTL5000 sys_mclk */
> > + MX6QDL_PAD_GPIO_5__CCM_CLKO1
> > 0x130b0
> > + >;
> > + };
> > + pinctrl_emmc_reset: emmc_reset {
> > + fsl,pins = <
> > + /* eMMC reset, leave it alone */
> > + MX6QDL_PAD_SD3_RST__GPIO7_IO08
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + pinctrl_enet: enetgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_ENET_MDIO__ENET_MDIO
> > 0x100b0
> > + MX6QDL_PAD_ENET_MDC__ENET_MDC
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TXC__RGMII_TXC
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD0__RGMII_TD0
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD1__RGMII_TD1
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD2__RGMII_TD2
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TD3__RGMII_TD3
> > 0x100b0
> > + MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_
> > CTL 0x100b0
> > + MX6QDL_PAD_ENET_REF_CLK__ENET_TX_C
> > LK 0x100b0
> > + MX6QDL_PAD_RGMII_RXC__RGMII_RXC
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD0__RGMII_RD0
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD1__RGMII_RD1
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD2__RGMII_RD2
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RD3__RGMII_RD3
> > 0x1b0b0
> > + MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_
> > CTL 0x1b0b0
> > + >;
> > + };
> > + pinctrl_enet_ctrl: enet_ctrlgrp {
> > + fsl,pins = <
> > + /* Ethernet PHY reset */
> > + MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25
> > 0x000b0
> > + /* Ethernet PHY interrupt */
> > + MX6QDL_PAD_ENET_TXD0__GPIO1_IO30
> > 0x000b1
> > + >;
> > + };
> > + pinctrl_i2c2: i2c2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL3__I2C2_SCL
> > 0x4001b8b1
> > + MX6QDL_PAD_KEY_ROW3__I2C2_SDA
> > 0x4001b8b1
> > + >;
> > + };
> > + pinctrl_ipu2_vdac: ipu2vdacgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_
> > DISP_CLK 0xd1
> > + MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN
> > 15???????0xd1
> > + MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN0
> > 2????????0xd1
> > + MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN0
> > 3????????0xd1
> > + MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_
> > DATA00???0xf9
> > + MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_
> > DATA01???0xf9
> > + MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_
> > DATA02???0xf9
> > + MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_
> > DATA03???0xf9
> > + MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_
> > DATA04???0xf9
> > + MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_
> > DATA05???0xf9
> > + MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_
> > DATA06???0xf9
> > + MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_
> > DATA07???0xf9
> > + MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_
> > DATA08???0xf9
> > + MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_
> > DATA09???0xf9
> > + MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0
> > _DATA10??0xf9
> > + MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0
> > _DATA11??0xf9
> > + MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0
> > _DATA12??0xf9
> > + MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0
> > _DATA13??0xf9
> > + MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0
> > _DATA14??0xf9
> > + MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0
> > _DATA15??0xf9
> > + >;
> > + };
> > + pinctrl_regulator_usbhub_pwr:
> > gpio_regulator_usbhub_pwr {
> > + fsl,pins = <
> > + /* USBH_HUB_EN */
> > + MX6QDL_PAD_EIM_D28__GPIO3_IO28
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + pinctrl_reset_moci: gpio_reset_moci {
> > + fsl,pins = <
> > + /* RESET_MOCI control */
> > + MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28
> > + PAD_CTRL_PU_22k
> > + >;
> > + };
> > + pinctrl_touch_int: touch_intgrp {
> > + fsl,pins = <
> > + /* STMPE811 interrupt */
> > + MX6QDL_PAD_KEY_COL2__GPIO4_IO10
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + pinctrl_usdhc3: usdhc3grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD????0x1
> > 7059
> > + MX6QDL_PAD_SD3_CLK__SD3_CLK????0x1
> > 0059
> > + MX6QDL_PAD_SD3_DAT0__SD3_DATA0
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT1__SD3_DATA1
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT2__SD3_DATA2
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT3__SD3_DATA3
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT4__SD3_DATA4
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT5__SD3_DATA5
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT6__SD3_DATA6
> > 0x17059
> > + MX6QDL_PAD_SD3_DAT7__SD3_DATA7
> > 0x17059
> > + >;
> > + };
> > + pinctrl_usdhc3_100mhz: usdhc3grp-100mhz { /*
> > 100Mhz */
>
> I do not have a strong opinion on comments, but if they are pure
> duplication of what is already there, I kind of prefer to not add
> them...
Agreed.
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD
> > 0x170B9
> > + MX6QDL_PAD_SD3_CLK__SD3_CLK
> > 0x100B9
> > + MX6QDL_PAD_SD3_DAT0__SD3_DATA0
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT1__SD3_DATA1
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT2__SD3_DATA2
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT3__SD3_DATA3
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT4__SD3_DATA4
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT5__SD3_DATA5
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT6__SD3_DATA6
> > 0x170B9
> > + MX6QDL_PAD_SD3_DAT7__SD3_DATA7
> > 0x170B9
> > + >;
> > + };
> > + pinctrl_usdhc3_200mhz: usdhc3grp-200mhz { /*
> > 200Mhz */
> > + fsl,pins = <
> > + MX6QDL_PAD_SD3_CMD__SD3_CMD
> > 0x170F9
> > + MX6QDL_PAD_SD3_CLK__SD3_CLK
> > 0x100F9
> > + MX6QDL_PAD_SD3_DAT0__SD3_DATA0
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT1__SD3_DATA1
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT2__SD3_DATA2
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT3__SD3_DATA3
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT4__SD3_DATA4
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT5__SD3_DATA5
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT6__SD3_DATA6
> > 0x170F9
> > + MX6QDL_PAD_SD3_DAT7__SD3_DATA7
> > 0x170F9
> > + >;
> > + };
> > + };
> > +
> > + ipu1 {
> > + pinctrl_ipu1_lcdif: ipu1lcdifgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_A16__IPU1_DI1_DISP_
> > CLK 0x61
> > + /* DE */
> > + MX6QDL_PAD_EIM_DA10__IPU1_DI1_PIN1
> > 5 0x61
> > + /* HSync */
> > + MX6QDL_PAD_EIM_DA11__IPU1_DI1_PIN0
> > 2 0x61
> > + /* VSync */
> > + MX6QDL_PAD_EIM_DA12__IPU1_DI1_PIN0
> > 3 0x61
> > + MX6QDL_PAD_EIM_DA9__IPU1_DISP1_DAT
> > A00 0x61
> > + MX6QDL_PAD_EIM_DA8__IPU1_DISP1_DAT
> > A01 0x61
> > + MX6QDL_PAD_EIM_DA7__IPU1_DISP1_DAT
> > A02 0x61
> > + MX6QDL_PAD_EIM_DA6__IPU1_DISP1_DAT
> > A03 0x61
> > + MX6QDL_PAD_EIM_DA5__IPU1_DISP1_DAT
> > A04 0x61
> > + MX6QDL_PAD_EIM_DA4__IPU1_DISP1_DAT
> > A05 0x61
> > + MX6QDL_PAD_EIM_DA3__IPU1_DISP1_DAT
> > A06 0x61
> > + MX6QDL_PAD_EIM_DA2__IPU1_DISP1_DAT
> > A07 0x61
> > + MX6QDL_PAD_EIM_DA1__IPU1_DISP1_DAT
> > A08 0x61
> > + MX6QDL_PAD_EIM_DA0__IPU1_DISP1_DAT
> > A09 0x61
> > + MX6QDL_PAD_EIM_EB1__IPU1_DISP1_DAT
> > A10 0x61
> > + MX6QDL_PAD_EIM_EB0__IPU1_DISP1_DAT
> > A11 0x61
> > + MX6QDL_PAD_EIM_A17__IPU1_DISP1_DAT
> > A12 0x61
> > + MX6QDL_PAD_EIM_A18__IPU1_DISP1_DAT
> > A13 0x61
> > + MX6QDL_PAD_EIM_A19__IPU1_DISP1_DAT
> > A14 0x61
> > + MX6QDL_PAD_EIM_A20__IPU1_DISP1_DAT
> > A15 0x61
> > + MX6QDL_PAD_EIM_A21__IPU1_DISP1_DAT
> > A16 0x61
> > + MX6QDL_PAD_EIM_A22__IPU1_DISP1_DAT
> > A17 0x61
> > + MX6QDL_PAD_EIM_A23__IPU1_DISP1_DAT
> > A18 0x61
> > + MX6QDL_PAD_EIM_A24__IPU1_DISP1_DAT
> > A19 0x61
> > + MX6QDL_PAD_EIM_D31__IPU1_DISP1_DAT
> > A20 0x61
> > + MX6QDL_PAD_EIM_D30__IPU1_DISP1_DAT
> > A21 0x61
> > + MX6QDL_PAD_EIM_D26__IPU1_DISP1_DAT
> > A22 0x61
> > + MX6QDL_PAD_EIM_D27__IPU1_DISP1_DAT
> > A23 0x61
> > + >;
> > + };
> > + pinctrl_cam_mclk: cam_mclk {
> > + fsl,pins = <
> > + /* CAM sys_mclk */
> > + MX6QDL_PAD_NANDF_CS2__CCM_CLKO2
> > 0x00b0
> > + >;
> > + };
> > + pinctrl_ipu1_csi0: ipu1csi0grp { /* parallel
> > camera */
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_D
> > ATA12??0xb0b1
> > + MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_D
> > ATA13??0xb0b1
> > + MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_D
> > ATA14??0xb0b1
> > + MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_D
> > ATA15??0xb0b1
> > + MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_D
> > ATA16??0xb0b1
> > + MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_D
> > ATA17??0xb0b1
> > + MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_D
> > ATA18??0xb0b1
> > + MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_D
> > ATA19??0xb0b1
> > + MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_
> > PIXCLK 0xb0b1
> > + MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HS
> > YNC????0xb0b1
> > + MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_V
> > SYNC???0xb0b1
> > + >;
> > + };
> > + };
> > +
> > + pwm {
> > + pinctrl_pwm1: pwm1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_9__PWM1_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + pinctrl_pwm2: pwm2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_1__PWM2_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + pinctrl_pwm3: pwm3grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT1__PWM3_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + pinctrl_pwm4: pwm4grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT2__PWM4_OUT
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + spdif {
> > + pinctrl_spdif: spdifgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_GPIO_16__SPDIF_IN??0x1b
> > 0b0
> > + MX6QDL_PAD_GPIO_17__SPDIF_OUT
> > 0x1b0b0
> > + >;
> > + };
> > + };
> > +
> > + uart1 {
> > + pinctrl_uart1_dce: uart1-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT10__UART1_TX_DA
> > TA 0x1b0b1
> > + MX6QDL_PAD_CSI0_DAT11__UART1_RX_DA
> > TA 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart1_dte: uart1-dtegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_CSI0_DAT10__UART1_RX_DA
> > TA 0x1b0b1
> > + MX6QDL_PAD_CSI0_DAT11__UART1_TX_DA
> > TA 0x1b0b1
> > + MX6QDL_PAD_EIM_D19__UART1_RTS_B
> > 0x1b0b1
> > + MX6QDL_PAD_EIM_D20__UART1_CTS_B
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* Additional DTR, DSR, DCD */
> > + pinctrl_uart1_ctrl: uart1-ctrlgrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_EIM_D23__UART1_DCD_B
> > 0x1b0b0
> > + MX6QDL_PAD_EIM_D24__UART1_DTR_B
> > 0x1b0b0
> > + MX6QDL_PAD_EIM_D25__UART1_DSR_B
> > 0x1b0b0
> > + >;
> > + };
> > + };
> > +
> > + uart2 {
> > + pinctrl_uart2_dce: uart2-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart2_dte: uart2grp-dte {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD4_DAT4__UART2_TX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT7__UART2_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT6__UART2_RTS_B
> > 0x1b0b1
> > + MX6QDL_PAD_SD4_DAT5__UART2_CTS_B
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + uart4 {
> > + pinctrl_uart4_dce: uart4-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL0__UART4_TX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart4_dte: uart4-dtegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL0__UART4_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW0__UART4_TX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + uart5 {
> > + pinctrl_uart5_dce: uart5-dcegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL1__UART5_TX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > +
> > + /* DTE mode */
> > + pinctrl_uart5_dte: uart5-dtegrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_KEY_COL1__UART5_RX_DATA
> > 0x1b0b1
> > + MX6QDL_PAD_KEY_ROW1__UART5_TX_DATA
> > 0x1b0b1
> > + >;
> > + };
> > + };
> > +
> > + usbh {
> > + pinctrl_regulator_usbh_pwr:
> > gpio_regulator_usbh_pwr {
> > + fsl,pins = <
> > + /* USBH_EN */
> > + MX6QDL_PAD_GPIO_0__GPIO1_IO00
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + };
> > +
> > + usbotg {
> > + pinctrl_usbotg: usbotggrp {
> > + fsl,pins = <
> > + MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID
> > 0x17059
> > + >;
> > + };
> > + pinctrl_regulator_usbotg_pwr:
> > gpio_regulator_usbotg_pwr {
> > + fsl,pins = <
> > + /* USBO power en */
> > + MX6QDL_PAD_EIM_D22__GPIO3_IO22
> > PAD_CTRL_PU_22k
> > + >;
> > + };
> > + };
> > +
> > + usdhc {
> > + pinctrl_mmc_cd: gpio_mmc_cd {
> > + fsl,pins = <
> > + ?/* MMC1 CD */
> > + MX6QDL_PAD_DI0_PIN4__GPIO4_IO20
> > 0x000b0
> > + >;
> > + };
> > + pinctrl_sd_cd: gpio_sd_cd {
> > + fsl,pins = <
> > + /* SD1 CD */
> > + MX6QDL_PAD_NANDF_CS1__GPIO6_IO14
> > 0x000b0
> > + >;
> > + };
> > + pinctrl_usdhc1: usdhc1grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD1_CMD__SD1_CMD????0x1
> > 7071
> > + MX6QDL_PAD_SD1_CLK__SD1_CLK????0x1
> > 0071
> > + MX6QDL_PAD_SD1_DAT0__SD1_DATA0
> > 0x17071
> > + MX6QDL_PAD_SD1_DAT1__SD1_DATA1
> > 0x17071
> > + MX6QDL_PAD_SD1_DAT2__SD1_DATA2
> > 0x17071
> > + MX6QDL_PAD_SD1_DAT3__SD1_DATA3
> > 0x17071
> > + MX6QDL_PAD_NANDF_D0__SD1_DATA4
> > 0x17071
> > + MX6QDL_PAD_NANDF_D1__SD1_DATA5
> > 0x17071
> > + MX6QDL_PAD_NANDF_D2__SD1_DATA6
> > 0x17071
> > + MX6QDL_PAD_NANDF_D3__SD1_DATA7
> > 0x17071
> > + >;
> > + };
> > + pinctrl_usdhc2: usdhc2grp {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD2_CMD__SD2_CMD????0x1
> > 7071
> > + MX6QDL_PAD_SD2_CLK__SD2_CLK????0x1
> > 0071
> > + MX6QDL_PAD_SD2_DAT0__SD2_DATA0
> > 0x17071
> > + MX6QDL_PAD_SD2_DAT1__SD2_DATA1
> > 0x17071
> > + MX6QDL_PAD_SD2_DAT2__SD2_DATA2
> > 0x17071
> > + MX6QDL_PAD_SD2_DAT3__SD2_DATA3
> > 0x17071
> > + >;
> > + };
> > + };
> > +};
> > +
> > +&ldb {
> > + status = "okay";
> > +};
> > +
> > +&pwm1 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm1>;
> > + status = "disabled";
> > +};
> > +
> > +&pwm2 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm2>;
> > + status = "disabled";
> > +};
> > +
> > +&pwm3 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm3>;
> > + status = "disabled";
> > +};
> > +
> > +&pwm4 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_pwm4>;
> > + status = "disabled";
> > +};
> > +
> > +&spdif {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_spdif>;
> > + status = "disabled";
> > +};
> > +
> > +&ssi1 {
> > + fsl,mode = "i2s-slave";
> > + status = "okay";
> > +};
> > +
> > +&uart1 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart1_dte &pinctrl_uart1_ctrl>;
> > + fsl,dte-mode;
> > + fsl,uart-has-rtscts;
> > + status = "disabled";
> > +};
> > +
> > +&uart2 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart2_dte>;
> > + fsl,dte-mode;
> > + fsl,uart-has-rtscts;
> > + status = "disabled";
> > +};
> > +
> > +&uart4 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart4_dte>;
> > + fsl,dte-mode;
> > + status = "disabled";
> > +};
> > +
> > +&uart5 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_uart5_dte>;
> > + fsl,dte-mode;
> > + status = "disabled";
> > +};
> > +
> > +&usbh1 {
> > + vbus-supply = <®_usb_host_vbus>;
> > + status = "disabled";
> > +};
> > +
> > +&usbotg {
> > + vbus-supply = <®_usb_otg_vbus>;
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usbotg>;
> > + disable-over-current;
> > + status = "disabled";
> > +};
> > +
> > +/* MMC1 */
> > +&usdhc1 {
> > + label = "MMC1";
>
> This...
>
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
> > + cd-gpios = <&gpio4 20 GPIO_ACTIVE_LOW>;
> > + vmmc-supply = <®_3p3v>;
> > + bus-width = <8>;
> > + voltage-ranges = <3300 3300>;
> > + status = "disabled";
> > +};
> > +
> > +/* SD1 */
> > +&usdhc2 {
> > + label = "SD1";
>
> ...and this seem not to be specified upstream? (at least not in
> Documentation/devicetree/bindings/mmc/mmc.txt?)
> Not sure about this... Or is label a common convention and hence
> available for all nodes?
Yes, I guess one can put labels anywhere but I also don't see what the
exact purpose of them should be in this case so I will drop them.
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_sd_cd>;
> > + cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
> > + vmmc-supply = <®_3p3v>;
> > + bus-width = <4>;
> > + voltage-ranges = <3300 3300>;
> > + status = "disabled";
> > +};
> > +
> > +/* eMMC */
> > +&usdhc3 {
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_usdhc3>;
> > + vmmc-supply = <®_3p3v>;
> > + bus-width = <8>;
> > + voltage-ranges = <3300 3300>;
> > + non-removable;
> > + status = "okay";
> > +};
> > +
> > +&weim {
> > + status = "disabled"; /* weim signals not accessible on
> > i.MX6 */
>
> They are accessible on the i.MX6 SoC.. but maybe "on Apalis iMX6Q/D".
> Or
> just remove the comment, since that is kind of what disabled says?
Yes, that comment seems bogus and will be dropped.
> > +};
>
> Otherwise:
> Reviewed-by: Stefan Agner <stefan@agner.ch>
Thanks!
> --
> Stefan
Cheers
Marcel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: imx6: Add support for Toradex Ixora carrier board
2016-01-07 6:38 ` Stefan Agner
(?)
@ 2016-01-08 8:29 ` Marcel Ziswiler
-1 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 8:29 UTC (permalink / raw)
To: stefan
Cc: linux-kernel, shawn.guo, robh+dt, pawel.moll, devicetree,
festevam, mark.rutland, galak, ijc+devicetree, stillcompiling,
ynezz, linux-arm-kernel, shawnguo, l.stach, kernel, linux
Hi Stefan
On Wed, 2016-01-06 at 22:38 -0800, Stefan Agner wrote:
> Hi Marcel,
>
> On 2016-01-05 08:39, Marcel Ziswiler wrote:
> > From: Petr Štetiar <ynezz@true.cz>
> >
> > Signed-off-by: Petr Štetiar <ynezz@true.cz>
> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > ---
> >
> > Changes in v2: None
> >
> > arch/arm/boot/dts/Makefile | 1 +
> > arch/arm/boot/dts/imx6q-apalis-ixora.dts | 256
> > +++++++++++++++++++++++++++++++
> > 2 files changed, 257 insertions(+)
> > create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
> >
> > diff --git a/arch/arm/boot/dts/Makefile
> > b/arch/arm/boot/dts/Makefile
> > index 44508dc..29b1aae 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -315,6 +315,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
> > imx6dl-udoo.dtb \
> > imx6dl-wandboard.dtb \
> > imx6dl-wandboard-revb1.dtb \
> > + imx6q-apalis-ixora.dtb \
> > imx6q-apf6dev.dtb \
> > imx6q-arm2.dtb \
> > imx6q-cm-fx6.dtb \
> > diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> > b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> > new file mode 100644
> > index 0000000..5494a13
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> > @@ -0,0 +1,256 @@
> > +/*
> > + * Copyright 2014-2016 Toradex AG
> > + * Copyright 2012 Freescale Semiconductor, Inc.
> > + * Copyright 2011 Linaro Ltd.
> > + *
> > + * This file is dual-licensed: you can use it either under the
> > terms
> > + * of the GPL or the X11 license, at your option. Note that this
> > dual
> > + * licensing only applies to this file, and not this project as a
> > + * whole.
> > + *
> > + * a) This file is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU General Public License
> > + * version 2 as published by the Free Software Foundation.
> > + *
> > + * This file is distributed in the hope that it will be useful
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty
> > of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
> > the
> > + * GNU General Public License for more details.
> > + *
> > + * Or, alternatively
> > + *
> > + * b) Permission is hereby granted, free of charge, to any person
> > + * obtaining a copy of this software and associated
> > documentation
> > + * files (the "Software"), to deal in the Software without
> > + * restriction, including without limitation the rights to use
> > + * copy, modify, merge, publish, distribute, sublicense,
> > and/or
> > + * sell copies of the Software, and to permit persons to whom
> > the
> > + * Software is furnished to do so, subject to the following
> > + * conditions:
> > + *
> > + * The above copyright notice and this permission notice shall
> > be
> > + * included in all copies or substantial portions of the
> > Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
> > WARRANTIES
> > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > ARISING
> > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
> > OR
> > + * OTHER DEALINGS IN THE SOFTWARE.
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include <dt-bindings/gpio/gpio.h>
> > +#include <dt-bindings/input/input.h>
> > +#include <dt-bindings/interrupt-controller/irq.h>
> > +#include "imx6q.dtsi"
> > +#include "imx6qdl-apalis.dtsi"
> > +
> > +/ {
> > + model = "Toradex Apalis iMX6Q/D Module on Ixora Carrier
> > Board";
> > + compatible = "toradex,apalis_imx6q-ixora",
> > "toradex,apalis_imx6q",
> > + "fsl,imx6q";
> > +
> > + aliases {
> > + i2c0 = &i2cddc;
> > + i2c1 = &i2c1;
> > + i2c2 = &i2c2;
> > + i2c3 = &i2c3;
> > + };
> > +
> > + aliases {
> > + rtc0 = &rtc_i2c;
> > + rtc1 = "/soc/aips-bus@02000000/snvs@020cc000/snvs-
> > rtc-lp@34";
>
> Probably easier and better readable when using the label here
> ("&snvs_rtc").
Agreed.
> > + };
> > +
> > + gpio-keys {
> > + compatible = "gpio-keys";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_gpio_keys>;
> > +
> > + wakeup {
> > + label = "Wake-Up";
> > + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
> > + linux,code = <KEY_WAKEUP>;
> > + debounce-interval = <10>;
> > + gpio-key,wakeup;
> > + };
> > + };
> > +
> > + leds {
> > + compatible = "gpio-leds";
> > +
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_leds_ixora>;
> > +
> > + led4-green {
> > + label = "LED_4_GREEN";
> > + gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led4-red {
> > + label = "LED_4_RED";
> > + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led5-green {
> > + label = "LED_5_GREEN";
> > + gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led5-red {
> > + label = "LED_5_RED";
> > + gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
> > + };
> > + };
> > +
> > + pwmleds {
> > + compatible = "pwm-leds";
> > + ledpwm1 {
> > + label = "PWM1";
> > + pwms = <&pwm1 0 50000>;
> > + max-brightness = <255>;
> > + };
> > +
> > + ledpwm2 {
> > + label = "PWM2";
> > + pwms = <&pwm2 0 50000>;
> > + max-brightness = <255>;
> > + };
> > +
> > + ledpwm3 {
> > + label = "PWM3";
> > + pwms = <&pwm3 0 50000>;
> > + max-brightness = <255>;
> > + };
> > + };
> > +
> > + regulators {
> > + reg_usb_otg_vbus: usb_otg_vbus {
> > + status = "okay";
> > + };
> > +
> > + reg_usb_host_vbus: usb_host_vbus {
> > + status = "okay";
> > + };
> > + };
> > +};
> > +
> > +&backlight {
> > + brightness-levels = <0 127 191 223 239 247 251 255>;
> > + default-brightness-level = <1>;
> > + status = "okay";
> > +};
> > +
> > +&can1 {
> > + status = "okay";
> > +};
> > +
> > +&can2 {
> > + status = "okay";
> > +};
> > +
> > +/* GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier
> > board) */
> > +&i2c1 {
> > + status = "okay";
> > +
> > + cat24c02@50 {
>
> According to devicetree.org, nodes are named according to what kind
> of
> device it represents. Hence this should be eeprom@50.
Agreed.
> > + compatible = "atmel,24c02";
> > + reg = <0x50>;
> > + };
> > +
> > + /* M41T0M6 real time clock on carrier board */
> > + rtc_i2c: rtc@68 {
> > + compatible = "st,m41t00";
> > + reg = <0x68>;
> > + };
> > +};
> > +
> > +&iomuxc {
>
> This should go to the end of the device tree.
Agreed.
> Otherwise looks good to me:
> Reviewed-by: Stefan Agner <stefan@agner.ch>
Thanks!
> --
> Stefan
>
> > + /*
> > + * Mux the Apalis GPIOs, GPIO7 used for PCIe reset,
> > + * GPIO5, 6 used by optional fusion_F0710A kernel module
> > + */
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
> > + &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
> > + &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
> > + &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8>;
> > +
> > + leds_ixora {
> > + pinctrl_leds_ixora: leds-ixora {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_SD1_DAT3__GPIO1_IO21
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_NANDF_D1__GPIO2_IO01
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_NANDF_D2__GPIO2_IO02
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + };
> > +};
> > +
> > +&pcie {
> > + /* active-low meaning opposite of regular PERST# active-
> > low polarity */
> > + reset-gpio = <&gpio1 28 GPIO_ACTIVE_LOW>;
> > + status = "okay";
> > +};
> > +
> > +&pwm1 {
> > + status = "okay";
> > +};
> > +
> > +&pwm2 {
> > + status = "okay";
> > +};
> > +
> > +&pwm3 {
> > + status = "okay";
> > +};
> > +
> > +&pwm4 {
> > + status = "okay";
> > +};
> > +
> > +&sata {
> > + status = "okay";
> > +};
> > +
> > +&sound_spdif {
> > + status = "okay";
> > +};
> > +
> > +&spdif {
> > + status = "okay";
> > +};
> > +
> > +&uart1 {
> > + status = "okay";
> > +};
> > +
> > +&uart2 {
> > + status = "okay";
> > +};
> > +
> > +&uart4 {
> > + status = "okay";
> > +};
> > +
> > +&uart5 {
> > + status = "okay";
> > +};
> > +
> > +&usbh1 {
> > + status = "okay";
> > +};
> > +
> > +&usbotg {
> > + status = "okay";
> > +};
> > +
> > +/* SD1 */
> > +&usdhc2 {
> > + status = "okay";
> > +};
Cheers
Marcel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: imx6: Add support for Toradex Ixora carrier board
@ 2016-01-08 8:29 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 8:29 UTC (permalink / raw)
To: stefan
Cc: mark.rutland, devicetree, stillcompiling, linux, pawel.moll,
ijc+devicetree, shawnguo, linux-kernel, robh+dt, kernel, galak,
ynezz, shawn.guo, festevam, linux-arm-kernel, l.stach
Hi Stefan
On Wed, 2016-01-06 at 22:38 -0800, Stefan Agner wrote:
> Hi Marcel,
>
> On 2016-01-05 08:39, Marcel Ziswiler wrote:
> > From: Petr Štetiar <ynezz@true.cz>
> >
> > Signed-off-by: Petr Štetiar <ynezz@true.cz>
> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > ---
> >
> > Changes in v2: None
> >
> > arch/arm/boot/dts/Makefile | 1 +
> > arch/arm/boot/dts/imx6q-apalis-ixora.dts | 256
> > +++++++++++++++++++++++++++++++
> > 2 files changed, 257 insertions(+)
> > create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
> >
> > diff --git a/arch/arm/boot/dts/Makefile
> > b/arch/arm/boot/dts/Makefile
> > index 44508dc..29b1aae 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -315,6 +315,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
> > imx6dl-udoo.dtb \
> > imx6dl-wandboard.dtb \
> > imx6dl-wandboard-revb1.dtb \
> > + imx6q-apalis-ixora.dtb \
> > imx6q-apf6dev.dtb \
> > imx6q-arm2.dtb \
> > imx6q-cm-fx6.dtb \
> > diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> > b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> > new file mode 100644
> > index 0000000..5494a13
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> > @@ -0,0 +1,256 @@
> > +/*
> > + * Copyright 2014-2016 Toradex AG
> > + * Copyright 2012 Freescale Semiconductor, Inc.
> > + * Copyright 2011 Linaro Ltd.
> > + *
> > + * This file is dual-licensed: you can use it either under the
> > terms
> > + * of the GPL or the X11 license, at your option. Note that this
> > dual
> > + * licensing only applies to this file, and not this project as a
> > + * whole.
> > + *
> > + * a) This file is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU General Public License
> > + * version 2 as published by the Free Software Foundation.
> > + *
> > + * This file is distributed in the hope that it will be useful
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty
> > of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
> > the
> > + * GNU General Public License for more details.
> > + *
> > + * Or, alternatively
> > + *
> > + * b) Permission is hereby granted, free of charge, to any person
> > + * obtaining a copy of this software and associated
> > documentation
> > + * files (the "Software"), to deal in the Software without
> > + * restriction, including without limitation the rights to use
> > + * copy, modify, merge, publish, distribute, sublicense,
> > and/or
> > + * sell copies of the Software, and to permit persons to whom
> > the
> > + * Software is furnished to do so, subject to the following
> > + * conditions:
> > + *
> > + * The above copyright notice and this permission notice shall
> > be
> > + * included in all copies or substantial portions of the
> > Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
> > WARRANTIES
> > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > ARISING
> > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
> > OR
> > + * OTHER DEALINGS IN THE SOFTWARE.
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include <dt-bindings/gpio/gpio.h>
> > +#include <dt-bindings/input/input.h>
> > +#include <dt-bindings/interrupt-controller/irq.h>
> > +#include "imx6q.dtsi"
> > +#include "imx6qdl-apalis.dtsi"
> > +
> > +/ {
> > + model = "Toradex Apalis iMX6Q/D Module on Ixora Carrier
> > Board";
> > + compatible = "toradex,apalis_imx6q-ixora",
> > "toradex,apalis_imx6q",
> > + "fsl,imx6q";
> > +
> > + aliases {
> > + i2c0 = &i2cddc;
> > + i2c1 = &i2c1;
> > + i2c2 = &i2c2;
> > + i2c3 = &i2c3;
> > + };
> > +
> > + aliases {
> > + rtc0 = &rtc_i2c;
> > + rtc1 = "/soc/aips-bus@02000000/snvs@020cc000/snvs-
> > rtc-lp@34";
>
> Probably easier and better readable when using the label here
> ("&snvs_rtc").
Agreed.
> > + };
> > +
> > + gpio-keys {
> > + compatible = "gpio-keys";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_gpio_keys>;
> > +
> > + wakeup {
> > + label = "Wake-Up";
> > + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
> > + linux,code = <KEY_WAKEUP>;
> > + debounce-interval = <10>;
> > + gpio-key,wakeup;
> > + };
> > + };
> > +
> > + leds {
> > + compatible = "gpio-leds";
> > +
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_leds_ixora>;
> > +
> > + led4-green {
> > + label = "LED_4_GREEN";
> > + gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led4-red {
> > + label = "LED_4_RED";
> > + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led5-green {
> > + label = "LED_5_GREEN";
> > + gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led5-red {
> > + label = "LED_5_RED";
> > + gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
> > + };
> > + };
> > +
> > + pwmleds {
> > + compatible = "pwm-leds";
> > + ledpwm1 {
> > + label = "PWM1";
> > + pwms = <&pwm1 0 50000>;
> > + max-brightness = <255>;
> > + };
> > +
> > + ledpwm2 {
> > + label = "PWM2";
> > + pwms = <&pwm2 0 50000>;
> > + max-brightness = <255>;
> > + };
> > +
> > + ledpwm3 {
> > + label = "PWM3";
> > + pwms = <&pwm3 0 50000>;
> > + max-brightness = <255>;
> > + };
> > + };
> > +
> > + regulators {
> > + reg_usb_otg_vbus: usb_otg_vbus {
> > + status = "okay";
> > + };
> > +
> > + reg_usb_host_vbus: usb_host_vbus {
> > + status = "okay";
> > + };
> > + };
> > +};
> > +
> > +&backlight {
> > + brightness-levels = <0 127 191 223 239 247 251 255>;
> > + default-brightness-level = <1>;
> > + status = "okay";
> > +};
> > +
> > +&can1 {
> > + status = "okay";
> > +};
> > +
> > +&can2 {
> > + status = "okay";
> > +};
> > +
> > +/* GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier
> > board) */
> > +&i2c1 {
> > + status = "okay";
> > +
> > + cat24c02@50 {
>
> According to devicetree.org, nodes are named according to what kind
> of
> device it represents. Hence this should be eeprom@50.
Agreed.
> > + compatible = "atmel,24c02";
> > + reg = <0x50>;
> > + };
> > +
> > + /* M41T0M6 real time clock on carrier board */
> > + rtc_i2c: rtc@68 {
> > + compatible = "st,m41t00";
> > + reg = <0x68>;
> > + };
> > +};
> > +
> > +&iomuxc {
>
> This should go to the end of the device tree.
Agreed.
> Otherwise looks good to me:
> Reviewed-by: Stefan Agner <stefan@agner.ch>
Thanks!
> --
> Stefan
>
> > + /*
> > + * Mux the Apalis GPIOs, GPIO7 used for PCIe reset,
> > + * GPIO5, 6 used by optional fusion_F0710A kernel module
> > + */
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
> > + &pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
> > + &pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
> > + &pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8>;
> > +
> > + leds_ixora {
> > + pinctrl_leds_ixora: leds-ixora {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_SD1_DAT3__GPIO1_IO21
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_NANDF_D1__GPIO2_IO01
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_NANDF_D2__GPIO2_IO02
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + };
> > +};
> > +
> > +&pcie {
> > + /* active-low meaning opposite of regular PERST# active-
> > low polarity */
> > + reset-gpio = <&gpio1 28 GPIO_ACTIVE_LOW>;
> > + status = "okay";
> > +};
> > +
> > +&pwm1 {
> > + status = "okay";
> > +};
> > +
> > +&pwm2 {
> > + status = "okay";
> > +};
> > +
> > +&pwm3 {
> > + status = "okay";
> > +};
> > +
> > +&pwm4 {
> > + status = "okay";
> > +};
> > +
> > +&sata {
> > + status = "okay";
> > +};
> > +
> > +&sound_spdif {
> > + status = "okay";
> > +};
> > +
> > +&spdif {
> > + status = "okay";
> > +};
> > +
> > +&uart1 {
> > + status = "okay";
> > +};
> > +
> > +&uart2 {
> > + status = "okay";
> > +};
> > +
> > +&uart4 {
> > + status = "okay";
> > +};
> > +
> > +&uart5 {
> > + status = "okay";
> > +};
> > +
> > +&usbh1 {
> > + status = "okay";
> > +};
> > +
> > +&usbotg {
> > + status = "okay";
> > +};
> > +
> > +/* SD1 */
> > +&usdhc2 {
> > + status = "okay";
> > +};
Cheers
Marcel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 2/2] ARM: dts: imx6: Add support for Toradex Ixora carrier board
@ 2016-01-08 8:29 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 8:29 UTC (permalink / raw)
To: linux-arm-kernel
Hi Stefan
On Wed, 2016-01-06 at 22:38 -0800, Stefan Agner wrote:
> Hi Marcel,
>
> On 2016-01-05 08:39, Marcel Ziswiler wrote:
> > From: Petr ?tetiar <ynezz@true.cz>
> >
> > Signed-off-by: Petr ?tetiar <ynezz@true.cz>
> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> > ---
> >
> > Changes in v2: None
> >
> > ?arch/arm/boot/dts/Makefile???????????????|???1 +
> > ?arch/arm/boot/dts/imx6q-apalis-ixora.dts | 256
> > +++++++++++++++++++++++++++++++
> > ?2 files changed, 257 insertions(+)
> > ?create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora.dts
> >
> > diff --git a/arch/arm/boot/dts/Makefile
> > b/arch/arm/boot/dts/Makefile
> > index 44508dc..29b1aae 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -315,6 +315,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
> > ? imx6dl-udoo.dtb \
> > ? imx6dl-wandboard.dtb \
> > ? imx6dl-wandboard-revb1.dtb \
> > + imx6q-apalis-ixora.dtb \
> > ? imx6q-apf6dev.dtb \
> > ? imx6q-arm2.dtb \
> > ? imx6q-cm-fx6.dtb \
> > diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> > b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> > new file mode 100644
> > index 0000000..5494a13
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
> > @@ -0,0 +1,256 @@
> > +/*
> > + * Copyright 2014-2016 Toradex AG
> > + * Copyright 2012 Freescale Semiconductor, Inc.
> > + * Copyright 2011 Linaro Ltd.
> > + *
> > + * This file is dual-licensed: you can use it either under the
> > terms
> > + * of the GPL or the X11 license, at your option. Note that this
> > dual
> > + * licensing only applies to this file, and not this project as a
> > + * whole.
> > + *
> > + *??a) This file is free software; you can redistribute it and/or
> > + *?????modify it under the terms of the GNU General Public License
> > + *?????version 2 as published by the Free Software Foundation.
> > + *
> > + *?????This file is distributed in the hope that it will be useful
> > + *?????but WITHOUT ANY WARRANTY; without even the implied warranty
> > of
> > + *?????MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.??See
> > the
> > + *?????GNU General Public License for more details.
> > + *
> > + * Or, alternatively
> > + *
> > + *??b) Permission is hereby granted, free of charge, to any person
> > + *?????obtaining a copy of this software and associated
> > documentation
> > + *?????files (the "Software"), to deal in the Software without
> > + *?????restriction, including without limitation the rights to use
> > + *?????copy, modify, merge, publish, distribute, sublicense,
> > and/or
> > + *?????sell copies of the Software, and to permit persons to whom
> > the
> > + *?????Software is furnished to do so, subject to the following
> > + *?????conditions:
> > + *
> > + *?????The above copyright notice and this permission notice shall
> > be
> > + *?????included in all copies or substantial portions of the
> > Software.
> > + *
> > + *?????THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
> > + *?????EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
> > WARRANTIES
> > + *?????OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> > + *?????NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> > + *?????HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
> > + *?????WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > ARISING
> > + *?????FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
> > OR
> > + *?????OTHER DEALINGS IN THE SOFTWARE.
> > + */
> > +
> > +/dts-v1/;
> > +
> > +#include <dt-bindings/gpio/gpio.h>
> > +#include <dt-bindings/input/input.h>
> > +#include <dt-bindings/interrupt-controller/irq.h>
> > +#include "imx6q.dtsi"
> > +#include "imx6qdl-apalis.dtsi"
> > +
> > +/ {
> > + model = "Toradex Apalis iMX6Q/D Module on Ixora Carrier
> > Board";
> > + compatible = "toradex,apalis_imx6q-ixora",
> > "toradex,apalis_imx6q",
> > + ?????"fsl,imx6q";
> > +
> > + aliases {
> > + i2c0 = &i2cddc;
> > + i2c1 = &i2c1;
> > + i2c2 = &i2c2;
> > + i2c3 = &i2c3;
> > + };
> > +
> > + aliases {
> > + rtc0 = &rtc_i2c;
> > + rtc1 = "/soc/aips-bus at 02000000/snvs at 020cc000/snvs-
> > rtc-lp at 34";
>
> Probably easier and better readable when using the label here
> ("&snvs_rtc").
Agreed.
> > + };
> > +
> > + gpio-keys {
> > + compatible = "gpio-keys";
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_gpio_keys>;
> > +
> > + wakeup {
> > + label = "Wake-Up";
> > + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
> > + linux,code = <KEY_WAKEUP>;
> > + debounce-interval = <10>;
> > + gpio-key,wakeup;
> > + };
> > + };
> > +
> > + leds {
> > + compatible = "gpio-leds";
> > +
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_leds_ixora>;
> > +
> > + led4-green {
> > + label = "LED_4_GREEN";
> > + gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led4-red {
> > + label = "LED_4_RED";
> > + gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led5-green {
> > + label = "LED_5_GREEN";
> > + gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
> > + };
> > +
> > + led5-red {
> > + label = "LED_5_RED";
> > + gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
> > + };
> > + };
> > +
> > + pwmleds {
> > + compatible = "pwm-leds";
> > + ledpwm1 {
> > + label = "PWM1";
> > + pwms = <&pwm1 0 50000>;
> > + max-brightness = <255>;
> > + };
> > +
> > + ledpwm2 {
> > + label = "PWM2";
> > + pwms = <&pwm2 0 50000>;
> > + max-brightness = <255>;
> > + };
> > +
> > + ledpwm3 {
> > + label = "PWM3";
> > + pwms = <&pwm3 0 50000>;
> > + max-brightness = <255>;
> > + };
> > + };
> > +
> > + regulators {
> > + reg_usb_otg_vbus: usb_otg_vbus {
> > + status = "okay";
> > + };
> > +
> > + reg_usb_host_vbus: usb_host_vbus {
> > + status = "okay";
> > + };
> > + };
> > +};
> > +
> > +&backlight {
> > + brightness-levels = <0 127 191 223 239 247 251 255>;
> > + default-brightness-level = <1>;
> > + status = "okay";
> > +};
> > +
> > +&can1 {
> > + status = "okay";
> > +};
> > +
> > +&can2 {
> > + status = "okay";
> > +};
> > +
> > +/* GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier
> > board) */
> > +&i2c1 {
> > + status = "okay";
> > +
> > + cat24c02 at 50 {
>
> According to devicetree.org, nodes are named according to what kind
> of
> device it represents. Hence this should be eeprom at 50.
Agreed.
> > + compatible = "atmel,24c02";
> > + reg = <0x50>;
> > + };
> > +
> > + /* M41T0M6 real time clock on carrier board */
> > + rtc_i2c: rtc at 68 {
> > + compatible = "st,m41t00";
> > + reg = <0x68>;
> > + };
> > +};
> > +
> > +&iomuxc {
>
> This should go to the end of the device tree.
Agreed.
> Otherwise looks good to me:
> Reviewed-by: Stefan Agner <stefan@agner.ch>
Thanks!
> --
> Stefan
>
> > + /*
> > + ?* Mux the Apalis GPIOs, GPIO7 used for PCIe reset,
> > + ?* GPIO5, 6 used by optional fusion_F0710A kernel module
> > + ?*/
> > + pinctrl-names = "default";
> > + pinctrl-0 = <&pinctrl_apalis_gpio1 &pinctrl_apalis_gpio2
> > + ?????&pinctrl_apalis_gpio3 &pinctrl_apalis_gpio4
> > + ?????&pinctrl_apalis_gpio5 &pinctrl_apalis_gpio6
> > + ?????&pinctrl_apalis_gpio7 &pinctrl_apalis_gpio8>;
> > +
> > + leds_ixora {
> > + pinctrl_leds_ixora: leds-ixora {
> > + fsl,pins = <
> > + MX6QDL_PAD_SD1_DAT1__GPIO1_IO17
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_SD1_DAT3__GPIO1_IO21
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_NANDF_D1__GPIO2_IO01
> > PAD_CTRL_HYS_PU
> > + MX6QDL_PAD_NANDF_D2__GPIO2_IO02
> > PAD_CTRL_HYS_PU
> > + >;
> > + };
> > + };
> > +};
> > +
> > +&pcie {
> > + /* active-low meaning opposite of regular PERST# active-
> > low polarity */
> > + reset-gpio = <&gpio1 28 GPIO_ACTIVE_LOW>;
> > + status = "okay";
> > +};
> > +
> > +&pwm1 {
> > + status = "okay";
> > +};
> > +
> > +&pwm2 {
> > + status = "okay";
> > +};
> > +
> > +&pwm3 {
> > + status = "okay";
> > +};
> > +
> > +&pwm4 {
> > + status = "okay";
> > +};
> > +
> > +&sata {
> > + status = "okay";
> > +};
> > +
> > +&sound_spdif {
> > + status = "okay";
> > +};
> > +
> > +&spdif {
> > + status = "okay";
> > +};
> > +
> > +&uart1 {
> > + status = "okay";
> > +};
> > +
> > +&uart2 {
> > + status = "okay";
> > +};
> > +
> > +&uart4 {
> > + status = "okay";
> > +};
> > +
> > +&uart5 {
> > + status = "okay";
> > +};
> > +
> > +&usbh1 {
> > + status = "okay";
> > +};
> > +
> > +&usbotg {
> > + status = "okay";
> > +};
> > +
> > +/* SD1 */
> > +&usdhc2 {
> > + status = "okay";
> > +};
Cheers
Marcel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 8:42 ` Petr Štetiar
0 siblings, 0 replies; 36+ messages in thread
From: Petr Štetiar @ 2016-01-08 8:42 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: ynezz, linux-kernel, robh+dt, pawel.moll, stefan, shawn.guo,
devicetree, festevam, mark.rutland, stillcompiling,
ijc+devicetree, galak, shawnguo, linux-arm-kernel, l.stach,
kernel, linux
Marcel Ziswiler <marcel.ziswiler@toradex.com> [2016-01-06 09:15:18]:
> > > <&pinctrl_regulator_usbotg_pwr>;
> > > + regulator-name = "usb_otg_vbus";
> > > + regulator-min-microvolt = <5000000>;
> > > + regulator-max-microvolt = <5000000>;
> > > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > > + enable-active-high;
> > > + status = "disabled";
> > > + };
> >
> > I'm not sure, but it seems to me, that we should move this regulator into
> > the carrier board DTS. On our custom carrier board we've this regulator
> > always on and we use this GPIO for heartbeat LED, so I've this in our
> > carrier board DTS[2]:
>
> Yes, you are absolutely right and e.g. on Apalis T30 [1] that is exactly how
> we did it.
And what about usdhc? It leads to the same overrides in the carrier board
file:
&iomuxc {
usdhc {
/* GPIO4_IO20 is LVDS */
pinctrl_mmc_cd: gpio_mmc_cd {
};
/* Used as misc GPIOs */
pinctrl_usdhc1: usdhc1grp {
};
};
};
> > > +/* PAD Ctrl values for common settings */
> > > +/*
> > > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE
> > > |
> > > + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > > + */
> > > +#define PAD_CTRL_HYS_PU 0x1b0b0
> >
> > This was requested to be reworked. I've simply replaced all the
> > macros with
> > hex values.
>
> I don't think the reviewers really concluded on the action to be taken
> on here and just using hex values is probably the most stupid solution.
It's simple, if you just leave it as it is, then it will never get merged.
That's how kernel development works :) We've at least two options here:
1. Follow the old path and just convert those macros to hex values
2. Rework it - move those macros to some header file etc.
-- ynezz
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 8:42 ` Petr Štetiar
0 siblings, 0 replies; 36+ messages in thread
From: Petr Štetiar @ 2016-01-08 8:42 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: ynezz-knWk7/PSn+s, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A, pawel.moll-5wv7dgnIgG8,
stefan-XLVq0VzYD2Y, shawn.guo-QSEj5FYQhm4dnm+yROfE0A,
devicetree-u79uwXL29TY76Z2rM5mHXA,
festevam-Re5JQEeQqe8AvxtiuMwx3w, mark.rutland-5wv7dgnIgG8,
stillcompiling-Re5JQEeQqe8AvxtiuMwx3w,
ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
galak-sgV2jX0FEOL9JmXXK+q4OQ, shawnguo-DgEjT+Ai2ygdnm+yROfE0A,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
l.stach-bIcnvbaLZ9MEGnE8C9+IrQ, kernel-bIcnvbaLZ9MEGnE8C9+IrQ,
linux-lFZ/pmaqli7XmaaqVzeoHQ
Marcel Ziswiler <marcel.ziswiler-2KBjVHiyJgBBDgjK7y7TUQ@public.gmane.org> [2016-01-06 09:15:18]:
> > > <&pinctrl_regulator_usbotg_pwr>;
> > > + regulator-name = "usb_otg_vbus";
> > > + regulator-min-microvolt = <5000000>;
> > > + regulator-max-microvolt = <5000000>;
> > > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > > + enable-active-high;
> > > + status = "disabled";
> > > + };
> >
> > I'm not sure, but it seems to me, that we should move this regulator into
> > the carrier board DTS. On our custom carrier board we've this regulator
> > always on and we use this GPIO for heartbeat LED, so I've this in our
> > carrier board DTS[2]:
>
> Yes, you are absolutely right and e.g. on Apalis T30 [1] that is exactly how
> we did it.
And what about usdhc? It leads to the same overrides in the carrier board
file:
&iomuxc {
usdhc {
/* GPIO4_IO20 is LVDS */
pinctrl_mmc_cd: gpio_mmc_cd {
};
/* Used as misc GPIOs */
pinctrl_usdhc1: usdhc1grp {
};
};
};
> > > +/* PAD Ctrl values for common settings */
> > > +/*
> > > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE
> > > |
> > > + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > > + */
> > > +#define PAD_CTRL_HYS_PU 0x1b0b0
> >
> > This was requested to be reworked. I've simply replaced all the
> > macros with
> > hex values.
>
> I don't think the reviewers really concluded on the action to be taken
> on here and just using hex values is probably the most stupid solution.
It's simple, if you just leave it as it is, then it will never get merged.
That's how kernel development works :) We've at least two options here:
1. Follow the old path and just convert those macros to hex values
2. Rework it - move those macros to some header file etc.
-- ynezz
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 8:42 ` Petr Štetiar
0 siblings, 0 replies; 36+ messages in thread
From: Petr Štetiar @ 2016-01-08 8:42 UTC (permalink / raw)
To: linux-arm-kernel
Marcel Ziswiler <marcel.ziswiler@toradex.com> [2016-01-06 09:15:18]:
> > > <&pinctrl_regulator_usbotg_pwr>;
> > > + regulator-name = "usb_otg_vbus";
> > > + regulator-min-microvolt = <5000000>;
> > > + regulator-max-microvolt = <5000000>;
> > > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > > + enable-active-high;
> > > + status = "disabled";
> > > + };
> >
> > I'm not sure, but it seems to me, that we should move this regulator into
> > the carrier board DTS. On our custom carrier board we've this regulator
> > always on and we use this GPIO for heartbeat LED, so I've this in our
> > carrier board DTS[2]:
>
> Yes, you are absolutely right and e.g. on Apalis T30 [1] that is exactly how
> we did it.
And what about usdhc? It leads to the same overrides in the carrier board
file:
&iomuxc {
usdhc {
/* GPIO4_IO20 is LVDS */
pinctrl_mmc_cd: gpio_mmc_cd {
};
/* Used as misc GPIOs */
pinctrl_usdhc1: usdhc1grp {
};
};
};
> > > +/* PAD Ctrl values for common settings */
> > > +/*
> > > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE
> > > |
> > > + *??PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > > + */
> > > +#define PAD_CTRL_HYS_PU 0x1b0b0
> >
> > This was requested to be reworked. I've simply replaced all the
> > macros with
> > hex values.
>
> I don't think the reviewers really concluded on the action to be taken
> on here and just using hex values is probably the most stupid solution.
It's simple, if you just leave it as it is, then it will never get merged.
That's how kernel development works :) We've at least two options here:
1. Follow the old path and just convert those macros to hex values
2. Rework it - move those macros to some header file etc.
-- ynezz
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 8:57 ` Petr Štetiar
0 siblings, 0 replies; 36+ messages in thread
From: Petr Štetiar @ 2016-01-08 8:57 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: linux-arm-kernel, Lucas Stach, Russell King, Sascha Hauer,
Petr Štetiar, Shawn Guo, Fabio Estevam, Kumar Gala,
Ian Campbell, Stefan Agner, Joshua Clayton, Rob Herring,
Pawel Moll, Mark Rutland, devicetree, linux-kernel, Shawn Guo
> + i2cddc: i2c@0 {
> + gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
> + &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
> + >;
According to one of the comments, it should be changed to the following:
sda-gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
scl-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;
-- ynezz
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 8:57 ` Petr Štetiar
0 siblings, 0 replies; 36+ messages in thread
From: Petr Štetiar @ 2016-01-08 8:57 UTC (permalink / raw)
To: Marcel Ziswiler
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Lucas Stach,
Russell King, Sascha Hauer, Petr Štetiar, Shawn Guo,
Fabio Estevam, Kumar Gala, Ian Campbell, Stefan Agner,
Joshua Clayton, Rob Herring, Pawel Moll, Mark Rutland,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Shawn Guo
> + i2cddc: i2c@0 {
> + gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
> + &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
> + >;
According to one of the comments, it should be changed to the following:
sda-gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
scl-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;
-- ynezz
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 8:57 ` Petr Štetiar
0 siblings, 0 replies; 36+ messages in thread
From: Petr Štetiar @ 2016-01-08 8:57 UTC (permalink / raw)
To: linux-arm-kernel
> + i2cddc: i2c at 0 {
> + gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
> + &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
> + >;
According to one of the comments, it should be changed to the following:
sda-gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
scl-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;
-- ynezz
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
2016-01-08 8:42 ` Petr Štetiar
(?)
@ 2016-01-08 10:59 ` Marcel Ziswiler
-1 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 10:59 UTC (permalink / raw)
To: ynezz
Cc: linux-kernel, shawn.guo, pawel.moll, stefan, robh+dt, devicetree,
festevam, mark.rutland, stillcompiling, ijc+devicetree, galak,
shawnguo, linux-arm-kernel, l.stach, kernel, linux
On Fri, 2016-01-08 at 09:42 +0100, Petr Štetiar wrote:
> Marcel Ziswiler <marcel.ziswiler@toradex.com> [2016-01-06 09:15:18]:
>
> > > > <&pinctrl_regulator_usbotg_pwr>;
> > > > + regulator-name = "usb_otg_vbus";
> > > > + regulator-min-microvolt = <5000000>;
> > > > + regulator-max-microvolt = <5000000>;
> > > > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > > > + enable-active-high;
> > > > + status = "disabled";
> > > > + };
> > >
> > > I'm not sure, but it seems to me, that we should move this
> > > regulator into
> > > the carrier board DTS. On our custom carrier board we've this
> > > regulator
> > > always on and we use this GPIO for heartbeat LED, so I've this in
> > > our
> > > carrier board DTS[2]:
> >
> > Yes, you are absolutely right and e.g. on Apalis T30 [1] that is
> > exactly how
> > we did it.
>
> And what about usdhc? It leads to the same overrides in the carrier
> board
> file:
>
> &iomuxc {
> usdhc {
> /* GPIO4_IO20 is LVDS */
> pinctrl_mmc_cd: gpio_mmc_cd {
> };
>
> /* Used as misc GPIOs */
> pinctrl_usdhc1: usdhc1grp {
> };
> };
> };
Yes, the same applies here.
> > > > +/* PAD Ctrl values for common settings */
> > > > +/*
> > > > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE |
> > > > PAD_CTL_PKE
> > > > >
> > > > + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > > > + */
> > > > +#define PAD_CTRL_HYS_PU 0x1b0b0
> > >
> > > This was requested to be reworked. I've simply replaced all the
> > > macros with
> > > hex values.
> >
> > I don't think the reviewers really concluded on the action to be
> > taken
> > on here and just using hex values is probably the most stupid
> > solution.
>
> It's simple, if you just leave it as it is, then it will never get
> merged.
> That's how kernel development works :)
Thanks but I don't think you need to explain us how any of this works
(;-p).
> We've at least two options here:
>
> 1. Follow the old path and just convert those macros to hex values
Yes, stupid.
> 2. Rework it - move those macros to some header file etc.
As mentioned before I don't think any agreement has been reached.
> -- ynezz
Cheers
Marcel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 10:59 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 10:59 UTC (permalink / raw)
To: ynezz
Cc: mark.rutland, devicetree, stillcompiling, linux, pawel.moll,
ijc+devicetree, shawnguo, linux-kernel, stefan, robh+dt, kernel,
galak, shawn.guo, festevam, linux-arm-kernel, l.stach
On Fri, 2016-01-08 at 09:42 +0100, Petr Štetiar wrote:
> Marcel Ziswiler <marcel.ziswiler@toradex.com> [2016-01-06 09:15:18]:
>
> > > > <&pinctrl_regulator_usbotg_pwr>;
> > > > + regulator-name = "usb_otg_vbus";
> > > > + regulator-min-microvolt = <5000000>;
> > > > + regulator-max-microvolt = <5000000>;
> > > > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > > > + enable-active-high;
> > > > + status = "disabled";
> > > > + };
> > >
> > > I'm not sure, but it seems to me, that we should move this
> > > regulator into
> > > the carrier board DTS. On our custom carrier board we've this
> > > regulator
> > > always on and we use this GPIO for heartbeat LED, so I've this in
> > > our
> > > carrier board DTS[2]:
> >
> > Yes, you are absolutely right and e.g. on Apalis T30 [1] that is
> > exactly how
> > we did it.
>
> And what about usdhc? It leads to the same overrides in the carrier
> board
> file:
>
> &iomuxc {
> usdhc {
> /* GPIO4_IO20 is LVDS */
> pinctrl_mmc_cd: gpio_mmc_cd {
> };
>
> /* Used as misc GPIOs */
> pinctrl_usdhc1: usdhc1grp {
> };
> };
> };
Yes, the same applies here.
> > > > +/* PAD Ctrl values for common settings */
> > > > +/*
> > > > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE |
> > > > PAD_CTL_PKE
> > > > >
> > > > + * PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > > > + */
> > > > +#define PAD_CTRL_HYS_PU 0x1b0b0
> > >
> > > This was requested to be reworked. I've simply replaced all the
> > > macros with
> > > hex values.
> >
> > I don't think the reviewers really concluded on the action to be
> > taken
> > on here and just using hex values is probably the most stupid
> > solution.
>
> It's simple, if you just leave it as it is, then it will never get
> merged.
> That's how kernel development works :)
Thanks but I don't think you need to explain us how any of this works
(;-p).
> We've at least two options here:
>
> 1. Follow the old path and just convert those macros to hex values
Yes, stupid.
> 2. Rework it - move those macros to some header file etc.
As mentioned before I don't think any agreement has been reached.
> -- ynezz
Cheers
Marcel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 10:59 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 10:59 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, 2016-01-08 at 09:42 +0100, Petr ?tetiar wrote:
> Marcel Ziswiler <marcel.ziswiler@toradex.com> [2016-01-06 09:15:18]:
>
> > > > <&pinctrl_regulator_usbotg_pwr>;
> > > > + regulator-name = "usb_otg_vbus";
> > > > + regulator-min-microvolt = <5000000>;
> > > > + regulator-max-microvolt = <5000000>;
> > > > + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
> > > > + enable-active-high;
> > > > + status = "disabled";
> > > > + };
> > >
> > > I'm not sure, but it seems to me, that we should move this
> > > regulator into
> > > the carrier board DTS. On our custom carrier board we've this
> > > regulator
> > > always on and we use this GPIO for heartbeat LED, so I've this in
> > > our
> > > carrier board DTS[2]:
> >
> > Yes, you are absolutely right and e.g. on Apalis T30 [1] that is
> > exactly how
> > we did it.
>
> And what about usdhc? It leads to the same overrides in the carrier
> board
> file:
>
> &iomuxc {
> usdhc {
> /* GPIO4_IO20 is LVDS */
> pinctrl_mmc_cd: gpio_mmc_cd {
> };
>
> /* Used as misc GPIOs */
> pinctrl_usdhc1: usdhc1grp {
> };
> };
> };
Yes, the same applies here.
> > > > +/* PAD Ctrl values for common settings */
> > > > +/*
> > > > + * (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE |
> > > > PAD_CTL_PKE
> > > > >
> > > > + *??PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)
> > > > + */
> > > > +#define PAD_CTRL_HYS_PU 0x1b0b0
> > >
> > > This was requested to be reworked. I've simply replaced all the
> > > macros with
> > > hex values.
> >
> > I don't think the reviewers really concluded on the action to be
> > taken
> > on here and just using hex values is probably the most stupid
> > solution.
>
> It's simple, if you just leave it as it is, then it will never get
> merged.
> That's how kernel development works :)
Thanks but I don't think you need to explain us how any of this works
(;-p).
> We've at least two options here:
>
> 1. Follow the old path and just convert those macros to hex values
Yes, stupid.
> 2. Rework it - move those macros to some header file etc.
As mentioned before I don't think any agreement has been reached.
> -- ynezz
Cheers
Marcel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
2016-01-08 8:57 ` Petr Štetiar
(?)
@ 2016-01-08 10:59 ` Marcel Ziswiler
-1 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 10:59 UTC (permalink / raw)
To: ynezz
Cc: linux-kernel, shawn.guo, robh+dt, stefan, pawel.moll, devicetree,
festevam, mark.rutland, galak, ijc+devicetree, stillcompiling,
shawnguo, linux-arm-kernel, l.stach, kernel, linux
On Fri, 2016-01-08 at 09:57 +0100, Petr Štetiar wrote:
> > + i2cddc: i2c@0 {
> > + gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
> > + &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
> > + >;
>
> According to one of the comments, it should be changed to the
> following:
>
> sda-gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
> scl-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;
No, I believe you mixed the i2c-imx binding with the i2c-gpio one [2].
> -- ynezz
[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-imx.txt
[2] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-gpio.txt
Cheers
Marcel
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 10:59 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 10:59 UTC (permalink / raw)
To: ynezz
Cc: mark.rutland, devicetree, stillcompiling, linux, pawel.moll,
ijc+devicetree, shawnguo, linux-kernel, stefan, robh+dt, kernel,
galak, shawn.guo, festevam, linux-arm-kernel, l.stach
On Fri, 2016-01-08 at 09:57 +0100, Petr Štetiar wrote:
> > + i2cddc: i2c@0 {
> > + gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
> > + &gpio2 30 GPIO_ACTIVE_HIGH /* scl */
> > + >;
>
> According to one of the comments, it should be changed to the
> following:
>
> sda-gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
> scl-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;
No, I believe you mixed the i2c-imx binding with the i2c-gpio one [2].
> -- ynezz
[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-imx.txt
[2] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-gpio.txt
Cheers
Marcel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 36+ messages in thread
* [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM
@ 2016-01-08 10:59 ` Marcel Ziswiler
0 siblings, 0 replies; 36+ messages in thread
From: Marcel Ziswiler @ 2016-01-08 10:59 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, 2016-01-08 at 09:57 +0100, Petr ?tetiar wrote:
> > + i2cddc: i2c at 0 {
> > + gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */
> > + ?&gpio2 30 GPIO_ACTIVE_HIGH /* scl */
> > + >;
>
> According to one of the comments, it should be changed to the
> following:
>
> sda-gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>;
> scl-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>;
No, I believe you mixed the i2c-imx binding with the i2c-gpio one [2].
> -- ynezz
[1] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-imx.txt
[2] https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/i2c/i2c-gpio.txt
Cheers
Marcel
^ permalink raw reply [flat|nested] 36+ messages in thread
end of thread, other threads:[~2016-01-08 11:14 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-05 16:39 [PATCH v2 0/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM/Ixora carrier board Marcel Ziswiler
2016-01-05 16:39 ` Marcel Ziswiler
2016-01-05 16:39 ` Marcel Ziswiler
2016-01-05 16:39 ` [PATCH v2 1/2] ARM: dts: imx6: Add support for Toradex Apalis iMX6Q/D SoM Marcel Ziswiler
2016-01-05 16:39 ` Marcel Ziswiler
2016-01-06 8:03 ` Petr Štetiar
2016-01-06 8:03 ` Petr Štetiar
2016-01-06 8:03 ` Petr Štetiar
2016-01-06 9:15 ` Marcel Ziswiler
2016-01-06 9:15 ` Marcel Ziswiler
2016-01-06 9:15 ` Marcel Ziswiler
2016-01-08 8:42 ` Petr Štetiar
2016-01-08 8:42 ` Petr Štetiar
2016-01-08 8:42 ` Petr Štetiar
2016-01-08 10:59 ` Marcel Ziswiler
2016-01-08 10:59 ` Marcel Ziswiler
2016-01-08 10:59 ` Marcel Ziswiler
2016-01-07 6:29 ` Stefan Agner
2016-01-07 6:29 ` Stefan Agner
2016-01-08 8:28 ` Marcel Ziswiler
2016-01-08 8:28 ` Marcel Ziswiler
2016-01-08 8:28 ` Marcel Ziswiler
2016-01-08 8:57 ` Petr Štetiar
2016-01-08 8:57 ` Petr Štetiar
2016-01-08 8:57 ` Petr Štetiar
2016-01-08 10:59 ` Marcel Ziswiler
2016-01-08 10:59 ` Marcel Ziswiler
2016-01-08 10:59 ` Marcel Ziswiler
2016-01-05 16:39 ` [PATCH v2 2/2] ARM: dts: imx6: Add support for Toradex Ixora carrier board Marcel Ziswiler
2016-01-05 16:39 ` Marcel Ziswiler
2016-01-07 6:38 ` Stefan Agner
2016-01-07 6:38 ` Stefan Agner
2016-01-07 6:38 ` Stefan Agner
2016-01-08 8:29 ` Marcel Ziswiler
2016-01-08 8:29 ` Marcel Ziswiler
2016-01-08 8:29 ` Marcel Ziswiler
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.