* [PATCH v2 1/2] dt-bindings: usb: aspeed,usb-vhub: Add ast2700 support
2025-11-28 0:27 [PATCH v2 0/2] Add AST2700 support for Aspeed vhub Ryan Chen
@ 2025-11-28 0:27 ` Ryan Chen
2025-11-28 17:32 ` Conor Dooley
2025-11-28 0:27 ` [PATCH v2 2/2] usb: gadget: aspeed-vhub: " Ryan Chen
1 sibling, 1 reply; 4+ messages in thread
From: Ryan Chen @ 2025-11-28 0:27 UTC (permalink / raw)
To: Greg Kroah-Hartman, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Joel Stanley, Andrew Jeffery,
Benjamin Herrenschmidt, Philipp Zabel
Cc: linux-usb, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel, Ryan Chen
Add the "aspeed,ast2700-usb-vhub" compatible. The ast2700 vhub
controller requires an reset, so make the "resets" property
mandatory for this compatible to reflect the hardware requirement.
Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com>
---
.../devicetree/bindings/usb/aspeed,usb-vhub.yaml | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/aspeed,usb-vhub.yaml b/Documentation/devicetree/bindings/usb/aspeed,usb-vhub.yaml
index 7f22f9c031b2..b8bac2cce949 100644
--- a/Documentation/devicetree/bindings/usb/aspeed,usb-vhub.yaml
+++ b/Documentation/devicetree/bindings/usb/aspeed,usb-vhub.yaml
@@ -17,8 +17,8 @@ description: |+
Supported number of devices and endpoints vary depending on hardware
revisions. AST2400 and AST2500 Virtual Hub supports 5 downstream devices
- and 15 generic endpoints, while AST2600 Virtual Hub supports 7 downstream
- devices and 21 generic endpoints.
+ and 15 generic endpoints, while AST2600 and AST2700 Virtual Hub supports
+ 7 downstream devices and 21 generic endpoints.
properties:
compatible:
@@ -26,6 +26,7 @@ properties:
- aspeed,ast2400-usb-vhub
- aspeed,ast2500-usb-vhub
- aspeed,ast2600-usb-vhub
+ - aspeed,ast2700-usb-vhub
reg:
maxItems: 1
@@ -33,6 +34,9 @@ properties:
clocks:
maxItems: 1
+ resets:
+ maxItems: 1
+
interrupts:
maxItems: 1
@@ -107,6 +111,20 @@ required:
- aspeed,vhub-downstream-ports
- aspeed,vhub-generic-endpoints
+if:
+ properties:
+ compatible:
+ contains:
+ const: aspeed,ast2700-usb-vhub
+
+then:
+ required:
+ - resets
+
+else:
+ properties:
+ resets: false
+
additionalProperties: false
examples:
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v2 2/2] usb: gadget: aspeed-vhub: Add ast2700 support
2025-11-28 0:27 [PATCH v2 0/2] Add AST2700 support for Aspeed vhub Ryan Chen
2025-11-28 0:27 ` [PATCH v2 1/2] dt-bindings: usb: aspeed,usb-vhub: Add ast2700 support Ryan Chen
@ 2025-11-28 0:27 ` Ryan Chen
1 sibling, 0 replies; 4+ messages in thread
From: Ryan Chen @ 2025-11-28 0:27 UTC (permalink / raw)
To: Greg Kroah-Hartman, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Joel Stanley, Andrew Jeffery,
Benjamin Herrenschmidt, Philipp Zabel
Cc: linux-usb, devicetree, linux-arm-kernel, linux-aspeed,
linux-kernel, Ryan Chen
Add support for the AST2700 SOC in the vhub gadget driver. AST2700
uses a 64-bit DMA addressing capability, so select 64-bit DMA mask
for compatible. AST2700 vhub also requires an reset line, so hook
up the optional reset control and assert/deassert it during probe
and remove.
Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com>
---
drivers/usb/gadget/udc/aspeed-vhub/core.c | 30 ++++++++++++++++++++++++++++++
drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 1 +
2 files changed, 31 insertions(+)
diff --git a/drivers/usb/gadget/udc/aspeed-vhub/core.c b/drivers/usb/gadget/udc/aspeed-vhub/core.c
index f2685f89b3e5..19c1849ae665 100644
--- a/drivers/usb/gadget/udc/aspeed-vhub/core.c
+++ b/drivers/usb/gadget/udc/aspeed-vhub/core.c
@@ -23,6 +23,7 @@
#include <linux/of.h>
#include <linux/regmap.h>
#include <linux/dma-mapping.h>
+#include <linux/reset.h>
#include "vhub.h"
@@ -280,6 +281,8 @@ static void ast_vhub_remove(struct platform_device *pdev)
if (vhub->clk)
clk_disable_unprepare(vhub->clk);
+ reset_control_assert(vhub->rst);
+
spin_unlock_irqrestore(&vhub->lock, flags);
if (vhub->ep0_bufs)
@@ -294,6 +297,7 @@ static void ast_vhub_remove(struct platform_device *pdev)
static int ast_vhub_probe(struct platform_device *pdev)
{
enum usb_device_speed max_speed;
+ const u64 *dma_mask_ptr;
struct ast_vhub *vhub;
struct resource *res;
int i, rc = 0;
@@ -348,6 +352,16 @@ static int ast_vhub_probe(struct platform_device *pdev)
goto err;
}
+ vhub->rst = devm_reset_control_get_optional_shared(&pdev->dev, NULL);
+ if (IS_ERR(vhub->rst)) {
+ rc = PTR_ERR(vhub->rst);
+ goto err;
+ }
+
+ rc = reset_control_deassert(vhub->rst);
+ if (rc)
+ goto err;
+
/* Check if we need to limit the HW to USB1 */
max_speed = usb_get_maximum_speed(&pdev->dev);
if (max_speed != USB_SPEED_UNKNOWN && max_speed < USB_SPEED_HIGH)
@@ -370,6 +384,12 @@ static int ast_vhub_probe(struct platform_device *pdev)
goto err;
}
+ dma_mask_ptr = (u64 *)of_device_get_match_data(&pdev->dev);
+ if (dma_mask_ptr) {
+ rc = dma_coerce_mask_and_coherent(&pdev->dev, *dma_mask_ptr);
+ if (rc)
+ goto err;
+ }
/*
* Allocate DMA buffers for all EP0s in one chunk,
* one per port and one for the vHub itself
@@ -412,15 +432,25 @@ static int ast_vhub_probe(struct platform_device *pdev)
return rc;
}
+static const u64 dma_mask_32 = DMA_BIT_MASK(32);
+static const u64 dma_mask_64 = DMA_BIT_MASK(64);
+
static const struct of_device_id ast_vhub_dt_ids[] = {
{
.compatible = "aspeed,ast2400-usb-vhub",
+ .data = &dma_mask_32,
},
{
.compatible = "aspeed,ast2500-usb-vhub",
+ .data = &dma_mask_32,
},
{
.compatible = "aspeed,ast2600-usb-vhub",
+ .data = &dma_mask_32,
+ },
+ {
+ .compatible = "aspeed,ast2700-usb-vhub",
+ .data = &dma_mask_64,
},
{ }
};
diff --git a/drivers/usb/gadget/udc/aspeed-vhub/vhub.h b/drivers/usb/gadget/udc/aspeed-vhub/vhub.h
index 6b9dfa6e10eb..aca2050e2db0 100644
--- a/drivers/usb/gadget/udc/aspeed-vhub/vhub.h
+++ b/drivers/usb/gadget/udc/aspeed-vhub/vhub.h
@@ -388,6 +388,7 @@ struct ast_vhub {
spinlock_t lock;
struct work_struct wake_work;
struct clk *clk;
+ struct reset_control *rst;
/* EP0 DMA buffers allocated in one chunk */
void *ep0_bufs;
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread