arm: socfpga: de0_nano: 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 <[email protected]>
Cc: Chin Liang See <[email protected]>
Cc: Dinh Nguyen <[email protected]>
Cc: Lukasz Majewski <[email protected]>
Cc: Lukasz Majewski <[email protected]>

diff --git a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
index b649c9ac08943a30653ea55c02761c664d7ed102..dc09bed9019a0b03fc43f60743474fcd9447bb29 100644 (file)
--- a/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
+++ b/arch/arm/dts/socfpga_cyclone5_de0_nano_soc.dts
@@ -16,6 +16,7 @@
 
        aliases {
                ethernet0 = &gmac1;
+               udc0 = &usb1;
        };
 
        memory {
@@ -59,3 +60,7 @@
        status = "okay";
        u-boot,dm-pre-reloc;
 };
+
+&usb1 {
+       status = "okay";
+};

diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
index a4f75e6f01e74f7b904dd993899af0235ef6b724..65c119717bc1fb568f6f2f8054c12c3f9227e831 100644 (file)
--- a/configs/socfpga_de0_nano_soc_defconfig
+++ b/configs/socfpga_de0_nano_soc_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_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index 870192d31b1e82fadede5569f604203b14ebcd86..d27aa9b2c11473bb7eb7b90c1b66295028850b6c 100644 (file)
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -56,9 +56,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      "Terasic"
 
 /* Extra Environment */