From: Shawn Guo <shawnguo@kernel.org>
To: Philippe Schenker <philippe.schenker@toradex.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
Max Krummenacher <max.krummenacher@toradex.com>,
Stefan Agner <stefan.agner@toradex.com>,
Marcel Ziswiler <marcel.ziswiler@toradex.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Rob Herring <robh+dt@kernel.org>,
NXP Linux Team <linux-imx@nxp.com>,
Luka Pivk <luka.pivk@toradex.com>,
Fabio Estevam <festevam@gmail.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes to i2c
Date: Mon, 28 Oct 2019 11:08:12 +0800 [thread overview]
Message-ID: <20191028030810.GH16985@dragon> (raw)
In-Reply-To: <20191016170332.2013-1-philippe.schenker@toradex.com>
On Wed, Oct 16, 2019 at 05:03:41PM +0000, Philippe Schenker wrote:
> This patch adds missing i2c recovery modes and corrects wrongly named
> ones.
>
> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
As a practise, we use 'ARM: ' to prefix i.MX arch/arm/ patches.
I fixed it up and applied both patches.
Shawn
>
> ---
>
> Changes in v2:
> - Added scl/sda gpio
> - Added missing recovery mode to i2c2 on imx6qdl-colibri
>
> arch/arm/boot/dts/imx6qdl-apalis.dtsi | 30 +++++++++++++++++++++-----
> arch/arm/boot/dts/imx6qdl-colibri.dtsi | 18 ++++++++++++----
> 2 files changed, 39 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> index 7c4ad541c3f5..86cad6c9f0f9 100644
> --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> @@ -205,8 +205,11 @@
> /* 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>;
> + scl-gpios = <&gpio5 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> + sda-gpios = <&gpio5 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> status = "disabled";
> };
>
> @@ -216,8 +219,11 @@
> */
> &i2c2 {
> clock-frequency = <100000>;
> - pinctrl-names = "default";
> + pinctrl-names = "default", "gpio";
> pinctrl-0 = <&pinctrl_i2c2>;
> + pinctrl-1 = <&pinctrl_i2c2_gpio>;
> + scl-gpios = <&gpio4 12 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> + sda-gpios = <&gpio4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> status = "okay";
>
> pmic: pfuze100@8 {
> @@ -372,9 +378,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 +652,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 +666,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 +680,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..8ab9960fc15d 100644
> --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
> @@ -166,8 +166,11 @@
> */
> &i2c2 {
> clock-frequency = <100000>;
> - pinctrl-names = "default";
> + pinctrl-names = "default", "gpio";
> pinctrl-0 = <&pinctrl_i2c2>;
> + pinctrl-0 = <&pinctrl_i2c2_gpio>;
> + scl-gpios = <&gpio2 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> + sda-gpios = <&gpio3 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> status = "okay";
>
> pmic: pfuze100@8 {
> @@ -312,9 +315,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";
> @@ -509,6 +512,13 @@
> >;
> };
>
> + pinctrl_i2c2_gpio: i2c2grp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x4001b8b1
> + MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x4001b8b1
> + >;
> + };
> +
> pinctrl_i2c3: i2c3grp {
> fsl,pins = <
> MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
> @@ -516,7 +526,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
> --
> 2.23.0
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Shawn Guo <shawnguo@kernel.org>
To: Philippe Schenker <philippe.schenker@toradex.com>
Cc: "devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
Marcel Ziswiler <marcel.ziswiler@toradex.com>,
Max Krummenacher <max.krummenacher@toradex.com>,
Stefan Agner <stefan.agner@toradex.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Luka Pivk <luka.pivk@toradex.com>,
Fabio Estevam <festevam@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Mark Rutland <mark.rutland@arm.com>,
NXP Linux Team <linux-imx@nxp.com>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: Re: [PATCH v2 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes to i2c
Date: Mon, 28 Oct 2019 11:08:12 +0800 [thread overview]
Message-ID: <20191028030810.GH16985@dragon> (raw)
In-Reply-To: <20191016170332.2013-1-philippe.schenker@toradex.com>
On Wed, Oct 16, 2019 at 05:03:41PM +0000, Philippe Schenker wrote:
> This patch adds missing i2c recovery modes and corrects wrongly named
> ones.
>
> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
As a practise, we use 'ARM: ' to prefix i.MX arch/arm/ patches.
I fixed it up and applied both patches.
Shawn
>
> ---
>
> Changes in v2:
> - Added scl/sda gpio
> - Added missing recovery mode to i2c2 on imx6qdl-colibri
>
> arch/arm/boot/dts/imx6qdl-apalis.dtsi | 30 +++++++++++++++++++++-----
> arch/arm/boot/dts/imx6qdl-colibri.dtsi | 18 ++++++++++++----
> 2 files changed, 39 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> index 7c4ad541c3f5..86cad6c9f0f9 100644
> --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
> @@ -205,8 +205,11 @@
> /* 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>;
> + scl-gpios = <&gpio5 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> + sda-gpios = <&gpio5 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> status = "disabled";
> };
>
> @@ -216,8 +219,11 @@
> */
> &i2c2 {
> clock-frequency = <100000>;
> - pinctrl-names = "default";
> + pinctrl-names = "default", "gpio";
> pinctrl-0 = <&pinctrl_i2c2>;
> + pinctrl-1 = <&pinctrl_i2c2_gpio>;
> + scl-gpios = <&gpio4 12 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> + sda-gpios = <&gpio4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> status = "okay";
>
> pmic: pfuze100@8 {
> @@ -372,9 +378,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 +652,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 +666,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 +680,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..8ab9960fc15d 100644
> --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
> @@ -166,8 +166,11 @@
> */
> &i2c2 {
> clock-frequency = <100000>;
> - pinctrl-names = "default";
> + pinctrl-names = "default", "gpio";
> pinctrl-0 = <&pinctrl_i2c2>;
> + pinctrl-0 = <&pinctrl_i2c2_gpio>;
> + scl-gpios = <&gpio2 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> + sda-gpios = <&gpio3 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
> status = "okay";
>
> pmic: pfuze100@8 {
> @@ -312,9 +315,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";
> @@ -509,6 +512,13 @@
> >;
> };
>
> + pinctrl_i2c2_gpio: i2c2grp {
> + fsl,pins = <
> + MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x4001b8b1
> + MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x4001b8b1
> + >;
> + };
> +
> pinctrl_i2c3: i2c3grp {
> fsl,pins = <
> MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
> @@ -516,7 +526,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
> --
> 2.23.0
>
next prev parent reply other threads:[~2019-10-28 3:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-16 17:03 [PATCH v2 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes to i2c Philippe Schenker
2019-10-16 17:03 ` Philippe Schenker
2019-10-16 17:03 ` [PATCH v2 2/2] arm: dts: vf-colibri: add recovery mode " Philippe Schenker
2019-10-16 17:03 ` Philippe Schenker
2019-10-28 3:08 ` Shawn Guo [this message]
2019-10-28 3:08 ` [PATCH v2 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes " Shawn Guo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191028030810.GH16985@dragon \
--to=shawnguo@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luka.pivk@toradex.com \
--cc=marcel.ziswiler@toradex.com \
--cc=mark.rutland@arm.com \
--cc=max.krummenacher@toradex.com \
--cc=philippe.schenker@toradex.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=stefan.agner@toradex.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.