]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
ARM: stm32: Fix livetree conversion on STM32MP15xx DHSOM
authorMarek Vasut <marex@denx.de>
Thu, 6 Jun 2024 13:02:46 +0000 (15:02 +0200)
committerPatrice Chotard <patrice.chotard@foss.st.com>
Fri, 14 Jun 2024 11:25:06 +0000 (13:25 +0200)
Unlike fdt_node_check_compatible() which returns 0 if node is compatible,
ofnode_device_is_compatible() return true which is non-zero if node is
compatible. The intention of the code is to exit from the function in
case the node is not compatible with "micrel,ks8851-mll". Add the missing
invert into the conditional to reinstate original behavior.

This exposes a follow up problem caused by conversion to DM based FMC2 EBI
driver, where the FMC2 EBI is not configured when accessed by this code.
Probe the KS8851 MAC, which also configures the FMC2 EBI as a dependency,
so that the KS8851 MAC CCR register can be accessed over the FMC2 EBI bus
and checked for EEPROM present bit.

Fixes: 5a605b7c8615 ("board: dhelectronics: stm32mp1: convert to livetree")
Signed-off-by: Marek Vasut <marex@denx.de>
Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com>
board/dhelectronics/dh_stm32mp1/board.c

index 22af423536d5a016ca5642d099ff2eaef9c57208..acfdf2e87c07c57607e9b6046e29d1d9549e8b9d 100644 (file)
 
 static bool dh_stm32_mac_is_in_ks8851(void)
 {
-       ofnode node;
+       struct udevice *udev;
        u32 reg, cider, ccr;
+       char path[256];
+       ofnode node;
+       int ret;
 
        node = ofnode_path("ethernet1");
        if (!ofnode_valid(node))
                return false;
 
-       if (ofnode_device_is_compatible(node, "micrel,ks8851-mll"))
+       ret = ofnode_get_path(node, path, sizeof(path));
+       if (ret)
+               return false;
+
+       ret = uclass_get_device_by_of_path(UCLASS_ETH, path, &udev);
+       if (ret)
+               return false;
+
+       if (!ofnode_device_is_compatible(node, "micrel,ks8851-mll"))
                return false;
 
        /*