On Wed, 2019-10-16 at 16:28 +0000, Philippe Schenker wrote:
> This patch adds missing i2c recovery modes and corrects wrongly named
> ones.
>
> Signed-off-by: Philippe Schenker <[email protected]>
That went too fast... Will send a v2 shortly.
> ---
>
> arch/arm/boot/dts/imx6qdl-apalis.dtsi | 26 +++++++++++++++++++++--
> ---
> arch/arm/boot/dts/imx6qdl-colibri.dtsi | 6 +++---
> 2 files changed, 24 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> index 7c4ad541c3f5..7baf4a6f04eb 100644
> --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> @@ -205,8 +205,9 @@
> /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */
> &i2c1 {
> clock-frequency = <100000>;
> - pinctrl-names = "default";
> + pinctrl-names = "default", "gpio";
> pinctrl-0 = <&pinctrl_i2c1>;
> + pinctrl-1 = <&pinctrl_i2c1_gpio>;
> status = "disabled";
> };
>
> @@ -216,8 +217,9 @@
> */
> &i2c2 {
> clock-frequency = <100000>;
> - pinctrl-names = "default";
> + pinctrl-names = "default", "gpio";
> pinctrl-0 = <&pinctrl_i2c2>;
> + pinctrl-1 = <&pinctrl_i2c2_gpio>;
> status = "okay";
>
> pmic: pfuze100@8 {
> @@ -372,9 +374,9 @@
> */
> &i2c3 {
> clock-frequency = <100000>;
> - pinctrl-names = "default", "recovery";
> + pinctrl-names = "default", "gpio";
> pinctrl-0 = <&pinctrl_i2c3>;
> - pinctrl-1 = <&pinctrl_i2c3_recovery>;
> + pinctrl-1 = <&pinctrl_i2c3_gpio>;
> scl-gpios = <&gpio3 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> sda-gpios = <&gpio3 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> status = "disabled";
> @@ -646,6 +648,13 @@
> >;
> };
>
> + pinctrl_i2c1_gpio: i2c1gpiogrp {
> + fsl,pins = <
> + MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26 0x4001b8b1
> + MX6QDL_PAD_CSI0_DAT9__GPIO5_IO27 0x4001b8b1
> + >;
> + };
> +
> pinctrl_i2c2: i2c2grp {
> fsl,pins = <
> MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
> @@ -653,6 +662,13 @@
> >;
> };
>
> + pinctrl_i2c2_gpio: i2c2gpiogrp {
> + 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
> @@ -660,7 +676,7 @@
> >;
> };
>
> - pinctrl_i2c3_recovery: i2c3recoverygrp {
> + pinctrl_i2c3_gpio: i2c3gpiogrp {
> fsl,pins = <
> MX6QDL_PAD_EIM_D17__GPIO3_IO17 0x4001b8b1
> MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x4001b8b1
> diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
> b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
> index 019dda6b88ad..4ed7ae57030d 100644
> --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
> @@ -312,9 +312,9 @@
> */
> &i2c3 {
> clock-frequency = <100000>;
> - pinctrl-names = "default", "recovery";
> + pinctrl-names = "default", "gpio";
> pinctrl-0 = <&pinctrl_i2c3>;
> - pinctrl-1 = <&pinctrl_i2c3_recovery>;
> + pinctrl-1 = <&pinctrl_i2c3_gpio>;
> scl-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> sda-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> status = "disabled";
> @@ -516,7 +516,7 @@
> >;
> };
>
> - pinctrl_i2c3_recovery: i2c3recoverygrp {
> + pinctrl_i2c3_gpio: i2c3gpiogrp {
> fsl,pins = <
> MX6QDL_PAD_GPIO_3__GPIO1_IO03 0x4001b8b1
> MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x4001b8b1
