diff options
author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2024-05-13 15:55:19 +0200 |
---|---|---|
committer | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2024-05-13 15:55:19 +0200 |
commit | 10316dcc4f39b2560b372d11be477228b95ae5ac (patch) | |
tree | bd057ae165b6d19dca6c745da98fb1250d458f19 /arch/powerpc/include/asm/plpks.h | |
parent | Linux 6.9-rc5 (diff) | |
parent | i2c: synquacer: Fix an error handling path in synquacer_i2c_probe() (diff) | |
download | linux-10316dcc4f39b2560b372d11be477228b95ae5ac.tar.xz linux-10316dcc4f39b2560b372d11be477228b95ae5ac.zip |
Merge tag 'i2c-host-fixes-6.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow
This tag includes two fixes. The first one, in the Cadence driver
seen in Qemu, prevents unintentional FIFO clearing at the
beginning of a transaction. The second fix, in the SynQuacer,
ensures proper error handling during clock get, prepare, and
enable operations by using the devm_clk_get_enabled() helper.
Diffstat (limited to 'arch/powerpc/include/asm/plpks.h')
-rw-r--r-- | arch/powerpc/include/asm/plpks.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/include/asm/plpks.h b/arch/powerpc/include/asm/plpks.h index 23b77027c916..7a84069759b0 100644 --- a/arch/powerpc/include/asm/plpks.h +++ b/arch/powerpc/include/asm/plpks.h @@ -44,9 +44,8 @@ #define PLPKS_MAX_DATA_SIZE 4000 // Timeouts for PLPKS operations -#define PLPKS_MAX_TIMEOUT 5000 // msec -#define PLPKS_FLUSH_SLEEP 10 // msec -#define PLPKS_FLUSH_SLEEP_RANGE 400 +#define PLPKS_MAX_TIMEOUT (5 * USEC_PER_SEC) +#define PLPKS_FLUSH_SLEEP 10000 // usec struct plpks_var { char *component; |