* [PATCH 2/5] ARM: dts: imx6qdl: tqma6: Add i2c bus recovery
2022-02-08 12:32 [PATCH 1/5] ARM: dts: imx6qdl-mba6: Move rtc alias to common location Alexander Stein
@ 2022-02-08 12:32 ` Alexander Stein
2022-02-08 12:32 ` [PATCH 3/5] ARM: dts: imx6qdl: tqma6: Mark gpio-buttons as wakeup-source Alexander Stein
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Stein @ 2022-02-08 12:32 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Shawn Guo, Sascha Hauer,
Fabio Estevam
Cc: Alexander Stein, Matthias Schiffer, devicetree, linux-arm-kernel
Add the pinmuxing and GPIO settings for SCL/SDA for i2c1 & i2c3.
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
arch/arm/boot/dts/imx6qdl-mba6b.dtsi | 5 ++++-
arch/arm/boot/dts/imx6qdl-tqma6.dtsi | 14 ++++++++++++++
arch/arm/boot/dts/imx6qdl-tqma6a.dtsi | 7 ++++++-
arch/arm/boot/dts/imx6qdl-tqma6b.dtsi | 7 ++++++-
4 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-mba6b.dtsi b/arch/arm/boot/dts/imx6qdl-mba6b.dtsi
index 2e3407790963..7d1cd7454c7f 100644
--- a/arch/arm/boot/dts/imx6qdl-mba6b.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-mba6b.dtsi
@@ -13,8 +13,11 @@ &fec {
&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 | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio5 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-tqma6.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
index 51a3a5392c95..344ea935c7da 100644
--- a/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tqma6.dtsi
@@ -52,6 +52,13 @@ MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b899
>;
};
+ pinctrl_i2c1_recovery: i2c1recoverygrp {
+ fsl,pins = <
+ MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26 0x4001b899
+ MX6QDL_PAD_CSI0_DAT9__GPIO5_IO27 0x4001b899
+ >;
+ };
+
pinctrl_i2c3: i2c3grp {
fsl,pins = <
MX6QDL_PAD_GPIO_5__I2C3_SCL 0x4001b899
@@ -59,6 +66,13 @@ MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b899
>;
};
+ pinctrl_i2c3_recovery: i2c3recoverygrp {
+ fsl,pins = <
+ MX6QDL_PAD_GPIO_5__GPIO1_IO05 0x4001b899
+ MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x4001b899
+ >;
+ };
+
pinctrl_pmic: pmicgrp {
fsl,pins = <
MX6QDL_PAD_NANDF_RB0__GPIO6_IO10 0x1b099 /* PMIC irq */
diff --git a/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi
index bfb67da64b96..7dc3f0005b0f 100644
--- a/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tqma6a.dtsi
@@ -4,6 +4,8 @@
* Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
*/
+#include <dt-bindings/gpio/gpio.h>
+
&fec {
interrupts-extended = <&gpio1 6 IRQ_TYPE_LEVEL_HIGH>,
<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;
@@ -11,8 +13,11 @@ &fec {
};
&i2c1 {
- pinctrl-names = "default";
+ pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c1>;
+ pinctrl-1 = <&pinctrl_i2c1_recovery>;
+ scl-gpios = <&gpio5 27 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio5 26 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
clock-frequency = <100000>;
status = "okay";
diff --git a/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi b/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi
index 49c472285c06..dd0925766440 100644
--- a/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tqma6b.dtsi
@@ -4,9 +4,14 @@
* Copyright 2013-2017 Markus Niebel <Markus.Niebel@tq-group.com>
*/
+#include <dt-bindings/gpio/gpio.h>
+
&i2c3 {
- pinctrl-names = "default";
+ pinctrl-names = "default", "gpio";
pinctrl-0 = <&pinctrl_i2c3>;
+ pinctrl-1 = <&pinctrl_i2c3_recovery>;
+ scl-gpios = <&gpio1 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
clock-frequency = <100000>;
status = "okay";
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/5] ARM: dts: imx6qdl: tqma6: Mark gpio-buttons as wakeup-source
2022-02-08 12:32 [PATCH 1/5] ARM: dts: imx6qdl-mba6: Move rtc alias to common location Alexander Stein
2022-02-08 12:32 ` [PATCH 2/5] ARM: dts: imx6qdl: tqma6: Add i2c bus recovery Alexander Stein
@ 2022-02-08 12:32 ` Alexander Stein
2022-02-08 12:32 ` [PATCH 4/5] ARM: dts: imx6qdl: tqma6: Remove obsolete comment Alexander Stein
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Stein @ 2022-02-08 12:32 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Shawn Guo, Sascha Hauer,
Fabio Estevam
Cc: Alexander Stein, Matthias Schiffer, devicetree, linux-arm-kernel
They are connected directly to CPU, so they can be used as wakeup source.
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
arch/arm/boot/dts/imx6qdl-mba6.dtsi | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/boot/dts/imx6qdl-mba6.dtsi b/arch/arm/boot/dts/imx6qdl-mba6.dtsi
index 8f6e1dd82ee4..1b6943802642 100644
--- a/arch/arm/boot/dts/imx6qdl-mba6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-mba6.dtsi
@@ -40,18 +40,21 @@ button1 {
label = "s6";
linux,code = <KEY_F6>;
gpios = <&gpio7 13 GPIO_ACTIVE_LOW>;
+ wakeup-source;
};
button2 {
label = "s7";
linux,code = <KEY_F7>;
gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
+ wakeup-source;
};
button3 {
label = "s8";
linux,code = <KEY_F8>;
gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
+ wakeup-source;
};
};
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/5] ARM: dts: imx6qdl: tqma6: Remove obsolete comment
2022-02-08 12:32 [PATCH 1/5] ARM: dts: imx6qdl-mba6: Move rtc alias to common location Alexander Stein
2022-02-08 12:32 ` [PATCH 2/5] ARM: dts: imx6qdl: tqma6: Add i2c bus recovery Alexander Stein
2022-02-08 12:32 ` [PATCH 3/5] ARM: dts: imx6qdl: tqma6: Mark gpio-buttons as wakeup-source Alexander Stein
@ 2022-02-08 12:32 ` Alexander Stein
2022-02-08 12:32 ` [PATCH 5/5] ARM: dts: imx6qdl-mba6: Move pinmux to regulator node Alexander Stein
2022-02-13 2:31 ` [PATCH 1/5] ARM: dts: imx6qdl-mba6: Move rtc alias to common location Shawn Guo
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Stein @ 2022-02-08 12:32 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Shawn Guo, Sascha Hauer,
Fabio Estevam
Cc: Alexander Stein, Matthias Schiffer, devicetree, linux-arm-kernel
This comment is not valid anymore.
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
arch/arm/boot/dts/imx6qdl-mba6.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx6qdl-mba6.dtsi b/arch/arm/boot/dts/imx6qdl-mba6.dtsi
index 1b6943802642..9aacc1a62189 100644
--- a/arch/arm/boot/dts/imx6qdl-mba6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-mba6.dtsi
@@ -396,7 +396,6 @@ MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0xb099 /* LED V16 */
pinctrl_hog: hoggrp {
fsl,pins = <
- /* LCD.CONTRAST -> Rev 0100 only, not used on Rev.0200*/
MX6QDL_PAD_DI0_PIN4__GPIO4_IO20 0x0001b099
MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x0001b099
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 5/5] ARM: dts: imx6qdl-mba6: Move pinmux to regulator node
2022-02-08 12:32 [PATCH 1/5] ARM: dts: imx6qdl-mba6: Move rtc alias to common location Alexander Stein
` (2 preceding siblings ...)
2022-02-08 12:32 ` [PATCH 4/5] ARM: dts: imx6qdl: tqma6: Remove obsolete comment Alexander Stein
@ 2022-02-08 12:32 ` Alexander Stein
2022-02-13 2:31 ` [PATCH 1/5] ARM: dts: imx6qdl-mba6: Move rtc alias to common location Shawn Guo
4 siblings, 0 replies; 6+ messages in thread
From: Alexander Stein @ 2022-02-08 12:32 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Shawn Guo, Sascha Hauer,
Fabio Estevam
Cc: Alexander Stein, Matthias Schiffer, devicetree, linux-arm-kernel
GPIO2_IO00 is used by reg_pcie, move the pinmuxing to this node as well.
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
---
arch/arm/boot/dts/imx6qdl-mba6.dtsi | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-mba6.dtsi b/arch/arm/boot/dts/imx6qdl-mba6.dtsi
index 9aacc1a62189..f4dca20669d6 100644
--- a/arch/arm/boot/dts/imx6qdl-mba6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-mba6.dtsi
@@ -86,6 +86,8 @@ reg_mba6_3p3v: regulator-mba6-3p3v {
reg_pcie: regulator-pcie {
compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_regpcie>;
regulator-name = "supply-pcie";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -436,8 +438,6 @@ pinctrl_pcie: pciegrp {
MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x001b0f0 /* #PCIE.WAKE */
MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x001b0f0 /* #PCIE.RST */
MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x001b0f0 /* #PCIE.DIS */
- /* HYS = 1, DSE = 110, PUE+PKE, SPEED = HIGH (11)*/
- MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x00130f0 /* PCIE.PWR_EN */
>;
};
@@ -462,6 +462,13 @@ MX6QDL_PAD_SD4_DAT2__PWM4_OUT 0x00003050
>;
};
+ pinctrl_regpcie: regpciegrp {
+ fsl,pins = <
+ /* HYS = 1, DSE = 110, PUE+PKE, SPEED = HIGH (11)*/
+ MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x00130f0 /* PCIE.PWR_EN */
+ >;
+ };
+
pinctrl_uart2: uart2grp {
fsl,pins = <
MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b099
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/5] ARM: dts: imx6qdl-mba6: Move rtc alias to common location
2022-02-08 12:32 [PATCH 1/5] ARM: dts: imx6qdl-mba6: Move rtc alias to common location Alexander Stein
` (3 preceding siblings ...)
2022-02-08 12:32 ` [PATCH 5/5] ARM: dts: imx6qdl-mba6: Move pinmux to regulator node Alexander Stein
@ 2022-02-13 2:31 ` Shawn Guo
4 siblings, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2022-02-13 2:31 UTC (permalink / raw)
To: Alexander Stein
Cc: Rob Herring, Krzysztof Kozlowski, Sascha Hauer, Fabio Estevam,
Matthias Schiffer, devicetree, linux-arm-kernel
On Tue, Feb 08, 2022 at 01:32:44PM +0100, Alexander Stein wrote:
> The rtc alias is identical for both mba6a and mba6b.
>
> Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Applied all, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread