diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-14 08:45:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-14 08:45:30 +0100 |
| commit | 6f119e3da79ce5e586340059403ab77201c1bb45 (patch) | |
| tree | 81d90cd984ec652f2254f9843f7ed263b9d76e5b /drivers/fpga/altera-cvp.c | |
| parent | 124bb4e757990e809ec1870f64704ea0921dc418 (diff) | |
| parent | e19890a0088b5884cb9e6a6f5717dc56cc45fc31 (diff) | |
Merge tag 'fpga-for-6.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next
Xu writes:
FPGA Manager changes for 6.15-rc1
- Peter's change updates his email address.
- Kuhanh's change increases timeout for altera-cvp driver
- Arnd's change removes incorrect of_match_ptr
All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of our for-next branch).
Signed-off-by: Xu Yilun <yilun.xu@intel.com>
* tag 'fpga-for-6.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
fpga: versal: remove incorrect of_match_ptr annotation
fpga: altera-cvp: Increase credit timeout
fpga: m10bmc-sec: update email address for Peter Colberg
Diffstat (limited to 'drivers/fpga/altera-cvp.c')
| -rw-r--r-- | drivers/fpga/altera-cvp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera-cvp.c index 6b0914432445..5af0bd33890c 100644 --- a/drivers/fpga/altera-cvp.c +++ b/drivers/fpga/altera-cvp.c @@ -52,7 +52,7 @@ /* V2 Defines */ #define VSE_CVP_TX_CREDITS 0x49 /* 8bit */ -#define V2_CREDIT_TIMEOUT_US 20000 +#define V2_CREDIT_TIMEOUT_US 40000 #define V2_CHECK_CREDIT_US 10 #define V2_POLL_TIMEOUT_US 1000000 #define V2_USER_TIMEOUT_US 500000 |