diff options
| author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2019-05-06 14:37:58 +0300 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2019-05-09 11:13:57 +0200 |
| commit | 266314e926ad6efc85f196f8816497c4317d1919 (patch) | |
| tree | 62f037d26a0b885536f863ffcc82b9a3d1c1b681 | |
| parent | 0e6b9bfaa909ec68c31c4163be5a76ff6da50a71 (diff) | |
ARM: dts: add recovery mode for all I2C buses
- fix the name of pinctrl set for i2c2 recovery mode;
- add recovery mode for applicable i2c buses for
Apalis/Colibri iMX6Q/D/DL modules.
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
Related to: #49059
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 28 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 13 |
2 files changed, 35 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 59e1677574d7..4a1ff88593c1 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -326,8 +326,11 @@ */ &i2c1 { clock-frequency = <100000>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c1>; + pinctrl-1 = <&pinctrl_i2c1_recovery>; + scl-gpios = <&gpio5 27 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio5 26 GPIO_ACTIVE_HIGH>; status = "disabled"; }; @@ -337,8 +340,11 @@ */ &i2c2 { clock-frequency = <100000>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c2>; + pinctrl-1 = <&pinctrl_i2c2_recovery>; + scl-gpios = <&gpio4 12 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio4 13 GPIO_ACTIVE_HIGH>; status = "okay"; pmic: pfuze100@08 { @@ -500,7 +506,7 @@ */ &i2c3 { clock-frequency = <100000>; - pinctrl-names = "default", "recovery"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c3>; pinctrl-1 = <&pinctrl_i2c3_recovery>; scl-gpios = <&gpio3 17 GPIO_ACTIVE_HIGH>; @@ -925,8 +931,15 @@ pinctrl_i2c1: i2c1grp { fsl,pins = < - MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1 MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1 + MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1 + >; + }; + + pinctrl_i2c1_recovery: i2c1recoverygrp { + fsl,pins = < + MX6QDL_PAD_CSI0_DAT9__GPIO5_IO27 0x4001b8b1 + MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26 0x4001b8b1 >; }; @@ -937,6 +950,13 @@ >; }; + pinctrl_i2c2_recovery: i2c2recoverygrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL3__GPIO4_IO12 0x4001b8b1 + MX6QDL_PAD_KEY_ROW3__GPIO4_IO13 0x4001b8b1 + >; + }; + pinctrl_i2c3: i2c3grp { fsl,pins = < MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index 23770786ab77..3f4cba905506 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -232,8 +232,11 @@ &i2c2 { clock-frequency = <100000>; - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c2>; + pinctrl-1 = <&pinctrl_i2c2_recovery>; + scl-gpios = <&gpio2 30 GPIO_ACTIVE_HIGH>; + sda-gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>; status = "okay"; pmic: pfuze100@08 { @@ -389,7 +392,7 @@ */ &i2c3 { clock-frequency = <100000>; - pinctrl-names = "default", "recovery"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c3>; pinctrl-1 = <&pinctrl_i2c3_recovery>; scl-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; @@ -551,6 +554,12 @@ MX6QDL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1 >; }; + pinctrl_i2c2_recovery: i2c2-recoverygrp { + fsl,pins = < + MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x4001b8b1 + MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x4001b8b1 + >; + }; pinctrl_mic_gnd: gpio_mic_gnd { fsl,pins = < MX6QDL_PAD_RGMII_TD1__GPIO6_IO21 PAD_CTRL_HYS_PU /* Controlls Mic GND, PU or '1' pull Mic GND to GND */ |