| Message ID | 20231002165857.19512-9-avromanov@salutedevices.com |
|---|---|
| State | Superseded |
| Delegated to: | Neil Armstrong |
| Headers | show |
| Series | Support USB for Meson A1 | expand |
Hi, On 02/10/2023 18:58, Alexey Romanov wrote: > This is entrypoint for USB stack initialization. Function > board_usb_init will be called from cmd/fastboot.c code. This should not be needed anymore, using DM_USB_GADGET should work, look how it was changed for G12A/SM1 and GXL/AXG: https://lore.kernel.org/all/20221024-meson-dm-usb-v1-0-2ab077a503b9@baylibre.com and https://lore.kernel.org/all/20230117-u-boot-usb-gxl-otg-dm-v1-0-2853f6d75b06@linaro.org Neil > > Signed-off-by: Alexey Romanov <avromanov@salutedevices.com> > --- > arch/arm/mach-meson/board-a1.c | 89 ++++++++++++++++++++++++++++++++++ > 1 file changed, 89 insertions(+) > > diff --git a/arch/arm/mach-meson/board-a1.c b/arch/arm/mach-meson/board-a1.c > index 967bb67182..781d5cfb33 100644 > --- a/arch/arm/mach-meson/board-a1.c > +++ b/arch/arm/mach-meson/board-a1.c > @@ -4,12 +4,17 @@ > */ > > #include <common.h> > +#include <dm.h> > +#include <usb.h> > #include <asm/arch/a1.h> > #include <asm/arch/boot.h> > #include <asm/armv8/mmu.h> > #include <asm/io.h> > #include <linux/compiler.h> > #include <linux/sizes.h> > +#include <linux/usb/otg.h> > +#include <asm/arch/usb.h> > +#include <usb/dwc2_udc.h> > > phys_size_t get_effective_memsize(void) > { > @@ -57,3 +62,87 @@ static struct mm_region a1_mem_map[] = { > }; > > struct mm_region *mem_map = a1_mem_map; > + > +#if CONFIG_IS_ENABLED(USB_DWC3_MESON_G12A) && \ > + CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) > + > +static struct dwc2_plat_otg_data meson_a1_dwc2_data; > + > +int board_usb_init(int index, enum usb_init_type init) > +{ > + int node, dwc2_node; > + const void *blob = gd->fdt_blob; > + struct udevice *dev; > + int ret; > + > + node = fdt_node_offset_by_compatible(blob, -1, > + "amlogic,meson-a1-usb-ctrl"); > + if (node < 0) { > + pr_err("not found usb-control node\n"); > + return -ENODEV; > + } > + > + if (!fdtdec_get_is_enabled(blob, node)) { > + pr_err("usb is disabled in the device tree\n"); > + return -ENODEV; > + } > + > + ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); > + if (ret) { > + pr_err("not found usb-control device\n"); > + return ret; > + } > + > + dwc2_node = fdt_node_offset_by_compatible(blob, node, > + "amlogic,meson-a1-usb"); > + if (dwc2_node < 0) { > + pr_err("not found dwc2 node\n"); > + return -ENODEV; > + } > + > + if (!fdtdec_get_is_enabled(blob, dwc2_node)) { > + pr_err("dwc2 is disabled in the device tree\n"); > + return -ENODEV; > + } > + > + meson_a1_dwc2_data.regs_otg = fdtdec_get_addr(blob, dwc2_node, "reg"); > + if (meson_a1_dwc2_data.regs_otg == FDT_ADDR_T_NONE) { > + pr_err("can't get base address\n"); > + return -ENODATA; > + } > + > + meson_a1_dwc2_data.rx_fifo_sz = fdtdec_get_int(blob, dwc2_node, > + "g-rx-fifo-size", 0); > + if (meson_a1_dwc2_data.rx_fifo_sz < 0) { > + pr_err("failed to get g-rx-fifo-size value\n"); > + return -ENODATA; > + } > + > + meson_a1_dwc2_data.np_tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, > + "g-np-tx-fifo-size", 0); > + if (meson_a1_dwc2_data.np_tx_fifo_sz < 0) { > + pr_err("failed to get g-np-tx-fifo-size value\n"); > + return -ENODATA; > + } > + > + meson_a1_dwc2_data.tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, > + "g-tx-fifo-size", 0); > + if (meson_a1_dwc2_data.tx_fifo_sz < 0) { > + pr_err("failed to get g-tx-fifo-size value\n"); > + return -ENODATA; > + } > + > + ret = dwc3_meson_g12a_force_mode(dev, USB_DR_MODE_PERIPHERAL); > + if (ret) { > + pr_err("failed to force usb mode to peripheral\n"); > + return ret; > + } > + > + return dwc2_udc_probe(&meson_a1_dwc2_data); > +} > + > +int board_usb_cleanup(int index, enum usb_init_type init) > +{ > + return 0; > +} > +#endif
diff --git a/arch/arm/mach-meson/board-a1.c b/arch/arm/mach-meson/board-a1.c index 967bb67182..781d5cfb33 100644 --- a/arch/arm/mach-meson/board-a1.c +++ b/arch/arm/mach-meson/board-a1.c @@ -4,12 +4,17 @@ */ #include <common.h> +#include <dm.h> +#include <usb.h> #include <asm/arch/a1.h> #include <asm/arch/boot.h> #include <asm/armv8/mmu.h> #include <asm/io.h> #include <linux/compiler.h> #include <linux/sizes.h> +#include <linux/usb/otg.h> +#include <asm/arch/usb.h> +#include <usb/dwc2_udc.h> phys_size_t get_effective_memsize(void) { @@ -57,3 +62,87 @@ static struct mm_region a1_mem_map[] = { }; struct mm_region *mem_map = a1_mem_map; + +#if CONFIG_IS_ENABLED(USB_DWC3_MESON_G12A) && \ + CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) + +static struct dwc2_plat_otg_data meson_a1_dwc2_data; + +int board_usb_init(int index, enum usb_init_type init) +{ + int node, dwc2_node; + const void *blob = gd->fdt_blob; + struct udevice *dev; + int ret; + + node = fdt_node_offset_by_compatible(blob, -1, + "amlogic,meson-a1-usb-ctrl"); + if (node < 0) { + pr_err("not found usb-control node\n"); + return -ENODEV; + } + + if (!fdtdec_get_is_enabled(blob, node)) { + pr_err("usb is disabled in the device tree\n"); + return -ENODEV; + } + + ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); + if (ret) { + pr_err("not found usb-control device\n"); + return ret; + } + + dwc2_node = fdt_node_offset_by_compatible(blob, node, + "amlogic,meson-a1-usb"); + if (dwc2_node < 0) { + pr_err("not found dwc2 node\n"); + return -ENODEV; + } + + if (!fdtdec_get_is_enabled(blob, dwc2_node)) { + pr_err("dwc2 is disabled in the device tree\n"); + return -ENODEV; + } + + meson_a1_dwc2_data.regs_otg = fdtdec_get_addr(blob, dwc2_node, "reg"); + if (meson_a1_dwc2_data.regs_otg == FDT_ADDR_T_NONE) { + pr_err("can't get base address\n"); + return -ENODATA; + } + + meson_a1_dwc2_data.rx_fifo_sz = fdtdec_get_int(blob, dwc2_node, + "g-rx-fifo-size", 0); + if (meson_a1_dwc2_data.rx_fifo_sz < 0) { + pr_err("failed to get g-rx-fifo-size value\n"); + return -ENODATA; + } + + meson_a1_dwc2_data.np_tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, + "g-np-tx-fifo-size", 0); + if (meson_a1_dwc2_data.np_tx_fifo_sz < 0) { + pr_err("failed to get g-np-tx-fifo-size value\n"); + return -ENODATA; + } + + meson_a1_dwc2_data.tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, + "g-tx-fifo-size", 0); + if (meson_a1_dwc2_data.tx_fifo_sz < 0) { + pr_err("failed to get g-tx-fifo-size value\n"); + return -ENODATA; + } + + ret = dwc3_meson_g12a_force_mode(dev, USB_DR_MODE_PERIPHERAL); + if (ret) { + pr_err("failed to force usb mode to peripheral\n"); + return ret; + } + + return dwc2_udc_probe(&meson_a1_dwc2_data); +} + +int board_usb_cleanup(int index, enum usb_init_type init) +{ + return 0; +} +#endif
This is entrypoint for USB stack initialization. Function board_usb_init will be called from cmd/fastboot.c code. Signed-off-by: Alexey Romanov <avromanov@salutedevices.com> --- arch/arm/mach-meson/board-a1.c | 89 ++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+)