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

This patch adds the necessary OF alias for the UDC node, which let's
the code locate the DWC2 UDC base address in OF instead of hard-coding
it into the U-Boot binary. The code is adjusted to use the address from
OF instead of the hard-coded one. Finally, the hard-coded address is
removed and USB DM support is enabled.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Lukasz Majewski <l.majewski@majess.pl>
Cc: Lukasz Majewski <l.majewski@samsung.com>

diff --git a/arch/arm/dts/socfpga_cyclone5_mcvevk.dts b/arch/arm/dts/socfpga_cyclone5_mcvevk.dts
index e1e3d738bc40de41074ca7c29cbbf828bf85fa93..7d3f9894723969a16e2b04a26107f16546fd3fcc 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_mcvevk.dts
+++ b/arch/arm/dts/socfpga_cyclone5_mcvevk.dts
@@ -16,6 +16,7 @@
 
        aliases {
                ethernet0 = &gmac0;
+               udc0 = &usb1;
        };
 
        memory {
@@ -51,3 +52,7 @@
        bus-width = <8>;
        u-boot,dm-pre-reloc;
 };
+
+&usb1 {
+       status = "okay";
+};

diff --git a/board/denx/mcvevk/socfpga.c b/board/denx/mcvevk/socfpga.c
index 0f93722dfbd2ed436208986ea7b3e2cc094d16ef..d77d7ad4f7fc983de4bc2756f95044961dbfc82f 100644 (file)
--- a/board/denx/mcvevk/socfpga.c
+++ b/board/denx/mcvevk/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 0;
+
+       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);
 }
 

diff --git a/configs/socfpga_mcvevk_defconfig b/configs/socfpga_mcvevk_defconfig
index 382db6561b4f4cc2a0543b24be5ab6faa68ff5f8..c98d4a14bca26b68774a5fa130d21f36c61e3f17 100644 (file)
--- a/configs/socfpga_mcvevk_defconfig
+++ b/configs/socfpga_mcvevk_defconfig
@@ -19,3 +19,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_CADENCE_QSPI=y
 CONFIG_DESIGNWARE_SPI=y
 CONFIG_DM_MMC=y
+CONFIG_USB=y
+CONFIG_DM_USB=y

diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index d051eeca6644e3af8fa05db9e9b8976381be73c6..b2c1f75e99c33f054f3655fd6398d8cd3315dc72 100644 (file)
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -49,9 +49,6 @@
 #define CONFIG_ENV_OFFSET              512     /* just after the MBR */
 
 /* USB */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_DWC2_REG_ADDR       SOCFPGA_USB1_ADDRESS
-#endif
 #define CONFIG_G_DNL_MANUFACTURER      "DENX"
 
 /* Extra Environment */