Skip to contentSkip to conversation

Kontron i.MX8MP OSM Devicetree Fixups

PATCH Applied Frieder Schrempf 5 participants 12 messages Feb 20 – Mar 9

Subsystems (2)

v2 of 3 Applied Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover Kontron i.MX8MP OSM Devicetree Fixups

From: Frieder Schrempf <[email protected]>

This contains three fixes and one cosmetic change for the Kontron i.MX8MP OSM devices.

Changes for v2:
* Add Frank's R-b tags (thanks)
* Enhance commit message of patch 2

Annette Kobou (1):
arm64: dts: imx8mp-kontron: Fix boot order for PMIC and RTC

Frieder Schrempf (3):
arm64: dts: imx8mp-kontron: Fix touch reset configuration on DL
devices
arm64: dts: imx8mp-kontron: Drop vmmc-supply to fix SD card on SMARC
eval carrier
arm64: dts: imx8mp-kontron: Use GPIO/IRQ defines in DL devicetree

 .../boot/dts/freescale/imx8mp-kontron-dl.dtso | 26 ++++++++++++++++---
 .../dts/freescale/imx8mp-kontron-osm-s.dtsi   |  6 +++++
 .../imx8mp-kontron-smarc-eval-carrier.dts     |  1 -
 3 files changed, 29 insertions(+), 4 deletions(-)
Signature · 1 line
2.52.0
#1 lore raw

PATCH v2 1/4 arm64: dts: imx8mp-kontron: Fix touch reset configuration on DL devices

From: Frieder Schrempf <[email protected]>

The reset signal needs a pullup, but there is no hardware pullup. As a workaround, enable the internal pullup to fix the touchscreen.

As this deviates from the default generic GPIO settings in the OSM devicetree, add a new node for the touch pinctrl and redefine the generic gpio1 pinctrl.

Fixes 946ab10e3f40f ("arm64: dts: Add support for Kontron OSM-S i.MX8MP SoM and BL carrier board")
---
 .../boot/dts/freescale/imx8mp-kontron-dl.dtso | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp-kontron-dl.dtso +19 -0
index a3cba41d2b531..7131e9a499ae1 100644
@@ -77,6 +77,8 @@ &i2c1 {
 	touchscreen@5d {
 		compatible = "goodix,gt928";
 		reg = <0x5d>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_touch>;
 		interrupt-parent = <&gpio1>;
 		interrupts = <6 8>;
 		irq-gpios = <&gpio1 6 0>;
@@ -98,6 +100,16 @@ &lvds_bridge {
 	status = "okay";
 };
 
+/* redefine to remove touch controller GPIOs */
+&pinctrl_gpio1 {
+	fsl,pins = <
+		MX8MP_IOMUXC_GPIO1_IO00__GPIO1_IO00		0x19 /* GPIO_A_0 */
+		MX8MP_IOMUXC_GPIO1_IO01__GPIO1_IO01		0x19 /* GPIO_A_1 */
+		MX8MP_IOMUXC_GPIO1_IO05__GPIO1_IO05		0x19 /* GPIO_A_2 */
+		MX8MP_IOMUXC_GPIO1_IO08__GPIO1_IO08		0x19 /* GPIO_A_5 */
+	>;
+};
+
 &pwm1 {
 	status = "okay";
 };
@@ -108,4 +120,11 @@ pinctrl_panel_stby: panelstbygrp {
 			MX8MP_IOMUXC_SAI3_RXFS__GPIO4_IO28		0x19
 		>;
 	};
+
+	pinctrl_touch: touchgrp {
+		fsl,pins = <
+			MX8MP_IOMUXC_GPIO1_IO06__GPIO1_IO06		0x19
+			MX8MP_IOMUXC_GPIO1_IO07__GPIO1_IO07		0x150
+		>;
+	};
 };
Signature · 1 line
2.52.0
#2 lore raw

PATCH v2 2/4 arm64: dts: imx8mp-kontron: Drop vmmc-supply to fix SD card on SMARC eval carrier

In reply to Frieder Schrempf

From: Frieder Schrempf <[email protected]>

The SMARC evaluation carrier provides an SD card power switch that complies with the OSM standard definition. The OSM base devicetree already describes this correctly.

Stop overriding the vmmc-supply in the board devicetree and rely on the definition from the OSM base DTS instead to fix the power supply configuration for the SD card.

Fixes 6fe1ced5ccab7 ("arm64: dts: Add support for Kontron i.MX8MP SMARC module and eval carrier")
---
 .../boot/dts/freescale/imx8mp-kontron-smarc-eval-carrier.dts     | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/freescale/imx8mp-kontron-smarc-eval-carrier.dts +0 -1
index 2173a36ff6917..74d620dd06b7b 100644
@@ -249,6 +249,5 @@ &usb3_phy1 {
 };
 
 &usdhc2 {
-	vmmc-supply = <&reg_vdd_3v3>;
 	status = "okay";
 };
Signature · 1 line
2.52.0
#3 lore raw

PATCH v2 3/4 arm64: dts: imx8mp-kontron: Fix boot order for PMIC and RTC

In reply to Frieder Schrempf

From: Annette Kobou <[email protected]>

The PMIC provides a level-shifter for the I2C lines to the RTC. As the level shifter needs to be enabled before the RTC can be accessed, we need to make sure that the PMIC driver is probed first.

As the PMIC also provides the supply voltage for the RTC through the 3.3V regulator, we can simply express this in the DT to create the required dependency.

This fixes sporadic boot hangs that occurred when the RTC was accessed before the level-shifter was enabled.

Fixes 946ab10e3f40f ("arm64: dts: Add support for Kontron OSM-S i.MX8MP SoM and BL carrier board")
---
 arch/arm64/boot/dts/freescale/imx8mp-kontron-osm-s.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/freescale/imx8mp-kontron-osm-s.dtsi +6 -0
index b97bfeb1c30f8..bc1a261bb000e 100644
@@ -330,6 +330,12 @@ rv3028: rtc@52 {
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_rtc>;
 		interrupts-extended = <&gpio3 24 IRQ_TYPE_LEVEL_LOW>;
+		/*
+		 * While specifying the vdd-supply is normally not strictly necessary,
+		 * here it also makes sure that the PMIC driver enables the level-
+		 * shifter for the RTC before the RTC is probed.
+		 */
+		vdd-supply = <&reg_vdd_3v3>;
 	};
 };
 
Signature · 1 line
2.52.0
#4 lore raw

PATCH v2 4/4 arm64: dts: imx8mp-kontron: Use GPIO/IRQ defines in DL devicetree

In reply to Frieder Schrempf

From: Frieder Schrempf <[email protected]>

To make the code more readable, use the macros for the GPIO and IRQ settings.

---
 arch/arm64/boot/dts/freescale/imx8mp-kontron-dl.dtso | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/freescale/imx8mp-kontron-dl.dtso +4 -3
index 7131e9a499ae1..41a2bb74f1565 100644
@@ -7,6 +7,7 @@
 /plugin/;
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include "imx8mp-pinfunc.h"
 
 &{/} {
@@ -80,11 +81,11 @@ touchscreen@5d {
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_touch>;
 		interrupt-parent = <&gpio1>;
-		interrupts = <6 8>;
-		irq-gpios = <&gpio1 6 0>;
+		interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
+		irq-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
 		AVDD28-supply = <&reg_vcc_panel>;
 		VDDIO-supply = <&reg_vcc_panel>;
-		reset-gpios = <&gpio1 7 0>;
+		reset-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
 	};
 };
 
Signature · 1 line
2.52.0
Reviewed-by on v2 4/4
#5 lore raw

Re: [PATCH v2 4/4] arm64: dts: imx8mp-kontron: Use GPIO/IRQ defines in DL devicetree

Quoted 7 lines · Frieder Schrempf

From: Frieder Schrempf <[email protected]>

To make the code more readable, use the macros for the GPIO and IRQ settings.

Typically your Signed-off-by tag should come last so you need to swap S-o-b with R-b tags

in the commit message above.

With that you can add my:

reviewer
#6 lore raw

Re: [PATCH v2 4/4] arm64: dts: imx8mp-kontron: Use GPIO/IRQ defines in DL devicetree

Quoted 7 lines · Daniel Baluta
Quoted 5 lines · Frieder Schrempf

From: Frieder Schrempf <[email protected]>

To make the code more readable, use the macros for the GPIO and IRQ settings.

Quoted 7 lines
Quoted 2 lines

Typically your Signed-off-by tag should come last so you need to swap S-o-b with R-b tags

in the commit message above.

Is this suggestion valid?

Shouldn't the tags appear in chronological order?

#7 lore raw

Re: [PATCH v2 4/4] arm64: dts: imx8mp-kontron: Use GPIO/IRQ defines in DL devicetree

Quoted 10 lines · Fabio Estevam
Quoted 9 lines · Daniel Baluta
Quoted 7 lines · Frieder Schrempf

From: Frieder Schrempf <[email protected]>

To make the code more readable, use the macros for the GPIO and IRQ settings.

Quoted 6 lines
Quoted 3 lines

Typically your Signed-off-by tag should come last so you need to swap S-o-b with R-b tags

in the commit message above.

Is this suggestion valid?

Shouldn't the tags appear in chronological order?

Tools like b4 indeed are taking the tags in chronological order. But I always considered that when sending next version you pick all the tags

and then add your Signed-off-by last.

E.g https://www.spinics.net/lists/kernel/msg5995225.html

#8 lore raw

Re: [PATCH v2 4/4] arm64: dts: imx8mp-kontron: Use GPIO/IRQ defines in DL devicetree

Quoted 16 lines · Daniel Baluta
Quoted 15 lines · Fabio Estevam
Quoted 6 lines · Daniel Baluta
Quoted 5 lines · Frieder Schrempf

From: Frieder Schrempf <[email protected]>

To make the code more readable, use the macros for the GPIO and IRQ settings.

Quoted 6 lines
Quoted 2 lines

Typically your Signed-off-by tag should come last so you need to swap S-o-b with R-b tags

in the commit message above.

Is this suggestion valid?

Quoted 8 lines
Quoted 1 line

Shouldn't the tags appear in chronological order?

Tools like b4 indeed are taking the tags in chronological order. But I always considered that when sending next version you pick all the tags

and then add your Signed-off-by last.

E.g https://www.spinics.net/lists/kernel/msg5995225.html

I've always been adding the collected tags below my S-o-b tag. And I've never heard any complaints from the i.MX subsystem maintainers, so I assume it is ok like that and there is no need to change anything.

As far as I know most other subsystems also don't have strict rules for the tag order.

maintainer Applied
#9 lore raw
In reply to Frieder Schrempf
Quoted 10 lines · Frieder Schrempf

From: Frieder Schrempf <[email protected]>

This contains three fixes and one cosmetic change for the Kontron i.MX8MP OSM devices.

Changes for v2:
* Add Frank's R-b tags (thanks)
* Enhance commit message of patch 2

[...]

Applied, thanks!

[1/4] arm64: dts: imx8mp-kontron: Fix touch reset configuration on DL devices

      commit: ed35f6162eb43e5dc232b91e903e6a76ee5f5601
[2/4] arm64: dts: imx8mp-kontron: Drop vmmc-supply to fix SD card on SMARC eval carrier
      commit: 02ef82e09f96a0f5c996cdd4d62e66cb80df9f0f
[3/4] arm64: dts: imx8mp-kontron: Fix boot order for PMIC and RTC
      commit: 0ab1f5f3652424de16b464488c3d3db3d88b1bd5
[4/4] arm64: dts: imx8mp-kontron: Use GPIO/IRQ defines in DL devicetree
      commit: f7bbf27af999ed3f6568f0266e112eded96f225b

Best regards,

Signature · 1 line
Frank Li <[email protected]>
maintainer
#10 lore raw
Quoted 13 lines · Frank Li
Quoted 10 lines · Frieder Schrempf

From: Frieder Schrempf <[email protected]>

This contains three fixes and one cosmetic change for the Kontron i.MX8MP OSM devices.

Changes for v2:
* Add Frank's R-b tags (thanks)
* Enhance commit message of patch 2

[...]

Quoted 8 lines

Applied, thanks!

[1/4] arm64: dts: imx8mp-kontron: Fix touch reset configuration on DL devices

      commit: ed35f6162eb43e5dc232b91e903e6a76ee5f5601
[2/4] arm64: dts: imx8mp-kontron: Drop vmmc-supply to fix SD card on SMARC eval carrier
      commit: 02ef82e09f96a0f5c996cdd4d62e66cb80df9f0f
[3/4] arm64: dts: imx8mp-kontron: Fix boot order for PMIC and RTC
      commit: 0ab1f5f3652424de16b464488c3d3db3d88b1bd5

Sorry, I have to drop this one because it cause dtb_check warning. 'vdd-supply' is not allowed.

Although this small changes, please change binding firstly to allow vdd-supply, at lease binding change need get ACK from dt team firstly.

Please make sure not new warning.

Frank

Quoted 6 lines

[4/4] arm64: dts: imx8mp-kontron: Use GPIO/IRQ defines in DL devicetree

      commit: f7bbf27af999ed3f6568f0266e112eded96f225b

Best regards,
--
Frank Li <[email protected]>

#11 lore raw
Quoted 23 lines · Frank Li
Quoted 13 lines · Frank Li
Quoted 10 lines · Frieder Schrempf

From: Frieder Schrempf <[email protected]>

This contains three fixes and one cosmetic change for the Kontron i.MX8MP OSM devices.

Changes for v2:
* Add Frank's R-b tags (thanks)
* Enhance commit message of patch 2

[...]

Quoted 8 lines

Applied, thanks!

[1/4] arm64: dts: imx8mp-kontron: Fix touch reset configuration on DL devices

      commit: ed35f6162eb43e5dc232b91e903e6a76ee5f5601
[2/4] arm64: dts: imx8mp-kontron: Drop vmmc-supply to fix SD card on SMARC eval carrier
      commit: 02ef82e09f96a0f5c996cdd4d62e66cb80df9f0f
[3/4] arm64: dts: imx8mp-kontron: Fix boot order for PMIC and RTC
      commit: 0ab1f5f3652424de16b464488c3d3db3d88b1bd5
Quoted 7 lines

Sorry, I have to drop this one because it cause dtb_check warning. 'vdd-supply' is not allowed.

Although this small changes, please change binding firstly to allow vdd-supply, at lease binding change need get ACK from dt team firstly.

Please make sure not new warning.

Sorry, I forgot to check the bindings. I sent a v3 which includes a binding patch.