Skip to contentSkip to conversation

ARM: imx: Enable PCA953x driver on DH i.MX8MP DHCOM PDK2

PATCH Applied Marek Vasut 2 participants 3 messages Jun 27, 2024 – Jul 6, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: imx: Enable PCA953x driver on DH i.MX8MP DHCOM PDK2

Enable PCA953x GPIO expander driver in DH i.MX8MP DHCOM PDK2 configuration. The PCA9539 GPIO expander is used on production DH i.MX8MP DHCOM SoM rev.200. This is already enabled in DH i.MX8MP DHCOM PDK3 configuration so align the two configurations.

Fixes 9de599ec3d59 ("arm64: dts: imx8mp: Update i.MX8MP DHCOM SoM DT to production rev.200")

---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: [email protected]
Cc: [email protected]

---
 configs/imx8mp_dhcom_pdk2_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/imx8mp_dhcom_pdk2_defconfig +1 -0
index cbc608dd912..79b3e96c8e3 100644
@@ -182,6 +182,7 @@ CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_GPIO_HOG=y
 CONFIG_SPL_GPIO_HOG=y
 CONFIG_MXC_GPIO=y
+CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
 # CONFIG_INPUT is not set
 CONFIG_LED=y
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/2 ARM: imx: Update Fast ethernet PHY MDIO addresses to match DH i.MX8MP DHCOM rev.200

The production DH i.MX8MP DHCOM SoM rev.200 uses updated PHY MDIO addresses for the Fast ethernet PHYs. Update the base SoM DT and SoM rev.100 backward compatibility DTO to cater for this change.

Since the MDIO address adjustment is now also in the rev.100 SoM DTO, not only in the rev.100 PDK3 DTO, update Makefile accordingly as well, else the DTC would complain about the DTO overriding the 'reg' property without also updating the node unit-address, which is not doable without duplicating the entire PHY node in the DTO, which leads to large amount of duplication with no gain.

Fixes 9de599ec3d59 ("arm64: dts: imx8mp: Update i.MX8MP DHCOM SoM DT to production rev.200")

---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: [email protected]
Cc: [email protected]

---
 arch/arm/dts/Makefile                            | 1 +
 arch/arm/dts/imx8mp-dhcom-som-overlay-rev100.dts | 5 +++++
 arch/arm/dts/imx8mp-dhcom-som.dtsi               | 8 ++++----
 3 files changed, 10 insertions(+), 4 deletions(-)
arch/arm/dts/Makefile +1 -0
index 06c234afbeb..e49e9aa3e15 100644
@@ -1291,6 +1291,7 @@ targets += $(dtb-y)
 # Add any required device tree compiler flags here
 DTC_FLAGS += -a 0x8
 
+DTC_FLAGS_imx8mp-dhcom-som-overlay-rev100 += -Wno-avoid_default_addr_size -Wno-reg_format
 DTC_FLAGS_imx8mp-dhcom-pdk3-overlay-rev100 += -Wno-avoid_default_addr_size -Wno-reg_format
 
 PHONY += dtbs
arch/arm/dts/imx8mp-dhcom-som-overlay-rev100.dts +5 -0
index 0e5d329b149..b2154d57e48 100644
@@ -35,6 +35,7 @@
 &ethphy0f { /* SMSC LAN8740Ai */
 	pinctrl-0 = <&pinctrl_ethphy0 &pinctrl_ioexp>;
 	reset-gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;
+	reg = <0>;
 };
 
 &ethphy0g { /* Micrel KSZ9131RNXI */
@@ -42,6 +43,10 @@
 	reset-gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;
 };
 
+&ethphy1f { /* SMSC LAN8740Ai */
+	reg = <1>;
+};
+
 &i2c3 {
 	adc@48 {
 		compatible = "ti,tla2024";
arch/arm/dts/imx8mp-dhcom-som.dtsi +4 -4
index b504d36818b..f2d99d05854 100644
@@ -100,14 +100,14 @@
 		#size-cells = <0>;
 
 		/* Up to one of these two PHYs may be populated. */
-		ethphy0f: ethernet-phy@0 { /* SMSC LAN8740Ai */
+		ethphy0f: ethernet-phy@1 { /* SMSC LAN8740Ai */
 			compatible = "ethernet-phy-id0007.c110",
 				     "ethernet-phy-ieee802.3-c22";
 			interrupt-parent = <&gpio3>;
 			interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
 			pinctrl-0 = <&pinctrl_ethphy0>;
 			pinctrl-names = "default";
-			reg = <0>;
+			reg = <1>;
 			reset-assert-us = <1000>;
 			reset-deassert-us = <1000>;
 			reset-gpios = <&ioexp 4 GPIO_ACTIVE_LOW>;
@@ -146,14 +146,14 @@
 		#size-cells = <0>;
 
 		/* Up to one PHY may be populated. */
-		ethphy1f: ethernet-phy@1 { /* SMSC LAN8740Ai */
+		ethphy1f: ethernet-phy@2 { /* SMSC LAN8740Ai */
 			compatible = "ethernet-phy-id0007.c110",
 				     "ethernet-phy-ieee802.3-c22";
 			interrupt-parent = <&gpio4>;
 			interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
 			pinctrl-0 = <&pinctrl_ethphy1>;
 			pinctrl-names = "default";
-			reg = <1>;
+			reg = <2>;
 			reset-assert-us = <1000>;
 			reset-deassert-us = <1000>;
 			reset-gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;
Signature · 1 line
2.43.0
reviewer Applied
#2 lore raw
In reply to Marek Vasut
Quoted 8 lines · Marek Vasut

Enable PCA953x GPIO expander driver in DH i.MX8MP DHCOM PDK2 configuration. The PCA9539 GPIO expander is used on production DH i.MX8MP DHCOM SoM rev.200. This is already enabled in DH i.MX8MP DHCOM PDK3 configuration so align the two configurations.

Fixes 9de599ec3d59 ("arm64: dts: imx8mp: Update i.MX8MP DHCOM SoM DT to production rev.200")

Applied both, thanks.