Commit d2b91ab1 authored by Stefan Agner's avatar Stefan Agner Committed by Shawn Guo
Browse files

ARM: dts: imx6*-apalis/-colibri: mark I2C recovery GPIOs as open drain 



Since commit d2d0ad2a ("i2c: imx: use open drain for recovery
GPIO") GPIO lib expects this GPIO to be configured as open drain.
Make sure we define this GPIO as open drain in the device tree.
This gets rid of the following warning:
  gpio-81 (scl): enforced open drain please flag it properly in DT/ACPI DSDT/board file

Note that currently the i.MX pinctrl driver does not support
enabling open drain directly, so this patch has no effect in
practice. Open drain is enabled by the fixed pinmux entry.

Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Reviewed-by: default avatarPhilippe Schenker <philippe.schenker@toradex.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 69ab17b5

arch/arm/boot/dts/imx6qdl-apalis.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -369,8 +369,8 @@ 
	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>;

	scl-gpios = <&gpio3 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	sda-gpios = <&gpio3 18 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	status = "disabled";

};

arch/arm/boot/dts/imx6qdl-colibri.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -298,8 +298,8 @@ 
	pinctrl-names = "default", "recovery";

	pinctrl-0 = <&pinctrl_i2c3>;

	pinctrl-1 = <&pinctrl_i2c3_recovery>;

	scl-gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;

	sda-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;

	scl-gpios = <&gpio1 3 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	sda-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	status = "disabled";

};

arch/arm/boot/dts/imx6ull-colibri.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -94,16 +94,16 @@ 
	pinctrl-names = "default", "gpio";

	pinctrl-0 = <&pinctrl_i2c1>;

	pinctrl-1 = <&pinctrl_i2c1_gpio>;

	sda-gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;

	scl-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;

	sda-gpios = <&gpio1 29 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	scl-gpios = <&gpio1 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

};



&i2c2 {

	pinctrl-names = "default", "gpio";

	pinctrl-0 = <&pinctrl_i2c2>;

	pinctrl-1 = <&pinctrl_i2c2_gpio>;

	sda-gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;

	scl-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;

	sda-gpios = <&gpio1 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	scl-gpios = <&gpio1 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	status = "okay";



	ad7879@2c {

CRA Git | Maintained and supported by SUSTech CRA and CCSE