arm: socfpga: cyclone5-socdk: 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>
This commit is contained in:
parent
70311e69fa
commit
c90ada94fb
@ -25,6 +25,7 @@
|
|||||||
* to be added to the gmac1 device tree blob.
|
* to be added to the gmac1 device tree blob.
|
||||||
*/
|
*/
|
||||||
ethernet0 = &gmac1;
|
ethernet0 = &gmac1;
|
||||||
|
udc0 = &usb1;
|
||||||
};
|
};
|
||||||
|
|
||||||
regulator_3_3v: 3-3-v-regulator {
|
regulator_3_3v: 3-3-v-regulator {
|
||||||
@ -77,10 +78,6 @@
|
|||||||
vqmmc-supply = <®ulator_3_3v>;
|
vqmmc-supply = <®ulator_3_3v>;
|
||||||
};
|
};
|
||||||
|
|
||||||
&usb1 {
|
|
||||||
status = "okay";
|
|
||||||
};
|
|
||||||
|
|
||||||
&qspi {
|
&qspi {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
@ -100,3 +97,7 @@
|
|||||||
tslch-ns = <4>;
|
tslch-ns = <4>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&usb1 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
@ -5,12 +5,12 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <asm/arch/reset_manager.h>
|
#include <asm/arch/reset_manager.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
|
|
||||||
#include <usb.h>
|
#include <usb.h>
|
||||||
#include <usb/dwc2_udc.h>
|
#include <usb/dwc2_udc.h>
|
||||||
#include <usb_mass_storage.h>
|
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
@ -29,12 +29,29 @@ int board_init(void)
|
|||||||
|
|
||||||
#ifdef CONFIG_USB_GADGET
|
#ifdef CONFIG_USB_GADGET
|
||||||
struct dwc2_plat_otg_data socfpga_otg_data = {
|
struct dwc2_plat_otg_data socfpga_otg_data = {
|
||||||
.regs_otg = CONFIG_USB_DWC2_REG_ADDR,
|
|
||||||
.usb_gusbcfg = 0x1417,
|
.usb_gusbcfg = 0x1417,
|
||||||
};
|
};
|
||||||
|
|
||||||
int board_usb_init(int index, enum usb_init_type init)
|
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);
|
return dwc2_udc_probe(&socfpga_otg_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -21,3 +21,5 @@ CONFIG_SYS_NS16550=y
|
|||||||
CONFIG_CADENCE_QSPI=y
|
CONFIG_CADENCE_QSPI=y
|
||||||
CONFIG_DESIGNWARE_SPI=y
|
CONFIG_DESIGNWARE_SPI=y
|
||||||
CONFIG_DM_MMC=y
|
CONFIG_DM_MMC=y
|
||||||
|
CONFIG_USB=y
|
||||||
|
CONFIG_DM_USB=y
|
||||||
|
@ -56,9 +56,6 @@
|
|||||||
#define CONFIG_ENV_OFFSET 512 /* just after the MBR */
|
#define CONFIG_ENV_OFFSET 512 /* just after the MBR */
|
||||||
|
|
||||||
/* USB */
|
/* USB */
|
||||||
#ifdef CONFIG_CMD_USB
|
|
||||||
#define CONFIG_USB_DWC2_REG_ADDR SOCFPGA_USB1_ADDRESS
|
|
||||||
#endif
|
|
||||||
#define CONFIG_G_DNL_MANUFACTURER "Altera"
|
#define CONFIG_G_DNL_MANUFACTURER "Altera"
|
||||||
|
|
||||||
/* Extra Environment */
|
/* Extra Environment */
|
||||||
|
Loading…
Reference in New Issue
Block a user