arm: socfpga: sockit: Probe DWC2 UDC from OF instead of hard-coded data

[oweals/u-boot.git] / board / terasic / sockit / socfpga.c

diff --git a/board/terasic/sockit/socfpga.c b/board/terasic/sockit/socfpga.c
index ccb1b4b063e39e1f6633c74ebff20f6a0b282a38..1fe8c1cbf99c2c4673589afb0c5485a2ba941f62 100644 (file)
--- a/board/terasic/sockit/socfpga.c
+++ b/board/terasic/sockit/socfpga.c
@@ -5,12 +5,12 @@
  */
 
 #include <common.h>
+#include <errno.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/io.h>
 
 #include <usb.h>
 #include <usb/dwc2_udc.h>
-#include <usb_mass_storage.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -29,12 +29,29 @@ int board_init(void)
 
 #ifdef CONFIG_USB_GADGET
 struct dwc2_plat_otg_data socfpga_otg_data = {
-       .regs_otg       = CONFIG_USB_DWC2_REG_ADDR,
        .usb_gusbcfg    = 0x1417,
 };
 
 int board_usb_init(int index, enum usb_init_type init)
 {
+       int node[2], count;
+       fdt_addr_t addr;
+
+       count = fdtdec_find_aliases_for_id(gd->fdt_blob, "udc",
+                                          COMPAT_ALTERA_SOCFPGA_DWC2USB,
+                                          node, 2);
+       if (count <= 0) /* No controller found. */
+               return -EINVAL;
+
+       addr = fdtdec_get_addr(gd->fdt_blob, node[0], "reg");
+       if (addr == FDT_ADDR_T_NONE) {
+               printf("UDC Controller has no 'reg' property!\n");
+               return -EINVAL;
+       }
+
+       /* Patch the address from OF into the controller pdata. */
+       socfpga_otg_data.regs_otg = addr;
+
        return dwc2_udc_probe(&socfpga_otg_data);
 }