diff options
| author | Jakub Kicinski <[email protected]> | 2025-05-15 18:22:32 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-05-15 18:28:30 +0000 |
| commit | bebd7b262638af611a0e699ba37c43ec2238801b (patch) | |
| tree | 361c8116078d4923b630a5bff78614d136ba5716 /drivers/usb/cdns3/core.h | |
| parent | net: prestera: Use to_delayed_work() (diff) | |
| parent | Merge tag 'net-6.15-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-bebd7b262638af611a0e699ba37c43ec2238801b.tar.gz kernel-bebd7b262638af611a0e699ba37c43ec2238801b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.15-rc7).
Conflicts:
tools/testing/selftests/drivers/net/hw/ncdevmem.c
97c4e094a4b2 ("tests/ncdevmem: Fix double-free of queue array")
2f1a805f32ba ("selftests: ncdevmem: Implement devmem TCP TX")
https://lore.kernel.org/[email protected]
Adjacent changes:
net/core/devmem.c
net/core/devmem.h
0afc44d8cdf6 ("net: devmem: fix kernel panic when netlink socket close after module unload")
bd61848900bf ("net: devmem: Implement TX path")
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/usb/cdns3/core.h')
| -rw-r--r-- | drivers/usb/cdns3/core.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/cdns3/core.h b/drivers/usb/cdns3/core.h index 921cccf1ca9d..801be9e61340 100644 --- a/drivers/usb/cdns3/core.h +++ b/drivers/usb/cdns3/core.h @@ -79,6 +79,8 @@ struct cdns3_platform_data { * @pdata: platform data from glue layer * @lock: spinlock structure * @xhci_plat_data: xhci private data structure pointer + * @override_apb_timeout: hold value of APB timeout. For value 0 the default + * value in CHICKEN_BITS_3 will be preserved. * @gadget_init: pointer to gadget initialization function */ struct cdns { @@ -117,6 +119,7 @@ struct cdns { struct cdns3_platform_data *pdata; spinlock_t lock; struct xhci_plat_priv *xhci_plat_data; + u32 override_apb_timeout; int (*gadget_init)(struct cdns *cdns); }; |