summaryrefslogtreecommitdiff
path: root/board/terasic
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-12-05 19:24:22 +0100
committerMarek Vasut <marex@denx.de>2015-12-20 03:36:51 +0100
commit225217da2804d1c61725e2974262bd2f27882cd7 (patch)
tree5e74634ae81713d9158206e50a37a5cfc6dd3ee9 /board/terasic
parent9368aa6a680f150755a233be9f97956bba5a915e (diff)
downloadu-boot-225217da2804d1c61725e2974262bd2f27882cd7.tar.gz
arm: socfpga: sockit: 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>
Diffstat (limited to 'board/terasic')
-rw-r--r--board/terasic/sockit/socfpga.c21
1 files changed, 19 insertions, 2 deletions
diff --git a/board/terasic/sockit/socfpga.c b/board/terasic/sockit/socfpga.c
index ccb1b4b063..1fe8c1cbf9 100644
--- 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);
}