From b96640cbfb319071aea7915cfa2f7aefe08bbc08 Mon Sep 17 00:00:00 2001 From: Mattijs Korpershoek Date: Wed, 23 Nov 2022 16:42:50 +0100 Subject: ARM: meson: g12a: switch dwc2 otg to DM With CONFIG_DM_USB_GADGET=y, we no longer need any board_usb_*() logic because: * the dwc2 driver is DM compatible, and handles its own clock enabling * the dwc3-meson-g12a glue drivers handles "force mode switching" Remove all mach-meson/g12a usb code and enable CONFIG_DM_USB_GADGET. Note: Only configs having both CONFIG_USB_DWC3_MESON_G12A=y *and* USB_GADGET_DWC2_OTG=y have been updated. Signed-off-by: Mattijs Korpershoek Link: https://lore.kernel.org/r/20221024-meson-dm-usb-v1-2-2ab077a503b9@baylibre.com Signed-off-by: Neil Armstrong --- configs/bananapi-m5_defconfig | 1 + configs/beelink-gsking-x_defconfig | 1 + configs/beelink-gtking_defconfig | 1 + configs/beelink-gtkingpro_defconfig | 1 + configs/khadas-vim3_android_ab_defconfig | 1 + configs/khadas-vim3_android_defconfig | 1 + configs/khadas-vim3_defconfig | 1 + configs/khadas-vim3l_android_ab_defconfig | 1 + configs/khadas-vim3l_android_defconfig | 1 + configs/khadas-vim3l_defconfig | 1 + configs/odroid-c4_defconfig | 1 + configs/odroid-hc4_defconfig | 1 + configs/odroid-n2_defconfig | 1 + configs/radxa-zero_defconfig | 1 + configs/sei510_defconfig | 1 + configs/sei610_defconfig | 1 + configs/u200_defconfig | 1 + 17 files changed, 17 insertions(+) (limited to 'configs') diff --git a/configs/bananapi-m5_defconfig b/configs/bananapi-m5_defconfig index 0eb4fa7cee..cb6eca770b 100644 --- a/configs/bananapi-m5_defconfig +++ b/configs/bananapi-m5_defconfig @@ -49,6 +49,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/beelink-gsking-x_defconfig b/configs/beelink-gsking-x_defconfig index ae018bb91e..3e06002c5c 100644 --- a/configs/beelink-gsking-x_defconfig +++ b/configs/beelink-gsking-x_defconfig @@ -50,6 +50,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/beelink-gtking_defconfig b/configs/beelink-gtking_defconfig index d5b071d0cc..091858bc38 100644 --- a/configs/beelink-gtking_defconfig +++ b/configs/beelink-gtking_defconfig @@ -50,6 +50,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/beelink-gtkingpro_defconfig b/configs/beelink-gtkingpro_defconfig index b179f7b3b3..965639ee73 100644 --- a/configs/beelink-gtkingpro_defconfig +++ b/configs/beelink-gtkingpro_defconfig @@ -50,6 +50,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3_android_ab_defconfig b/configs/khadas-vim3_android_ab_defconfig index 01a91573e3..f212b862aa 100644 --- a/configs/khadas-vim3_android_ab_defconfig +++ b/configs/khadas-vim3_android_ab_defconfig @@ -84,6 +84,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3_android_defconfig b/configs/khadas-vim3_android_defconfig index 7a2815d29f..3ac915ef17 100644 --- a/configs/khadas-vim3_android_defconfig +++ b/configs/khadas-vim3_android_defconfig @@ -82,6 +82,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3_defconfig b/configs/khadas-vim3_defconfig index 792ee71f58..26a1485517 100644 --- a/configs/khadas-vim3_defconfig +++ b/configs/khadas-vim3_defconfig @@ -70,6 +70,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3l_android_ab_defconfig b/configs/khadas-vim3l_android_ab_defconfig index e182a3ea26..c3eb25abd9 100644 --- a/configs/khadas-vim3l_android_ab_defconfig +++ b/configs/khadas-vim3l_android_ab_defconfig @@ -84,6 +84,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3l_android_defconfig b/configs/khadas-vim3l_android_defconfig index bf3e2df83e..5e298272e5 100644 --- a/configs/khadas-vim3l_android_defconfig +++ b/configs/khadas-vim3l_android_defconfig @@ -82,6 +82,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim3l_defconfig b/configs/khadas-vim3l_defconfig index a99d4cacc5..a3fd6a13de 100644 --- a/configs/khadas-vim3l_defconfig +++ b/configs/khadas-vim3l_defconfig @@ -70,6 +70,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/odroid-c4_defconfig b/configs/odroid-c4_defconfig index af37b4dbc8..2c449a1f42 100644 --- a/configs/odroid-c4_defconfig +++ b/configs/odroid-c4_defconfig @@ -50,6 +50,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/odroid-hc4_defconfig b/configs/odroid-hc4_defconfig index 1af9c11395..2893802f22 100644 --- a/configs/odroid-hc4_defconfig +++ b/configs/odroid-hc4_defconfig @@ -68,6 +68,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MESON_SPIFC=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig index fcd9962312..190645da25 100644 --- a/configs/odroid-n2_defconfig +++ b/configs/odroid-n2_defconfig @@ -50,6 +50,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/radxa-zero_defconfig b/configs/radxa-zero_defconfig index 19bd9f3e35..0c6d3751c5 100644 --- a/configs/radxa-zero_defconfig +++ b/configs/radxa-zero_defconfig @@ -45,6 +45,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/sei510_defconfig b/configs/sei510_defconfig index 30b49ccad4..96e114a3be 100644 --- a/configs/sei510_defconfig +++ b/configs/sei510_defconfig @@ -70,6 +70,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/sei610_defconfig b/configs/sei610_defconfig index a922765ede..bba46a87ac 100644 --- a/configs/sei610_defconfig +++ b/configs/sei610_defconfig @@ -70,6 +70,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/u200_defconfig b/configs/u200_defconfig index f346b381e2..1d19c06fa5 100644 --- a/configs/u200_defconfig +++ b/configs/u200_defconfig @@ -44,6 +44,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y -- cgit v1.2.3 From e327e2affd302b7fd15b655624fdacb2f0492eab Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Tue, 17 Jan 2023 10:11:46 +0100 Subject: ARM: meson: switch AXG & GX dwc2 otg to DM With CONFIG_DM_USB_GADGET=y, we no longer need any board_usb_*() logic because: * the dwc2 driver is DM compatible, and handles its own clock enabling * the dwc3-meson-gxl glue drivers handles "force mode switching" Remove all mach-meson gx & axg usb code and enable CONFIG_DM_USB_GADGET. Note: Only configs having both CONFIG_USB_DWC3_MESON_GXL=y *and* USB_GADGET_DWC2_OTG=y have been updated. Thanks for the original work from Mattijs at [1] [1] https://lore.kernel.org/all/20221024-meson-dm-usb-v1-2-2ab077a503b9@baylibre.com/ Reviewed-by: Mattijs Korpershoek Link: https://lore.kernel.org/r/20230117-u-boot-usb-gxl-otg-dm-v1-2-2853f6d75b06@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/mach-meson/board-axg.c | 129 --------------------------------- arch/arm/mach-meson/board-gx.c | 137 ----------------------------------- configs/jethub_j100_defconfig | 1 + configs/jethub_j80_defconfig | 1 + configs/khadas-vim2_defconfig | 1 + configs/khadas-vim_defconfig | 1 + configs/libretech-ac_defconfig | 1 + configs/libretech-cc_defconfig | 1 + configs/libretech-s905d-pc_defconfig | 1 + configs/libretech-s912-pc_defconfig | 1 + configs/s400_defconfig | 1 + configs/wetek-core2_defconfig | 1 + 12 files changed, 10 insertions(+), 266 deletions(-) (limited to 'configs') diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index 236ec81579..fdf18752cd 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -15,12 +15,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include DECLARE_GLOBAL_DATA_PTR; @@ -90,126 +84,3 @@ static struct mm_region axg_mem_map[] = { }; struct mm_region *mem_map = axg_mem_map; - -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) -static struct dwc2_plat_otg_data meson_gx_dwc2_data; - -int board_usb_init(int index, enum usb_init_type init) -{ - struct fdtdec_phandle_args args; - const void *blob = gd->fdt_blob; - int node, dwc2_node; - struct udevice *dev, *clk_dev; - struct clk clk; - int ret; - - /* find the usb glue node */ - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-axg-usb-ctrl"); - if (node < 0) { - debug("Not found usb-control node\n"); - return -ENODEV; - } - - if (!fdtdec_get_is_enabled(blob, node)) { - debug("usb is disabled in the device tree\n"); - return -ENODEV; - } - - ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); - if (ret) { - debug("Not found usb-control device\n"); - return ret; - } - - /* find the dwc2 node */ - dwc2_node = fdt_node_offset_by_compatible(blob, node, - "amlogic,meson-g12a-usb"); - if (dwc2_node < 0) { - debug("Not found dwc2 node\n"); - return -ENODEV; - } - - if (!fdtdec_get_is_enabled(blob, dwc2_node)) { - debug("dwc2 is disabled in the device tree\n"); - return -ENODEV; - } - - meson_gx_dwc2_data.regs_otg = fdtdec_get_addr(blob, dwc2_node, "reg"); - if (meson_gx_dwc2_data.regs_otg == FDT_ADDR_T_NONE) { - debug("usbotg: can't get base address\n"); - return -ENODATA; - } - - /* Enable clock */ - ret = fdtdec_parse_phandle_with_args(blob, dwc2_node, "clocks", - "#clock-cells", 0, 0, &args); - if (ret) { - debug("usbotg has no clocks defined in the device tree\n"); - return ret; - } - - ret = uclass_get_device_by_of_offset(UCLASS_CLK, args.node, &clk_dev); - if (ret) - return ret; - - if (args.args_count != 1) { - debug("Can't find clock ID in the device tree\n"); - return -ENODATA; - } - - clk.dev = clk_dev; - clk.id = args.args[0]; - - ret = clk_enable(&clk); - if (ret) { - debug("Failed to enable usbotg clock\n"); - return ret; - } - - meson_gx_dwc2_data.rx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-rx-fifo-size", 0); - meson_gx_dwc2_data.np_tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-np-tx-fifo-size", 0); - meson_gx_dwc2_data.tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-tx-fifo-size", 0); - - /* Switch to peripheral mode */ - ret = dwc3_meson_gxl_force_mode(dev, USB_DR_MODE_PERIPHERAL); - if (ret) - return ret; - - return dwc2_udc_probe(&meson_gx_dwc2_data); -} - -int board_usb_cleanup(int index, enum usb_init_type init) -{ - const void *blob = gd->fdt_blob; - struct udevice *dev; - int node; - int ret; - - /* find the usb glue node */ - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-axg-usb-ctrl"); - if (node < 0) { - debug("Not found usb-control node\n"); - return -ENODEV; - } - - if (!fdtdec_get_is_enabled(blob, node)) - return -ENODEV; - - ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); - if (ret) - return ret; - - /* Switch to OTG mode */ - ret = dwc3_meson_gxl_force_mode(dev, USB_DR_MODE_HOST); - if (ret) - return ret; - - return 0; -} -#endif diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index 01fafd81c4..f28f84d86f 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -16,12 +16,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include DECLARE_GLOBAL_DATA_PTR; @@ -108,134 +102,3 @@ static struct mm_region gx_mem_map[] = { }; struct mm_region *mem_map = gx_mem_map; - -#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) -static struct dwc2_plat_otg_data meson_gx_dwc2_data; - -int board_usb_init(int index, enum usb_init_type init) -{ - struct fdtdec_phandle_args args; - const void *blob = gd->fdt_blob; - int node, dwc2_node; - struct udevice *dev, *clk_dev; - struct clk clk; - int ret; - - /* find the usb glue node */ - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-gxl-usb-ctrl"); - if (node < 0) { - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-gxm-usb-ctrl"); - if (node < 0) { - debug("Not found usb-control node\n"); - return -ENODEV; - } - } - - if (!fdtdec_get_is_enabled(blob, node)) { - debug("usb is disabled in the device tree\n"); - return -ENODEV; - } - - ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); - if (ret) { - debug("Not found usb-control device\n"); - return ret; - } - - /* find the dwc2 node */ - dwc2_node = fdt_node_offset_by_compatible(blob, node, - "amlogic,meson-g12a-usb"); - if (dwc2_node < 0) { - debug("Not found dwc2 node\n"); - return -ENODEV; - } - - if (!fdtdec_get_is_enabled(blob, dwc2_node)) { - debug("dwc2 is disabled in the device tree\n"); - return -ENODEV; - } - - meson_gx_dwc2_data.regs_otg = fdtdec_get_addr(blob, dwc2_node, "reg"); - if (meson_gx_dwc2_data.regs_otg == FDT_ADDR_T_NONE) { - debug("usbotg: can't get base address\n"); - return -ENODATA; - } - - /* Enable clock */ - ret = fdtdec_parse_phandle_with_args(blob, dwc2_node, "clocks", - "#clock-cells", 0, 0, &args); - if (ret) { - debug("usbotg has no clocks defined in the device tree\n"); - return ret; - } - - ret = uclass_get_device_by_of_offset(UCLASS_CLK, args.node, &clk_dev); - if (ret) - return ret; - - if (args.args_count != 1) { - debug("Can't find clock ID in the device tree\n"); - return -ENODATA; - } - - clk.dev = clk_dev; - clk.id = args.args[0]; - - ret = clk_enable(&clk); - if (ret) { - debug("Failed to enable usbotg clock\n"); - return ret; - } - - meson_gx_dwc2_data.rx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-rx-fifo-size", 0); - meson_gx_dwc2_data.np_tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-np-tx-fifo-size", 0); - meson_gx_dwc2_data.tx_fifo_sz = fdtdec_get_int(blob, dwc2_node, - "g-tx-fifo-size", 0); - - /* Switch to peripheral mode */ - ret = dwc3_meson_gxl_force_mode(dev, USB_DR_MODE_PERIPHERAL); - if (ret) - return ret; - - return dwc2_udc_probe(&meson_gx_dwc2_data); -} - -int board_usb_cleanup(int index, enum usb_init_type init) -{ - const void *blob = gd->fdt_blob; - struct udevice *dev; - int node; - int ret; - - /* find the usb glue node */ - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-gxl-usb-ctrl"); - if (node < 0) { - node = fdt_node_offset_by_compatible(blob, -1, - "amlogic,meson-gxm-usb-ctrl"); - if (node < 0) { - debug("Not found usb-control node\n"); - return -ENODEV; - } - } - - if (!fdtdec_get_is_enabled(blob, node)) - return -ENODEV; - - ret = uclass_get_device_by_of_offset(UCLASS_SIMPLE_BUS, node, &dev); - if (ret) - return ret; - - /* Switch to OTG mode */ - ret = dwc3_meson_gxl_force_mode(dev, USB_DR_MODE_HOST); - if (ret) - return ret; - - return 0; -} -#endif diff --git a/configs/jethub_j100_defconfig b/configs/jethub_j100_defconfig index c2651580f8..dac775bd3b 100644 --- a/configs/jethub_j100_defconfig +++ b/configs/jethub_j100_defconfig @@ -55,6 +55,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC2=y diff --git a/configs/jethub_j80_defconfig b/configs/jethub_j80_defconfig index f3c47a001a..1d11a961b9 100644 --- a/configs/jethub_j80_defconfig +++ b/configs/jethub_j80_defconfig @@ -59,6 +59,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC2=y diff --git a/configs/khadas-vim2_defconfig b/configs/khadas-vim2_defconfig index a8d11a83c9..3af6b446ec 100644 --- a/configs/khadas-vim2_defconfig +++ b/configs/khadas-vim2_defconfig @@ -59,6 +59,7 @@ CONFIG_MESON_SPIFC=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/khadas-vim_defconfig b/configs/khadas-vim_defconfig index d1ed45ff88..6bb2200a6b 100644 --- a/configs/khadas-vim_defconfig +++ b/configs/khadas-vim_defconfig @@ -50,6 +50,7 @@ CONFIG_MESON_SERIAL=y CONFIG_SYSINFO=y CONFIG_SYSINFO_SMBIOS=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig index a333106692..2f44771a84 100644 --- a/configs/libretech-ac_defconfig +++ b/configs/libretech-ac_defconfig @@ -65,6 +65,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MESON_SPIFC=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/libretech-cc_defconfig b/configs/libretech-cc_defconfig index 60b40e6270..05311d8e08 100644 --- a/configs/libretech-cc_defconfig +++ b/configs/libretech-cc_defconfig @@ -49,6 +49,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/libretech-s905d-pc_defconfig b/configs/libretech-s905d-pc_defconfig index d3e600ec02..4e3aee7542 100644 --- a/configs/libretech-s905d-pc_defconfig +++ b/configs/libretech-s905d-pc_defconfig @@ -61,6 +61,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MESON_SPIFC=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/libretech-s912-pc_defconfig b/configs/libretech-s912-pc_defconfig index 8b4f052d08..c9ceb35ff6 100644 --- a/configs/libretech-s912-pc_defconfig +++ b/configs/libretech-s912-pc_defconfig @@ -60,6 +60,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MESON_SPIFC=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/s400_defconfig b/configs/s400_defconfig index 827bd548c7..91930d7f48 100644 --- a/configs/s400_defconfig +++ b/configs/s400_defconfig @@ -42,6 +42,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/wetek-core2_defconfig b/configs/wetek-core2_defconfig index 13940dd56f..b730700630 100644 --- a/configs/wetek-core2_defconfig +++ b/configs/wetek-core2_defconfig @@ -51,6 +51,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y -- cgit v1.2.3 From 640192d04f9c4003959c967d11b2f98c3756c451 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 19 Jan 2023 14:44:18 +0100 Subject: ARM: meson: add support for Odroid Go Ultra MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds initial support for the Hardkernel Odroid Go Ultra. The Odroid Go Ultra is a portable gaming device with the following characteristics: - Amlogic S922X SoC - RK817 & RK818 PMICs - 2GiB LPDDR4 - On board 16GiB eMMC - Micro SD Card slot - 5inch 854×480 MIPI-DSI TFT LCD - Earphone stereo jack, 0.5Watt 8Ω Mono speaker - Li-Polymer 3.7V/4000mAh Battery - USB-A 2.0 Host Connector - x16 GPIO Input Buttons - 2x ADC Analog Joysticks - USB-C Port for USB2 Device and Charging The following are not yet handled: - Battery RK818 Gauge and Charging - 5inch 854×480 MIPI-DSI TFT LCD Link: https://lore.kernel.org/r/20230119-u-boot-odroid-go-ultra-v1-2-f96bab9db396@linaro.org Signed-off-by: Neil Armstrong --- .../arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi | 16 +++++ configs/odroid-go-ultra_defconfig | 70 ++++++++++++++++++++++ doc/board/amlogic/index.rst | 4 +- doc/board/amlogic/odroid-go-ultra.rst | 34 +++++++++++ 4 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi create mode 100644 configs/odroid-go-ultra_defconfig create mode 100644 doc/board/amlogic/odroid-go-ultra.rst (limited to 'configs') diff --git a/arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi b/arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi new file mode 100644 index 0000000000..00852f5e54 --- /dev/null +++ b/arch/arm/dts/meson-g12b-odroid-go-ultra-u-boot.dtsi @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2023 Neil Armstrong + */ + +#include "meson-g12-common-u-boot.dtsi" + +/* RK817/818 BOOST regulator aren't supported yet, so remove phandles from PHY nodes */ + +&usb2_phy1 { + /delete-property/ phy-supply; +}; + +&usb3_pcie_phy { + /delete-property/ phy-supply; +}; diff --git a/configs/odroid-go-ultra_defconfig b/configs/odroid-go-ultra_defconfig new file mode 100644 index 0000000000..a4d349fba4 --- /dev/null +++ b/configs/odroid-go-ultra_defconfig @@ -0,0 +1,70 @@ +CONFIG_ARM=y +CONFIG_SYS_BOARD="w400" +CONFIG_ARCH_MESON=y +CONFIG_TEXT_BASE=0x01000000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_ENV_SIZE=0x2000 +CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-odroid-go-ultra" +CONFIG_MESON_G12A=y +CONFIG_DEBUG_UART_BASE=0xff803000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_IDENT_STRING=" odroid-go-ultra" +CONFIG_SYS_LOAD_ADDR=0x1000000 +CONFIG_DEBUG_UART=y +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 +CONFIG_REMAKE_ELF=y +CONFIG_OF_BOARD_SETUP=y +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_MISC_INIT_R=y +CONFIG_SYS_MAXARGS=32 +# CONFIG_CMD_BDI is not set +# CONFIG_CMD_IMI is not set +CONFIG_CMD_GPIO=y +# CONFIG_CMD_LOADS is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_REGULATOR=y +CONFIG_OF_CONTROL=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ADC=y +CONFIG_SARADC_MESON=y +CONFIG_BUTTON=y +CONFIG_BUTTON_ADC=y +CONFIG_BUTTON_GPIO=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_MESON=y +CONFIG_MMC_MESON_GX=y +CONFIG_MESON_G12A_USB_PHY=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_MESON_G12A=y +CONFIG_POWER_DOMAIN=y +CONFIG_MESON_EE_POWER_DOMAIN=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_RK8XX=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_RESET=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_DEBUG_UART_SKIP_INIT=y +CONFIG_MESON_SERIAL=y +CONFIG_SYSINFO=y +CONFIG_SYSINFO_SMBIOS=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_DWC3=y +# CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_MESON_G12A=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e +CONFIG_USB_GADGET_PRODUCT_NUM=0xfada +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst index 4d407f9362..11443d9f2c 100644 --- a/doc/board/amlogic/index.rst +++ b/doc/board/amlogic/index.rst @@ -19,7 +19,8 @@ This matrix concerns the actual source code version. | | Nanopi-K2 | Khadas-VIM | Libretech-PC | JetHub J100 | SEI510 | Khadas-VIM3 | Khadas-VIM3L | | | P200 | LibreTech-CC v1 | WeTek Core2 | | Radxa Zero | GT-King/Pro | Odroid-C4 | | | P201 | LibreTech-AC v2 | | | | GSKing-X | Odroid-HC4 | -| | | JetHub J80 | | | | | BananaPi-M5 | +| | | JetHub J80 | | | | Odroid-Go- | BananaPi-M5 | +| | | | | | | Ultra | | +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ @@ -105,6 +106,7 @@ Board Documentation odroid-c2 odroid-c4 odroid-n2 + odroid-go-ultra p200 p201 p212 diff --git a/doc/board/amlogic/odroid-go-ultra.rst b/doc/board/amlogic/odroid-go-ultra.rst new file mode 100644 index 0000000000..8df9e0cb79 --- /dev/null +++ b/doc/board/amlogic/odroid-go-ultra.rst @@ -0,0 +1,34 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +U-Boot for ODROID-GO-ULTRA +========================== + +The Odroid Go Ultra is a portable gaming device with the following +characteristics: + + - Amlogic S922X SoC + - RK817 & RK818 PMICs + - 2GiB LPDDR4 + - On board 16GiB eMMC + - Micro SD Card slot + - 5inch 854×480 MIPI-DSI TFT LCD + - Earphone stereo jack, 0.5Watt 8Ω Mono speaker + - Li-Polymer 3.7V/4000mAh Battery + - USB-A 2.0 Host Connector + - x16 GPIO Input Buttons + - 2x ADC Analog Joysticks + - USB-C Port for USB2 Device and Charging + +U-Boot compilation +------------------ + +.. code-block:: bash + + $ export CROSS_COMPILE=aarch64-none-elf- + $ make odroid-go-ultra_defconfig + $ make + +Image creation +-------------- + +Pleaser refer to :doc:`pre-generated-fip` with codename `odroid-go-ultra` -- cgit v1.2.3 From 8f5e9de121003bfd9a64a5b3a503c0fbd02af823 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Thu, 26 Jan 2023 10:48:21 +0100 Subject: ARM: meson: Add support for Odroid-N2L ODROID-N2L is a variant SBC in small form factor and some peripherals are removed from ODROID-N2PLUS based on S922X SoC. - On-board ethernet is removed - On-board RTC is removed - USB 3.0 hub is removed, so one USB 2.0 and one USB 3.0 host ports are available - Huge heatsink is replaced with 40x40mm heatsink, 5V active heatsink is recommended or a tall passive sink is optional - 3.5mm earjack is removed - IR remote receiver is removed - MIPI DSI port is added It doesn't use the odroid-n2 board support since ADC revision collides with Odroid-N2+ and since it doesn't have on-board ethernet no need to load the MAC address from eFuses. Link: https://lore.kernel.org/r/20230126-u-boot-odroid-n2l-v1-2-c60f695e0f6c@linaro.org Signed-off-by: Neil Armstrong --- arch/arm/dts/meson-g12b-odroid-n2l-u-boot.dtsi | 7 +++ configs/odroid-n2l_defconfig | 70 ++++++++++++++++++++++++++ doc/board/amlogic/index.rst | 2 + doc/board/amlogic/odroid-n2l.rst | 31 ++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 arch/arm/dts/meson-g12b-odroid-n2l-u-boot.dtsi create mode 100644 configs/odroid-n2l_defconfig create mode 100644 doc/board/amlogic/odroid-n2l.rst (limited to 'configs') diff --git a/arch/arm/dts/meson-g12b-odroid-n2l-u-boot.dtsi b/arch/arm/dts/meson-g12b-odroid-n2l-u-boot.dtsi new file mode 100644 index 0000000000..236f2468dc --- /dev/null +++ b/arch/arm/dts/meson-g12b-odroid-n2l-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 BayLibre, SAS. + * Author: Neil Armstrong + */ + +#include "meson-g12-common-u-boot.dtsi" diff --git a/configs/odroid-n2l_defconfig b/configs/odroid-n2l_defconfig new file mode 100644 index 0000000000..7f9e64d942 --- /dev/null +++ b/configs/odroid-n2l_defconfig @@ -0,0 +1,70 @@ +CONFIG_ARM=y +CONFIG_SYS_BOARD="w400" +CONFIG_ARCH_MESON=y +CONFIG_TEXT_BASE=0x01000000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_ENV_SIZE=0x2000 +CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-odroid-n2l" +CONFIG_MESON_G12A=y +CONFIG_DEBUG_UART_BASE=0xff803000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_IDENT_STRING=" odroid-n2l" +CONFIG_SYS_LOAD_ADDR=0x1000000 +CONFIG_DEBUG_UART=y +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 +CONFIG_REMAKE_ELF=y +CONFIG_OF_BOARD_SETUP=y +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_MISC_INIT_R=y +CONFIG_SYS_MAXARGS=32 +# CONFIG_CMD_BDI is not set +# CONFIG_CMD_IMI is not set +CONFIG_CMD_GPIO=y +# CONFIG_CMD_LOADS is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_REGULATOR=y +CONFIG_OF_CONTROL=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ADC=y +CONFIG_SARADC_MESON=y +CONFIG_MMC_MESON_GX=y +CONFIG_MESON_G12A_USB_PHY=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_MESON_G12A=y +CONFIG_POWER_DOMAIN=y +CONFIG_MESON_EE_POWER_DOMAIN=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_RESET=y +CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_DEBUG_UART_SKIP_INIT=y +CONFIG_MESON_SERIAL=y +CONFIG_USB=y +CONFIG_DM_USB_GADGET=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_DWC3=y +# CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_MESON_G12A=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e +CONFIG_USB_GADGET_PRODUCT_NUM=0xfada +CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_VIDEO=y +# CONFIG_VIDEO_BPP8 is not set +# CONFIG_VIDEO_BPP16 is not set +CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_VIDEO_MESON=y +CONFIG_VIDEO_DT_SIMPLEFB=y +CONFIG_BMP_16BPP=y +CONFIG_BMP_24BPP=y +CONFIG_BMP_32BPP=y +CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/doc/board/amlogic/index.rst b/doc/board/amlogic/index.rst index 11443d9f2c..f945f672dd 100644 --- a/doc/board/amlogic/index.rst +++ b/doc/board/amlogic/index.rst @@ -21,6 +21,7 @@ This matrix concerns the actual source code version. | | P201 | LibreTech-AC v2 | | | | GSKing-X | Odroid-HC4 | | | | JetHub J80 | | | | Odroid-Go- | BananaPi-M5 | | | | | | | | Ultra | | +| | | | | | | Odroid-N2L | | +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ | UART | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | **Yes** | +-------------------------------+-----------+-----------------+--------------+-------------+------------+-------------+--------------+ @@ -106,6 +107,7 @@ Board Documentation odroid-c2 odroid-c4 odroid-n2 + odroid-n2l odroid-go-ultra p200 p201 diff --git a/doc/board/amlogic/odroid-n2l.rst b/doc/board/amlogic/odroid-n2l.rst new file mode 100644 index 0000000000..afd4409d1b --- /dev/null +++ b/doc/board/amlogic/odroid-n2l.rst @@ -0,0 +1,31 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +U-Boot for ODROID-N2L +===================== + +ODROID-N2L is a single board computer manufactured by Hardkernel +Co. Ltd with the following specifications: + + - Amlogic S922X ARM Cortex-A53 dual-core + Cortex-A73 quad-core SoC + - 4GB DDR4 SDRAM + - HDMI 2.1 4K/60Hz display + - 40-pin GPIO header + - 1 x USB 3.0 Host, 1 x USB USB 2.0 Host + - eMMC, microSD + - MIPI DSI Port + +Schematics are available on the manufacturer website. + +U-Boot compilation +------------------ + +.. code-block:: bash + + $ export CROSS_COMPILE=aarch64-none-elf- + $ make odroid-n2l_defconfig + $ make + +Image creation +-------------- + +For simplified usage, pleaser refer to :doc:`pre-generated-fip` with codename `odroid-n2l` -- cgit v1.2.3