linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v1 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes to i2c
@ 2019-10-16 16:28 Philippe Schenker
  2019-10-16 16:28 ` [PATCH v1 2/2] arm: dts: vf-colibri: add recovery mode " Philippe Schenker
  2019-10-16 16:42 ` [PATCH v1 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes " Philippe Schenker
  0 siblings, 2 replies; 3+ messages in thread
From: Philippe Schenker @ 2019-10-16 16:28 UTC (permalink / raw)
  To: devicetree, Shawn Guo
  Cc: Marcel Ziswiler, Max Krummenacher, Stefan Agner, linux-kernel,
	Luka Pivk, Philippe Schenker, Fabio Estevam, Rob Herring,
	linux-arm-kernel, Pengutronix Kernel Team, Mark Rutland,
	NXP Linux Team, Sascha Hauer

This patch adds missing i2c recovery modes and corrects wrongly named
ones.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---

 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
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH v1 2/2] arm: dts: vf-colibri: add recovery mode to i2c
  2019-10-16 16:28 [PATCH v1 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes to i2c Philippe Schenker
@ 2019-10-16 16:28 ` Philippe Schenker
  2019-10-16 16:42 ` [PATCH v1 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes " Philippe Schenker
  1 sibling, 0 replies; 3+ messages in thread
From: Philippe Schenker @ 2019-10-16 16:28 UTC (permalink / raw)
  To: devicetree, Shawn Guo
  Cc: Marcel Ziswiler, Max Krummenacher, Stefan Agner, linux-kernel,
	Luka Pivk, Philippe Schenker, Stefan Agner, Rob Herring,
	linux-arm-kernel, Pengutronix Kernel Team, Mark Rutland,
	Sascha Hauer

This patch enables the recovery mode now available.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>

---

 arch/arm/boot/dts/vf-colibri.dtsi | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/vf-colibri.dtsi b/arch/arm/boot/dts/vf-colibri.dtsi
index b6a1eeeb2bb4..254402c4f872 100644
--- a/arch/arm/boot/dts/vf-colibri.dtsi
+++ b/arch/arm/boot/dts/vf-colibri.dtsi
@@ -129,8 +129,9 @@
 
 &i2c0 {
 	clock-frequency = <400000>;
-	pinctrl-names = "default";
+	pinctrl-names = "default", "gpio";
 	pinctrl-0 = <&pinctrl_i2c0>;
+	pinctrl-1 = <&pinctrl_i2c0_gpio>;
 };
 
 &nfc {
@@ -308,6 +309,13 @@
 			>;
 		};
 
+		pinctrl_i2c0_gpio: i2c0gpiogrp {
+			fsl,pins = <
+				VF610_PAD_PTB14__GPIO_36		0x37ff
+				VF610_PAD_PTB15__GPIO_37		0x37ff
+			>;
+		};
+
 		pinctrl_nfc: nfcgrp {
 			fsl,pins = <
 				VF610_PAD_PTD23__NF_IO7		0x28df
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH v1 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes to i2c
  2019-10-16 16:28 [PATCH v1 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes to i2c Philippe Schenker
  2019-10-16 16:28 ` [PATCH v1 2/2] arm: dts: vf-colibri: add recovery mode " Philippe Schenker
@ 2019-10-16 16:42 ` Philippe Schenker
  1 sibling, 0 replies; 3+ messages in thread
From: Philippe Schenker @ 2019-10-16 16:42 UTC (permalink / raw)
  To: devicetree, shawnguo
  Cc: Max Krummenacher, Marcel Ziswiler, Luka Pivk, festevam, kernel,
	mark.rutland, linux-kernel, Stefan Agner, linux-arm-kernel,
	s.hauer, robh+dt, linux-imx

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 <philippe.schenker@toradex.com>

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

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-16 16:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-16 16:28 [PATCH v1 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes to i2c Philippe Schenker
2019-10-16 16:28 ` [PATCH v1 2/2] arm: dts: vf-colibri: add recovery mode " Philippe Schenker
2019-10-16 16:42 ` [PATCH v1 1/2] arm: dts: imx*(colibri|apalis): add missing recovery modes " Philippe Schenker

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).