This patchset holds some common changes that were never upstreamed.
Subsystems (2)
cover This patchset holds some common changes that were never upstreamed.
From: Philippe Schenker <[email protected]>
With latest downstream kernel upgrade, I took the aproach to select mainline devicetrees and atomically add missing stuff for downstream.
These patches I send here are separated out with changes that also have a benfit for mainline.
Philippe
Marcel Ziswiler (1):
ARM: dts: imx7-colibri: make sure module supplies are always on
Max Krummenacher (2):
ARM: dts: imx6ull-colibri: reduce v_batt current in power off
ARM: dts: imx6ull: improve can templates
Oleksandr Suvorov (1):
ARM: dts: add recovery for I2C for iMX7
Philippe Schenker (15):
ARM: dts: imx7-colibri: prepare module device tree for FlexCAN
ARM: dts: imx7-colibri: Add sleep mode to ethernet
ARM: dts: imx7-colibri: Add touch controllers
ARM: dts: imx6qdl-colibri: add phy to fec
ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxc
ARM: dts: imx6: Add sleep state to can interfaces
ARM: dts: imx6: Add touchscreens used on Toradex eval boards
ARM: dts: colibri-imx6: Add missing pinmuxing to Toradex eval board
ARM: dts: apalis-imx6: Add some example I2C devices
ARM: dts: apalis-imx6: Add some optional I2C devices
ARM: dts: imx6ull-colibri: Add sleep mode to fec
ARM: dts: imx6ull-colibri: Add watchdog
ARM: dts: imx6ull-colibri: Add general wakeup key used on Colibri
ARM: dts: imx6/7-colibri: switch dr_mode to otg
ARM: dts: imx6ull-colibri: Add touchscreens used with Eval Board
Stefan Agner (3):
ARM: dts: imx7-colibri: disable HS400
ARM: dts: imx7-colibri: add GPIO wakeup key
ARM: dts: imx7-colibri: fix 1.8V/UHS support
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 52 ++++++++ arch/arm/boot/dts/imx6q-apalis-eval.dts | 122 ++++++++++++++++++ arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 19 +++ arch/arm/boot/dts/imx6q-apalis-ixora.dts | 19 +++ arch/arm/boot/dts/imx6qdl-apalis.dtsi | 27 +++- arch/arm/boot/dts/imx6qdl-colibri.dtsi | 27 +++- .../arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 63 +++++++++ .../arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri.dtsi | 52 +++++++- arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 51 ++++++++ arch/arm/boot/dts/imx7-colibri.dtsi | 114 ++++++++++++++-- 12 files changed, 524 insertions(+), 26 deletions(-)
Signature · 1 line
2.22.0
PATCH 1/22 ARM: dts: imx7-colibri: make sure module supplies are always on
From: Marcel Ziswiler <[email protected]>
Prevent regulators from being switched off.
---
arch/arm/boot/dts/imx7-colibri.dtsi | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/imx7-colibri.dtsi +2 -0
@@ -54,6 +54,7 @@ regulator-name = "+V3.3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; reg_module_3v3_avdd: regulator-module-3v3-avdd {
@@ -61,6 +62,7 @@ regulator-name = "+V3.3_AVDD_AUDIO"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; + regulator-always-on; }; sound {
Signature · 1 line
2.22.0
PATCH 2/22 ARM: dts: imx7-colibri: disable HS400
In reply to Philippe SchenkerFrom: Stefan Agner <[email protected]>
Force HS200 by masking bit 63 of the SDHCI capability register. The i.MX ESDHC driver uses SDHCI_QUIRK2_CAPS_BIT63_FOR_HS400. With that the stack checks bit 63 to descide whether HS400 is available. Using sdhci-caps-mask allows to mask bit 63. The stack then selects HS200 as operating mode.
This prevents rare communication errors with minimal effect on performance:
sdhci-esdhc-imx 30b60000.usdhc: warning! HS400 strobe DLL status REF not lock!
---
arch/arm/boot/dts/imx7-colibri.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/imx7-colibri.dtsi +1 -0
@@ -325,6 +325,7 @@ vmmc-supply = <®_module_3v3>; vqmmc-supply = <®_DCDC3>; non-removable; + sdhci-caps-mask = <0x80000000 0x0>; }; &iomuxc {
Signature · 1 line
2.22.0
PATCH 3/22 ARM: dts: imx7-colibri: prepare module device tree for FlexCAN
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
Prepare FlexCAN use on SODIMM 55/63 178/188. Those SODIMM pins are compatible for CAN bus use with several modules from the Colibri family.
Add Better drivestrength and also add flexcan2.
---
arch/arm/boot/dts/imx7-colibri.dtsi | 35 ++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-)
arch/arm/boot/dts/imx7-colibri.dtsi +30 -5
@@ -117,6 +117,18 @@ fsl,magic-packet; }; +&flexcan1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; + status = "disabled"; +}; + +&flexcan2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2>; + status = "disabled"; +}; + &gpmi { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpmi_nand>;
@@ -330,12 +342,11 @@ &iomuxc { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4>; + pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4 + &pinctrl_gpio7>; pinctrl_gpio1: gpio1-grp { fsl,pins = < - MX7D_PAD_ENET1_RGMII_RD3__GPIO7_IO3 0x74 /* SODIMM 55 */ - MX7D_PAD_ENET1_RGMII_RD2__GPIO7_IO2 0x74 /* SODIMM 63 */ MX7D_PAD_SAI1_RX_SYNC__GPIO6_IO16 0x14 /* SODIMM 77 */ MX7D_PAD_EPDC_DATA09__GPIO2_IO9 0x14 /* SODIMM 89 */ MX7D_PAD_EPDC_DATA08__GPIO2_IO8 0x74 /* SODIMM 91 */
@@ -416,6 +427,13 @@ >; }; + pinctrl_gpio7: gpio7-grp { /* Alternatively CAN1 */ + fsl,pins = < + MX7D_PAD_ENET1_RGMII_RD3__GPIO7_IO3 0x14 /* SODIMM 55 */ + MX7D_PAD_ENET1_RGMII_RD2__GPIO7_IO2 0x14 /* SODIMM 63 */ + >; + }; + pinctrl_i2c1_int: i2c1-int-grp { /* PMIC / TOUCH */ fsl,pins = < MX7D_PAD_GPIO1_IO13__GPIO1_IO13 0x79
@@ -459,10 +477,17 @@ >; }; + pinctrl_flexcan1: flexcan1-grp { + fsl,pins = < + MX7D_PAD_ENET1_RGMII_RD3__FLEXCAN1_TX 0x79 /* SODIMM 55 */ + MX7D_PAD_ENET1_RGMII_RD2__FLEXCAN1_RX 0x79 /* SODIMM 63 */ + >; + }; + pinctrl_flexcan2: flexcan2-grp { fsl,pins = < - MX7D_PAD_GPIO1_IO14__FLEXCAN2_RX 0x59 - MX7D_PAD_GPIO1_IO15__FLEXCAN2_TX 0x59 + MX7D_PAD_GPIO1_IO14__FLEXCAN2_RX 0x79 /* SODIMM 188 */ + MX7D_PAD_GPIO1_IO15__FLEXCAN2_TX 0x79 /* SODIMM 178 */ >; };
Signature · 1 line
2.22.0
PATCH 4/22 ARM: dts: imx7-colibri: Add sleep mode to ethernet
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
Add sleep pinmux to the fec so it can properly sleep.
---
arch/arm/boot/dts/imx7-colibri.dtsi | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx7-colibri.dtsi +18 -1
@@ -101,8 +101,9 @@ }; &fec1 { - pinctrl-names = "default"; + pinctrl-names = "default", "sleep"; pinctrl-0 = <&pinctrl_enet1>; + pinctrl-1 = <&pinctrl_enet1_sleep>; clocks = <&clks IMX7D_ENET_AXI_ROOT_CLK>, <&clks IMX7D_ENET_AXI_ROOT_CLK>, <&clks IMX7D_ENET1_TIME_ROOT_CLK>,
@@ -463,6 +464,22 @@ >; }; + pinctrl_enet1_sleep: enet1sleepgrp { + fsl,pins = < + MX7D_PAD_ENET1_RGMII_RX_CTL__GPIO7_IO4 0x0 + MX7D_PAD_ENET1_RGMII_RD0__GPIO7_IO0 0x0 + MX7D_PAD_ENET1_RGMII_RD1__GPIO7_IO1 0x0 + MX7D_PAD_ENET1_RGMII_RXC__GPIO7_IO5 0x0 + + MX7D_PAD_ENET1_RGMII_TX_CTL__GPIO7_IO10 0x0 + MX7D_PAD_ENET1_RGMII_TD0__GPIO7_IO6 0x0 + MX7D_PAD_ENET1_RGMII_TD1__GPIO7_IO7 0x0 + MX7D_PAD_GPIO1_IO12__GPIO1_IO12 0x0 + MX7D_PAD_SD2_CD_B__GPIO5_IO9 0x0 + MX7D_PAD_SD2_WP__GPIO5_IO10 0x0 + >; + }; + pinctrl_ecspi3_cs: ecspi3-cs-grp { fsl,pins = < MX7D_PAD_I2C2_SDA__GPIO4_IO11 0x14
Signature · 1 line
2.22.0
PATCH 5/22 ARM: dts: add recovery for I2C for iMX7
In reply to Philippe SchenkerFrom: Oleksandr Suvorov <[email protected]>
- add recovery mode for applicable i2c buses for
Colibri iMX7 module.
---
arch/arm/boot/dts/imx7-colibri.dtsi | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx7-colibri.dtsi +23 -2
@@ -140,8 +140,12 @@ &i2c1 { clock-frequency = <100000>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c1 &pinctrl_i2c1_int>; + pinctrl-1 = <&pinctrl_i2c1_recovery &pinctrl_i2c1_int>; + scl-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; + status = "okay"; codec: sgtl5000@a {
@@ -242,8 +246,11 @@ &i2c4 { clock-frequency = <100000>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c4>; + pinctrl-1 = <&pinctrl_i2c4_recovery>; + scl-gpios = <&gpio7 8 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio7 9 GPIO_ACTIVE_HIGH>; }; &lcdif {
@@ -540,6 +547,13 @@ >; }; + pinctrl_i2c4_recovery: i2c4-recoverygrp { + fsl,pins = < + MX7D_PAD_ENET1_RGMII_TD2__GPIO7_IO8 0x4000007f + MX7D_PAD_ENET1_RGMII_TD3__GPIO7_IO9 0x4000007f + >; + }; + pinctrl_lcdif_dat: lcdif-dat-grp { fsl,pins = < MX7D_PAD_LCD_DATA00__LCD_DATA0 0x79
@@ -740,6 +754,13 @@ >; }; + pinctrl_i2c1_recovery: i2c1-recoverygrp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO04__GPIO1_IO4 0x4000007f + MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x4000007f + >; + }; + pinctrl_cd_usdhc1: usdhc1-cd-grp { fsl,pins = < MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0 0x59 /* CD */
Signature · 1 line
2.22.0
PATCH 6/22 ARM: dts: imx7-colibri: add GPIO wakeup key
In reply to Philippe SchenkerFrom: Stefan Agner <[email protected]>
Add wakeup GPIO key which is able to wake the system from sleep modes (e.g. Suspend-to-Memory).
---
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 14 ++++++++++++++ arch/arm/boot/dts/imx7-colibri.dtsi | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +14 -0
@@ -52,6 +52,20 @@ clock-frequency = <16000000>; }; + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpiokeys>; + + power { + label = "Wake-Up"; + gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; + linux,code = <KEY_WAKEUP>; + debounce-interval = <10>; + gpio-key,wakeup; + }; + }; + panel: panel { compatible = "edt,et057090dhu"; backlight = <&bl>;
arch/arm/boot/dts/imx7-colibri.dtsi +6 -1
@@ -741,12 +741,17 @@ pinctrl_gpio_lpsr: gpio1-grp { fsl,pins = < - MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x59 MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2 0x59 MX7D_PAD_LPSR_GPIO1_IO03__GPIO1_IO3 0x59 >; }; + pinctrl_gpiokeys: gpiokeysgrp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x19 + >; + }; + pinctrl_i2c1: i2c1-grp { fsl,pins = < MX7D_PAD_LPSR_GPIO1_IO05__I2C1_SDA 0x4000007f
Signature · 1 line
2.22.0
PATCH 7/22 ARM: dts: imx7-colibri: fix 1.8V/UHS support
In reply to Philippe SchenkerFrom: Stefan Agner <[email protected]>
Add pinmuxing and do not specify voltage restrictions in the module level device tree.
---
arch/arm/boot/dts/imx7-colibri.dtsi | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx7-colibri.dtsi +22 -1
@@ -326,7 +326,6 @@ &usdhc1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_cd_usdhc1>; - no-1-8-v; cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; disable-wp; vqmmc-supply = <®_LDO2>;
@@ -671,6 +670,28 @@ >; }; + pinctrl_usdhc1_100mhz: usdhc1grp_100mhz { + fsl,pins = < + MX7D_PAD_SD1_CMD__SD1_CMD 0x5a + MX7D_PAD_SD1_CLK__SD1_CLK 0x1a + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5a + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5a + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5a + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5a + >; + }; + + pinctrl_usdhc1_200mhz: usdhc1grp_200mhz { + fsl,pins = < + MX7D_PAD_SD1_CMD__SD1_CMD 0x5b + MX7D_PAD_SD1_CLK__SD1_CLK 0x1b + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x5b + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x5b + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x5b + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x5b + >; + }; + pinctrl_usdhc3: usdhc3grp { fsl,pins = < MX7D_PAD_SD3_CMD__SD3_CMD 0x59
Signature · 1 line
2.22.0
PATCH 8/22 ARM: dts: imx7-colibri: Add touch controllers
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
Add atmel mxt multitouch controller and TouchRevolution multitouch controller which are connected over an I2C bus.
---
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 37 +++++++++++++++++++++ 1 file changed, 37 insertions(+)
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +37 -0
@@ -145,6 +145,34 @@ &i2c4 { status = "okay"; + /* + * the PCAPs use SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm2, + * pwm3. so if you enable one of the PCAP controllers disable the pwms + */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpiotouch>; + reg = <0x4a>; + interrupt-parent = <&gpio1>; + interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */ + reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */ + status = "disabled"; + }; + + touch: touchrevf0710a@10 { + compatible = "touchrevolution,fusion-f0710a"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpiotouch>; + reg = <0x10>; + /* SODIMM 28, Pen down interrupt */ + gpios = <&gpio1 9 GPIO_ACTIVE_HIGH + /* SODIMM 30, Reset interrupt */ + &gpio1 10 GPIO_ACTIVE_LOW + >; + status = "disabled"; + }; + /* M41T0M6 real time clock on carrier board */ rtc: m41t0m6@68 { compatible = "st,m41t0";
@@ -200,3 +228,12 @@ vmmc-supply = <®_3v3>; status = "okay"; }; + +&iomuxc { + pinctrl_gpiotouch: touchgpios { + fsl,pins = < + MX7D_PAD_GPIO1_IO09__GPIO1_IO9 0x74 + MX7D_PAD_GPIO1_IO10__GPIO1_IO10 0x14 + >; + }; +};
Signature · 1 line
2.22.0
PATCH 9/22 ARM: dts: imx6qdl-colibri: add phy to fec
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
Add the phy-node and mdio bus to the fec-node, represented as is on hardware.
This commit includes micrel,led-mode that is set to the default value, prepared for someone who wants to change this.
---
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm/boot/dts/imx6qdl-colibri.dtsi +11 -0
@@ -140,7 +140,18 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rmii"; + phy-handle = <ðphy>; status = "okay"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + + ethphy: ethernet-phy@0 { + reg = <0>; + micrel,led-mode = <0>; + }; + }; }; &hdmi {
Signature · 1 line
2.22.0
PATCH 10/22 ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxc
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
This adds the muxing for the optional pins usb-oc (overcurrent) and usb-id.
---
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm/boot/dts/imx6qdl-colibri.dtsi +14 -0
@@ -615,6 +615,13 @@ >; }; + pinctrl_usbh_oc_1: usbh_oc-1 { + fsl,pins = < + /* USBH_OC */ + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x1b0b0 + >; + }; + pinctrl_spdif: spdifgrp { fsl,pins = < MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0
@@ -681,6 +688,13 @@ >; }; + pinctrl_usbc_id_1: usbc_id-1 { + fsl,pins = < + /* USBC_ID */ + MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x1b0b0 + >; + }; + pinctrl_usdhc1: usdhc1grp { fsl,pins = < MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071
Signature · 1 line
2.22.0
PATCH 11/22 ARM: dts: imx6: Add sleep state to can interfaces
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
This patch prepares the devicetree for the new Ixora V1.2 where we are able to turn off the supply of the can transceiver. This implies to use a sleep state on transmission pins in order to prevent backfeeding.
---
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)
arch/arm/boot/dts/imx6qdl-apalis.dtsi +21 -6
@@ -148,14 +148,16 @@ }; &can1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_flexcan1>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_flexcan1_default>; + pinctrl-1 = <&pinctrl_flexcan1_sleep>; status = "disabled"; }; &can2 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_flexcan2>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_flexcan2_default>; + pinctrl-1 = <&pinctrl_flexcan2_sleep>; status = "disabled"; };
@@ -599,19 +601,32 @@ >; }; - pinctrl_flexcan1: flexcan1grp { + pinctrl_flexcan1_default: flexcan1defgrp { fsl,pins = < MX6QDL_PAD_GPIO_7__FLEXCAN1_TX 0x1b0b0 MX6QDL_PAD_GPIO_8__FLEXCAN1_RX 0x1b0b0 >; }; - pinctrl_flexcan2: flexcan2grp { + pinctrl_flexcan1_sleep: flexcan1slpgrp { + fsl,pins = < + MX6QDL_PAD_GPIO_7__GPIO1_IO07 0x0 + MX6QDL_PAD_GPIO_8__GPIO1_IO08 0x0 + >; + }; + + pinctrl_flexcan2_default: flexcan2defgrp { fsl,pins = < MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b0b0 MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0 >; }; + pinctrl_flexcan2_sleep: flexcan2slpgrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x0 + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x0 + >; + }; pinctrl_gpio_bl_on: gpioblon { fsl,pins = <
Signature · 1 line
2.22.0
Re: [PATCH 11/22] ARM: dts: imx6: Add sleep state to can interfaces
Quoted 8 lines · Philippe Schenker
From: Philippe Schenker <[email protected]>
This patch prepares the devicetree for the new Ixora V1.2 where we are able to turn off the supply of the can transceiver. This implies to use a sleep state on transmission pins in order to prevent backfeeding.
Signed-off-by Philippe Schenker <[email protected]>---
What about "ARM: dts: imx6qdl-apalis: " for the subject? To be clear that this is not related to the imx6 SoC itself.
Quoted 65 lines
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)arch/arm/boot/dts/imx6qdl-apalis.dtsi +21
-6@@ -148,14 +148,16 @@ }; &can1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_flexcan1>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_flexcan1_default>; + pinctrl-1 = <&pinctrl_flexcan1_sleep>; status = "disabled"; }; &can2 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_flexcan2>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_flexcan2_default>; + pinctrl-1 = <&pinctrl_flexcan2_sleep>; status = "disabled"; };@@ -599,19 +601,32 @@ >; }; - pinctrl_flexcan1: flexcan1grp { + pinctrl_flexcan1_default: flexcan1defgrp { fsl,pins = < MX6QDL_PAD_GPIO_7__FLEXCAN1_TX 0x1b0b0 MX6QDL_PAD_GPIO_8__FLEXCAN1_RX 0x1b0b0 >; }; - pinctrl_flexcan2: flexcan2grp { + pinctrl_flexcan1_sleep: flexcan1slpgrp { + fsl,pins = < + MX6QDL_PAD_GPIO_7__GPIO1_IO07 0x0 + MX6QDL_PAD_GPIO_8__GPIO1_IO08 0x0 + >; + }; + + pinctrl_flexcan2_default: flexcan2defgrp { fsl,pins = < MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b0b0 MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0 >; }; + pinctrl_flexcan2_sleep: flexcan2slpgrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x0 + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x0 + >; + }; pinctrl_gpio_bl_on: gpioblon { fsl,pins = <
Re: [PATCH 11/22] ARM: dts: imx6: Add sleep state to can interfaces
Quoted 7 lines · Michal Vokáč
Quoted 6 lines · Philippe Schenker
From: Philippe Schenker <[email protected]>
This patch prepares the devicetree for the new Ixora V1.2 where we are able to turn off the supply of the can transceiver. This implies to use a sleep state on transmission pins in order to prevent backfeeding.
Quoted 5 lines
Quoted 2 lines
Signed-off-by Philippe Schenker <[email protected]>---
What about "ARM: dts: imx6qdl-apalis: " for the subject? To be clear that this is not related to the imx6 SoC itself.
Thanks for your comments Michal! Will takte those into account for v2.
Quoted 66 lines
Quoted 66 lines
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-)arch/arm/boot/dts/imx6qdl-apalis.dtsi +21
-6@@ -148,14 +148,16 @@ }; &can1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_flexcan1>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_flexcan1_default>; + pinctrl-1 = <&pinctrl_flexcan1_sleep>; status = "disabled"; }; &can2 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_flexcan2>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&pinctrl_flexcan2_default>; + pinctrl-1 = <&pinctrl_flexcan2_sleep>; status = "disabled"; };@@ -599,19 +601,32 @@ >; }; - pinctrl_flexcan1: flexcan1grp { + pinctrl_flexcan1_default: flexcan1defgrp { fsl,pins = < MX6QDL_PAD_GPIO_7__FLEXCAN1_TX 0x1b0b0 MX6QDL_PAD_GPIO_8__FLEXCAN1_RX 0x1b0b0 >; }; - pinctrl_flexcan2: flexcan2grp { + pinctrl_flexcan1_sleep: flexcan1slpgrp { + fsl,pins = < + MX6QDL_PAD_GPIO_7__GPIO1_IO07 0x0 + MX6QDL_PAD_GPIO_8__GPIO1_IO08 0x0 + >; + }; + + pinctrl_flexcan2_default: flexcan2defgrp { fsl,pins = < MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x1b0b0 MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x1b0b0 >; }; + pinctrl_flexcan2_sleep: flexcan2slpgrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL4__GPIO4_IO14 0x0 + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x0 + >; + }; pinctrl_gpio_bl_on: gpioblon { fsl,pins = <
PATCH 12/22 ARM: dts: imx6: Add touchscreens used on Toradex eval boards
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
This commit adds the touchscreens from Toradex so one can enable it.
---
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 44 +++++++++++++++++++ arch/arm/boot/dts/imx6q-apalis-eval.dts | 19 ++++++++ arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 19 ++++++++ arch/arm/boot/dts/imx6q-apalis-ixora.dts | 19 ++++++++ 4 files changed, 101 insertions(+)
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +44 -0
@@ -168,6 +168,34 @@ &i2c3 { status = "okay"; + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcap_1>; + reg = <0x4a>; + interrupt-parent = <&gpio1>; + interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */ + reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */ + status = "disabled"; + }; + + /* + * the PCAPs use SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm1, + * pwm4. So if you enable one of the PCAP controllers disable the pwms. + */ + pcap: pcap@10 { + /* TouchRevolution Fusion 7 and 10 multi-touch controller */ + compatible = "touchrevolution,fusion-f0710a"; + reg = <0x10>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcap_1>; + gpios = <&gpio1 9 0 /* SODIMM 28, Pen down interrupt */ + &gpio2 10 0 /* SODIMM 30, Reset */ + >; + status = "disabled"; + }; + /* M41T0M6 real time clock on carrier board */ rtc_i2c: rtc@68 { compatible = "st,m41t0";
@@ -175,6 +203,22 @@ }; }; +&iomuxc { + pinctrl_pcap_1: pcap-1 { + fsl,pins = < + MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0 /* SODIMM 28 */ + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* SODIMM 30 */ + >; + }; + + pinctrl_mxt_ts: mxt-ts { + fsl,pins = < + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x130b0 /* SODIMM 107 */ + MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x130b0 /* SODIMM 106 */ + >; + }; +}; + &ipu1_di0_disp0 { remote-endpoint = <&lcd_display_in>; };
arch/arm/boot/dts/imx6q-apalis-eval.dts +19 -0
@@ -167,6 +167,25 @@ &i2c1 { status = "okay"; + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */ + status = "disabled"; + }; + + pcap@10 { + /* TouchRevolution Fusion 7 and 10 multi-touch controller */ + compatible = "touchrevolution,fusion-f0710a"; + reg = <0x10>; + gpios = <&gpio6 10 0 /* MXM3 11, Pen down interrupt */ + &gpio6 9 0 /* MXM3 13, Reset */ + >; + }; + pcie-switch@58 { compatible = "plx,pex8605"; reg = <0x58>;
arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +19 -0
@@ -172,6 +172,25 @@ &i2c1 { status = "okay"; + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */ + status = "disabled"; + }; + + pcap@10 { + /* TouchRevolution Fusion 7 and 10 multi-touch controller */ + compatible = "touchrevolution,fusion-f0710a"; + reg = <0x10>; + gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ + &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ + >; + }; + /* M41T0M6 real time clock on carrier board */ rtc_i2c: rtc@68 { compatible = "st,m41t0";
arch/arm/boot/dts/imx6q-apalis-ixora.dts +19 -0
@@ -171,6 +171,25 @@ &i2c1 { status = "okay"; + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */ + status = "disabled"; + }; + + pcap@10 { + /* TouchRevolution Fusion 7 and 10 multi-touch controller */ + compatible = "touchrevolution,fusion-f0710a"; + reg = <0x10>; + gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */ + &gpio6 9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */ + >; + }; + eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>;
Signature · 1 line
2.22.0
Fabio Estevam
reviewerRe: [PATCH 12/22] ARM: dts: imx6: Add touchscreens used on Toradex eval boards
Review
Quoted 2 lines · Philippe Schenker
(quoted diff) +2
-0+ /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a {
Generic node names, please:
touchscreen@4a
Quoted 5 lines
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +5
-0+ compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcap_1>; + reg = <0x4a>; + interrupt-parent = <&gpio1>;
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts line 187
Quoted 10 lines
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +10
-0+ interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */ + reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */ + status = "disabled"; + }; + + /* + * the PCAPs use SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm1, + * pwm4. So if you enable one of the PCAP controllers disable the pwms. + */ + pcap: pcap@10 {
touchscreen@10
Review
Quoted 2 lines
(quoted diff) +2
-0+ /* TouchRevolution Fusion 7 and 10 multi-touch controller */ + compatible = "touchrevolution,fusion-f0710a";
I do not find this binding documented.
Re: [PATCH 12/22] ARM: dts: imx6: Add touchscreens used on Toradex eval boards
Quoted 27 lines · Fabio Estevam
Review
Quoted 2 lines · Philippe Schenker
(quoted diff) +2
-0+ /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a {Generic node names, please:
touchscreen@4a
Quoted 15 lines
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +12
-0+ compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcap_1>; + reg = <0x4a>; + interrupt-parent = <&gpio1>; + interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */ + reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */ + status = "disabled"; + }; + + /* + * the PCAPs use SODIMM 28/30, also used for PWM<B>, PWM<C>, akapwm1,
+ * pwm4. So if you enable one of the PCAP controllers disable the
pwms.arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts line 187
Quoted 2 lines
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +2
-0+ */ + pcap: pcap@10 {
Quoted 6 lines
touchscreen@10
Review
Quoted 2 lines
(quoted diff) +2
-0+ /* TouchRevolution Fusion 7 and 10 multi-touch controller */ + compatible = "touchrevolution,fusion-f0710a";I do not find this binding documented.
Thanks for your feedback Fabio, and sorry such obvious stuff went through. I will go through my whole patchset again more carefully lookup all the bindings.
Philippe
Re: [PATCH 12/22] ARM: dts: imx6: Add touchscreens used on Toradex eval boards
Quoted 30 lines · Philippe Schenker
Quoted 29 lines · Fabio Estevam
Review
Quoted 2 lines · Philippe Schenker
(quoted diff) +2
-0+ /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a {Generic node names, please:
touchscreen@4a
Quoted 15 lines
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +12
-0+ compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcap_1>; + reg = <0x4a>; + interrupt-parent = <&gpio1>; + interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */ + reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */ + status = "disabled"; + }; + + /* + * the PCAPs use SODIMM 28/30, also used for PWM<B>, PWM<C>, akapwm1,
+ * pwm4. So if you enable one of the PCAP controllers disable the
pwms.arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts line 187
Quoted 2 lines
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +2
-0+ */ + pcap: pcap@10 {touchscreen@10
Quoted 8 lines
Quoted 4 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ /* TouchRevolution Fusion 7 and 10 multi-touch controller */ + compatible = "touchrevolution,fusion-f0710a";I do not find this binding documented.
Thanks for your feedback Fabio, and sorry such obvious stuff went through. I will go through my whole patchset again more carefully lookup all the bindings.
Hi Philippe,
also look at the I2C sub-nodes - they should be sorted by the bus address. In most of the patches it is not correct.
Michal
PATCH 13/22 ARM: dts: colibri-imx6: Add missing pinmuxing to Toradex eval board
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
This patch adds some missing pinmuxing that is in the colibri standard to the dts.
---
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +8 -0
@@ -204,6 +204,14 @@ }; &iomuxc { + pinctrl-names = "default"; + pinctrl-0 = < + &pinctrl_weim_gpio_1 &pinctrl_weim_gpio_2 + &pinctrl_weim_gpio_3 &pinctrl_weim_gpio_4 + &pinctrl_weim_gpio_5 &pinctrl_weim_gpio_6 + &pinctrl_usbh_oc_1 &pinctrl_usbc_id_1 + >; + pinctrl_pcap_1: pcap-1 { fsl,pins = < MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0 /* SODIMM 28 */
Signature · 1 line
2.22.0
Re: [PATCH 13/22] ARM: dts: colibri-imx6: Add missing pinmuxing to Toradex eval board
Quoted 7 lines · Philippe Schenker
From: Philippe Schenker <[email protected]>
This patch adds some missing pinmuxing that is in the colibri standard to the dts.
Signed-off-by Philippe Schenker <[email protected]>---
"ARM: dts: imx6-colibri: " in the subject for consistency.
Same for the Apalis, please.
Michal
Quoted 24 lines
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 8 ++++++++ 1 file changed, 8 insertions(+)arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +8
-0@@ -204,6 +204,14 @@ }; &iomuxc { + pinctrl-names = "default"; + pinctrl-0 = < + &pinctrl_weim_gpio_1 &pinctrl_weim_gpio_2 + &pinctrl_weim_gpio_3 &pinctrl_weim_gpio_4 + &pinctrl_weim_gpio_5 &pinctrl_weim_gpio_6 + &pinctrl_usbh_oc_1 &pinctrl_usbc_id_1 + >; + pinctrl_pcap_1: pcap-1 { fsl,pins = < MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0 /* SODIMM 28 */
PATCH 14/22 ARM: dts: apalis-imx6: Add some example I2C devices
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
Those devices are used in conjunction with Toradex's evalboard.
---
arch/arm/boot/dts/imx6q-apalis-eval.dts | 95 +++++++++++++++++++++++++ 1 file changed, 95 insertions(+)
arch/arm/boot/dts/imx6q-apalis-eval.dts +95 -0
@@ -140,6 +140,30 @@ regulator-max-microvolt = <3300000>; regulator-always-on; }; + + reg_1p8v: regulator-1p8v { + compatible = "regulator-fixed"; + regulator-name = "1P8V"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + reg_2p5v: regulator-2p5v { + compatible = "regulator-fixed"; + regulator-name = "2P5V"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-always-on; + }; + + reg_3p3v: regulator-3p3v { + compatible = "regulator-fixed"; + regulator-name = "3P3V"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; }; &backlight {
@@ -204,6 +228,77 @@ */ &i2c3 { status = "okay"; + + adv7280: adv7280@21 { + compatible = "adv7280"; + reg = <0x21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0 &pinctrl_cam_mclk>; + clocks = <&clks 200>; + clock-names = "csi_mclk"; + DOVDD-supply = <®_3p3v>; + AVDD-supply = <®_3p3v>; + DVDD-supply = <®_3p3v>; + PVDD-supply = <®_3p3v>; + csi_id = <0>; + mclk = <24000000>; + mclk_source = <1>; + status = "okay"; + }; + + /* Video ADC on Analog Camera Module */ + adv7180: adv7180@21 { + compatible = "adv,adv7180"; + reg = <0x21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0 &pinctrl_cam_mclk>; + clocks = <&clks 200>; + clock-names = "csi_mclk"; + DOVDD-supply = <®_3p3v>; /* 3.3v */ + AVDD-supply = <®_3p3v>; /* 1.8v */ + DVDD-supply = <®_3p3v>; /* 1.8v */ + PVDD-supply = <®_3p3v>; /* 1.8v */ + csi_id = <0>; + mclk = <24000000>; + mclk_source = <1>; + cvbs = <1>; + status = "disabled"; + }; + + max9526: max9526@20 { + compatible = "maxim,max9526"; + reg = <0x20>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0 &pinctrl_cam_mclk>; + clocks = <&clks 200>; + clock-names = "csi_mclk"; + DVDDIO-supply = <®_3p3v>; /* 3.3v */ + AVDD-supply = <®_3p3v>; /* 1.8v */ + DVDD-supply = <®_3p3v>; /* 1.8v */ + csi_id = <0>; + mclk = <24000000>; + mclk_source = <1>; + cvbs = <1>; + status = "okay"; + }; + + ov5640_mipi@3c { + compatible = "ovti,ov564x_mipi"; + reg = <0x3c>; + clocks = <&clks 147>; + clock-names = "csi_mclk"; + DOVDD-supply = <®_1p8v>; + AVDD-supply = <®_2p5v>; + DVDD-supply = <®_1p8v>; + pwn-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; + rst-gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; + ipu_id = <0>; + csi_id = <1>; + mclk = <22000000>; + mclk_source = <0>; + pwms = <&pwm3 0 45 0>; + status = "okay"; + }; }; &ipu1_di1_disp1 {
Signature · 1 line
2.22.0
Fabio Estevam
reviewerRe: [PATCH 14/22] ARM: dts: apalis-imx6: Add some example I2C devices
arch/arm/boot/dts/imx6q-apalis-eval.dts line 237
Quoted 12 lines · Philippe Schenker
&backlight {
arch/arm/boot/dts/imx6q-apalis-eval.dts +7
-0@@ -204,6 +228,77 @@ */ &i2c3 { status = "okay"; + + adv7280: adv7280@21 { + compatible = "adv7280"; + reg = <0x21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0 &pinctrl_cam_mclk>; + clocks = <&clks 200>;
Please replace this 200 with a proper clock label.
arch/arm/boot/dts/imx6q-apalis-eval.dts line 243
Quoted 6 lines
arch/arm/boot/dts/imx6q-apalis-eval.dts +6
-0+ clock-names = "csi_mclk"; + DOVDD-supply = <®_3p3v>; + AVDD-supply = <®_3p3v>; + DVDD-supply = <®_3p3v>; + PVDD-supply = <®_3p3v>; + csi_id = <0>;
This is not a valid property upstream.
It seems you just ported it from a downstream vendor kernel. Please make sure you test with the dt-bindings from mainline.
arch/arm/boot/dts/imx6q-apalis-eval.dts line 255
Quoted 12 lines
arch/arm/boot/dts/imx6q-apalis-eval.dts +12
-0+ mclk = <24000000>; + mclk_source = <1>; + status = "okay"; + }; + + /* Video ADC on Analog Camera Module */ + adv7180: adv7180@21 { + compatible = "adv,adv7180"; + reg = <0x21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0 &pinctrl_cam_mclk>; + clocks = <&clks 200>;
clock label, please.
arch/arm/boot/dts/imx6q-apalis-eval.dts line 261
Quoted 6 lines
arch/arm/boot/dts/imx6q-apalis-eval.dts +6
-0+ clock-names = "csi_mclk"; + DOVDD-supply = <®_3p3v>; /* 3.3v */ + AVDD-supply = <®_3p3v>; /* 1.8v */ + DVDD-supply = <®_3p3v>; /* 1.8v */ + PVDD-supply = <®_3p3v>; /* 1.8v */ + csi_id = <0>;
Same here
arch/arm/boot/dts/imx6q-apalis-eval.dts line 269
Quoted 8 lines
arch/arm/boot/dts/imx6q-apalis-eval.dts +8
-0+ mclk = <24000000>; + mclk_source = <1>; + cvbs = <1>; + status = "disabled"; + }; + + max9526: max9526@20 { + compatible = "maxim,max9526";
This is not documented in mainline.
Re: [PATCH 14/22] ARM: dts: apalis-imx6: Add some example I2C devices
Quoted 62 lines · Fabio Estevam
arch/arm/boot/dts/imx6q-apalis-eval.dts line 237
Quoted 12 lines · Philippe Schenker
&backlight {
arch/arm/boot/dts/imx6q-apalis-eval.dts +7
-0@@ -204,6 +228,77 @@ */ &i2c3 { status = "okay"; + + adv7280: adv7280@21 { + compatible = "adv7280"; + reg = <0x21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0 &pinctrl_cam_mclk>; + clocks = <&clks 200>;Please replace this 200 with a proper clock label.
arch/arm/boot/dts/imx6q-apalis-eval.dts line 243
Quoted 6 lines
arch/arm/boot/dts/imx6q-apalis-eval.dts +6
-0+ clock-names = "csi_mclk"; + DOVDD-supply = <®_3p3v>; + AVDD-supply = <®_3p3v>; + DVDD-supply = <®_3p3v>; + PVDD-supply = <®_3p3v>; + csi_id = <0>;This is not a valid property upstream.
It seems you just ported it from a downstream vendor kernel. Please make sure you test with the dt-bindings from mainline.
arch/arm/boot/dts/imx6q-apalis-eval.dts line 255
Quoted 12 lines
arch/arm/boot/dts/imx6q-apalis-eval.dts +12
-0+ mclk = <24000000>; + mclk_source = <1>; + status = "okay"; + }; + + /* Video ADC on Analog Camera Module */ + adv7180: adv7180@21 { + compatible = "adv,adv7180"; + reg = <0x21>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ipu1_csi0 &pinctrl_cam_mclk>; + clocks = <&clks 200>;clock label, please.
arch/arm/boot/dts/imx6q-apalis-eval.dts line 261
Quoted 6 lines
arch/arm/boot/dts/imx6q-apalis-eval.dts +6
-0+ clock-names = "csi_mclk"; + DOVDD-supply = <®_3p3v>; /* 3.3v */ + AVDD-supply = <®_3p3v>; /* 1.8v */ + DVDD-supply = <®_3p3v>; /* 1.8v */ + PVDD-supply = <®_3p3v>; /* 1.8v */ + csi_id = <0>;Same here
arch/arm/boot/dts/imx6q-apalis-eval.dts line 269
Quoted 8 lines
arch/arm/boot/dts/imx6q-apalis-eval.dts +8
-0+ mclk = <24000000>; + mclk_source = <1>; + cvbs = <1>; + status = "disabled"; + }; + + max9526: max9526@20 { + compatible = "maxim,max9526";
Quoted 1 line
This is not documented in mainline.
Yeah, too much downstream stuff in here. I will drop that patch for now...
PATCH 15/22 ARM: dts: apalis-imx6: Add some optional I2C devices
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
This commit adds the mipi_csi node to Toradex's evalboard as found on the mezzanine connector
---
arch/arm/boot/dts/imx6q-apalis-eval.dts | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/imx6q-apalis-eval.dts +8 -0
@@ -166,6 +166,14 @@ }; }; +&mipi_csi { + ipu_id = <0>; + csi_id = <1>; + v_channel = <0>; + lanes = <2>; + status = "okay"; +}; + &backlight { brightness-levels = <0 127 191 223 239 247 251 255>; default-brightness-level = <1>;
Signature · 1 line
2.22.0
Fabio Estevam
reviewerRe: [PATCH 15/22] ARM: dts: apalis-imx6: Add some optional I2C devices
Hi Philippe,
arch/arm/boot/dts/imx6q-apalis-eval.dts line 173
Quoted 5 lines · Philippe Schenker
+&mipi_csi {
arch/arm/boot/dts/imx6q-apalis-eval.dts +4
-0+ ipu_id = <0>; + csi_id = <1>; + v_channel = <0>; + lanes = <2>;
None of these properties are valid upstream.
Re: [PATCH 15/22] ARM: dts: apalis-imx6: Add some optional I2C devices
Quoted 11 lines · Fabio Estevam
Hi Philippe,
arch/arm/boot/dts/imx6q-apalis-eval.dts line 173
Quoted 5 lines · Philippe Schenker
+&mipi_csi {
arch/arm/boot/dts/imx6q-apalis-eval.dts +4
-0+ ipu_id = <0>; + csi_id = <1>; + v_channel = <0>; + lanes = <2>;None of these properties are valid upstream.
Will drop that one too.
PATCH 16/22 ARM: dts: imx6ull-colibri: Add sleep mode to fec
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
Do not change the clock as the power for this phy is switched with that clock.
---
arch/arm/boot/dts/imx6ull-colibri.dtsi | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx6ull-colibri.dtsi +17 -1
@@ -62,8 +62,9 @@ }; &fec2 { - pinctrl-names = "default"; + pinctrl-names = "default", "sleep"; pinctrl-0 = <&pinctrl_enet2>; + pinctrl-1 = <&pinctrl_enet2_sleep>; phy-mode = "rmii"; phy-handle = <ðphy1>; status = "okay";
@@ -220,6 +221,21 @@ >; }; + pinctrl_enet2_sleep: enet2sleepgrp { + fsl,pins = < + MX6UL_PAD_GPIO1_IO06__GPIO1_IO06 0x0 + MX6UL_PAD_GPIO1_IO07__GPIO1_IO07 0x0 + MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08 0x0 + MX6UL_PAD_ENET2_RX_DATA1__GPIO2_IO09 0x0 + MX6UL_PAD_ENET2_RX_EN__GPIO2_IO10 0x0 + MX6UL_PAD_ENET2_RX_ER__GPIO2_IO15 0x0 + MX6UL_PAD_ENET2_TX_CLK__ENET2_REF_CLK2 0x4001b031 + MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x0 + MX6UL_PAD_ENET2_TX_DATA1__GPIO2_IO12 0x0 + MX6UL_PAD_ENET2_TX_EN__GPIO2_IO13 0x0 + >; + }; + pinctrl_ecspi1_cs: ecspi1-cs-grp { fsl,pins = < MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x000a0
Signature · 1 line
2.22.0
PATCH 17/22 ARM: dts: imx6ull-colibri: reduce v_batt current in power off
In reply to Philippe SchenkerFrom: Max Krummenacher <[email protected]>
Reduce the current drawn from VCC_BATT when the main power on the 3V3 pins to the module are switched off.
This switches off SoC internal pull resistors which are provided on the module for TAMPER7 and TAMPER9 SoC pin and switches on a pull down instead of a pullup for the USBC_DET module pin (TAMPER2).
---
arch/arm/boot/dts/imx6ull-colibri.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx6ull-colibri.dtsi +3 -3
@@ -533,19 +533,19 @@ pinctrl_snvs_ad7879_int: snvs-ad7879-int-grp { /* TOUCH Interrupt */ fsl,pins = < - MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x1b0b0 + MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07 0x100b0 >; }; pinctrl_snvs_reg_sd: snvs-reg-sd-grp { fsl,pins = < - MX6ULL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x4001b8b0 + MX6ULL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x400100b0 >; }; pinctrl_snvs_usbc_det: snvs-usbc-det-grp { fsl,pins = < - MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x1b0b0 + MX6ULL_PAD_SNVS_TAMPER2__GPIO5_IO02 0x130b0 >; };
Signature · 1 line
2.22.0
PATCH 18/22 ARM: dts: imx6ull-colibri: Add watchdog
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
This patch adds the watchdog to the imx6ull-colibri devicetree
---
arch/arm/boot/dts/imx6ull-colibri.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/boot/dts/imx6ull-colibri.dtsi +12 -0
@@ -199,6 +199,12 @@ assigned-clock-rates = <0>, <198000000>; }; +&wdog1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdog>; + fsl,ext-reset-output; +}; + &iomuxc { pinctrl_can_int: canint-grp { fsl,pins = <
@@ -506,6 +512,12 @@ MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x14 >; }; + + pinctrl_wdog: wdog-grp { + fsl,pins = < + MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0 + >; + }; }; &iomuxc_snvs {
Signature · 1 line
2.22.0
PATCH 19/22 ARM: dts: imx6ull: improve can templates
In reply to Philippe SchenkerFrom: Max Krummenacher <[email protected]>
Add the pinmuxing and a inactive node for flexcan1 on SODIMM 55/63 and move the inactive flexcan nodes to imx6ull-colibri-eval-v3.dtsi where they belong.
Note that this commit does not enable flexcan functionality, but rather eases the effort needed to do so.
---
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 12 ++++++++++++ arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri.dtsi | 16 ++++++++++++++-- 4 files changed, 28 insertions(+), 4 deletions(-)
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +12 -0
@@ -83,6 +83,18 @@ }; }; +&can1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; + status = "disabled"; +}; + +&can2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2>; + status = "disabled"; +}; + &i2c1 { status = "okay";
arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi +1 -1
@@ -15,7 +15,7 @@ &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6>; + &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6 &pinctrl_gpio7>; }; &iomuxc_snvs {
arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +1 -1
@@ -26,7 +26,7 @@ &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 - &pinctrl_gpio4 &pinctrl_gpio5>; + &pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio7>; };
arch/arm/boot/dts/imx6ull-colibri.dtsi +14 -2
@@ -256,6 +256,13 @@ >; }; + pinctrl_flexcan1: flexcan1-grp { + fsl,pins = < + MX6UL_PAD_ENET1_RX_DATA0__FLEXCAN1_TX 0x1b020 + MX6UL_PAD_ENET1_RX_DATA1__FLEXCAN1_RX 0x1b020 + >; + }; + pinctrl_flexcan2: flexcan2-grp { fsl,pins = < MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX 0x1b020
@@ -271,8 +278,6 @@ pinctrl_gpio1: gpio1-grp { fsl,pins = < - MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0x74 /* SODIMM 55 */ - MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0x74 /* SODIMM 63 */ MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25 0X14 /* SODIMM 77 */ MX6UL_PAD_JTAG_TCK__GPIO1_IO14 0x14 /* SODIMM 99 */ MX6UL_PAD_NAND_CE1_B__GPIO4_IO14 0x14 /* SODIMM 133 */
@@ -325,6 +330,13 @@ >; }; + pinctrl_gpio7: gpio7-grp { /* CAN1 */ + fsl,pins = < + MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00 0x74 /* SODIMM 55 */ + MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0x74 /* SODIMM 63 */ + >; + }; + pinctrl_gpmi_nand: gpmi-nand-grp { fsl,pins = < MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9
Signature · 1 line
2.22.0
PATCH 20/22 ARM: dts: imx6ull-colibri: Add general wakeup key used on Colibri
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
This adds the possibility to wake the module with an external signal as defined in the Colibri standard
---
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +14 -0
@@ -8,6 +8,20 @@ stdout-path = "serial0:115200n8"; }; + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_snvs_gpiokeys>; + + power { + label = "Wake-Up"; + gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; + linux,code = <KEY_WAKEUP>; + debounce-interval = <10>; + wakeup-source; + }; + }; + /* fixed crystal dedicated to mcp2515 */ clk16m: clk16m { compatible = "fixed-clock";
Signature · 1 line
2.22.0
PATCH 21/22 ARM: dts: imx6/7-colibri: switch dr_mode to otg
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
In order for the otg ports, that these modules support, it is needed that dr_mode is on otg. Switch to use that feature.
---
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 +- arch/arm/boot/dts/imx7-colibri.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6qdl-colibri.dtsi +1 -1
@@ -388,7 +388,7 @@ &usbotg { pinctrl-names = "default"; disable-over-current; - dr_mode = "peripheral"; + dr_mode = "otg"; status = "disabled"; };
arch/arm/boot/dts/imx7-colibri.dtsi +1 -1
@@ -320,7 +320,7 @@ }; &usbotg1 { - dr_mode = "host"; + dr_mode = "otg"; }; &usdhc1 {
Signature · 1 line
2.22.0
PATCH 22/22 ARM: dts: imx6ull-colibri: Add touchscreens used with Eval Board
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
This adds the common touchscreens that are used with Toradex's Eval Boards.
---
.../arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+)
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +37 -0
@@ -112,6 +112,34 @@ &i2c1 { status = "okay"; + /* + * the PCAPs use SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm5, + * pwm6. so if you enable one of the PCAP controllers disable the pwms + */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpiotouch>; + reg = <0x4a>; + interrupt-parent = <&gpio4>; + interrupts = <16 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */ + reset-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */ + status = "disabled"; + }; + + touch: touchrevf0710a@10 { + compatible = "touchrevolution,fusion-f0710a"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpiotouch>; + reg = <0x10>; + /* SODIMM 28, Pen down interrupt */ + gpios = <&gpio4 16 GPIO_ACTIVE_HIGH + /* SODIMM 30, Reset interrupt */ + &gpio2 5 GPIO_ACTIVE_LOW + >; + status = "disabled"; + }; + /* M41T0M6 real time clock on carrier board */ m41t0m6: rtc@68 { compatible = "st,m41t0";
@@ -188,3 +216,12 @@ sd-uhs-sdr104; status = "okay"; }; + +&iomuxc { + pinctrl_gpiotouch: touchgpios { + fsl,pins = < + MX6UL_PAD_NAND_DQS__GPIO4_IO16 0x74 + MX6UL_PAD_ENET1_TX_EN__GPIO2_IO05 0x14 + >; + }; +};
Signature · 1 line
2.22.0