mirror of
https://github.com/torvalds/linux.git
synced 2026-05-24 07:03:03 +02:00
mfd: cs42l43: Add time postfixes on defines
Make the defines a little clearer by adding time based postfixes. Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Link: https://lore.kernel.org/r/20240129152557.3221212-4-ckeepax@opensource.cirrus.com Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
parent
de896be80a
commit
ca291ea748
|
|
@ -27,30 +27,30 @@
|
|||
|
||||
#include "cs42l43.h"
|
||||
|
||||
#define CS42L43_RESET_DELAY 20
|
||||
#define CS42L43_RESET_DELAY_MS 20
|
||||
|
||||
#define CS42L43_SDW_ATTACH_TIMEOUT 500
|
||||
#define CS42L43_SDW_DETACH_TIMEOUT 100
|
||||
#define CS42L43_SDW_ATTACH_TIMEOUT_MS 500
|
||||
#define CS42L43_SDW_DETACH_TIMEOUT_MS 100
|
||||
|
||||
#define CS42L43_MCU_BOOT_STAGE1 1
|
||||
#define CS42L43_MCU_BOOT_STAGE2 2
|
||||
#define CS42L43_MCU_BOOT_STAGE3 3
|
||||
#define CS42L43_MCU_BOOT_STAGE4 4
|
||||
#define CS42L43_MCU_POLL 5000
|
||||
#define CS42L43_MCU_CMD_TIMEOUT 20000
|
||||
#define CS42L43_MCU_POLL_US 5000
|
||||
#define CS42L43_MCU_CMD_TIMEOUT_US 20000
|
||||
#define CS42L43_MCU_UPDATE_FORMAT 3
|
||||
#define CS42L43_MCU_UPDATE_OFFSET 0x100000
|
||||
#define CS42L43_MCU_UPDATE_TIMEOUT 500000
|
||||
#define CS42L43_MCU_UPDATE_TIMEOUT_US 500000
|
||||
#define CS42L43_MCU_UPDATE_RETRIES 5
|
||||
|
||||
#define CS42L43_MCU_SUPPORTED_REV 0x2105
|
||||
#define CS42L43_MCU_SHADOW_REGS_REQUIRED_REV 0x2200
|
||||
#define CS42L43_MCU_SUPPORTED_BIOS_REV 0x0001
|
||||
|
||||
#define CS42L43_VDDP_DELAY 50
|
||||
#define CS42L43_VDDD_DELAY 1000
|
||||
#define CS42L43_VDDP_DELAY_US 50
|
||||
#define CS42L43_VDDD_DELAY_US 1000
|
||||
|
||||
#define CS42L43_AUTOSUSPEND_TIME 250
|
||||
#define CS42L43_AUTOSUSPEND_TIME_MS 250
|
||||
|
||||
struct cs42l43_patch_header {
|
||||
__le16 version;
|
||||
|
|
@ -538,10 +538,10 @@ static int cs42l43_soft_reset(struct cs42l43 *cs42l43)
|
|||
regcache_cache_only(cs42l43->regmap, true);
|
||||
regmap_multi_reg_write_bypassed(cs42l43->regmap, reset, ARRAY_SIZE(reset));
|
||||
|
||||
msleep(CS42L43_RESET_DELAY);
|
||||
msleep(CS42L43_RESET_DELAY_MS);
|
||||
|
||||
if (cs42l43->sdw) {
|
||||
unsigned long timeout = msecs_to_jiffies(CS42L43_SDW_DETACH_TIMEOUT);
|
||||
unsigned long timeout = msecs_to_jiffies(CS42L43_SDW_DETACH_TIMEOUT_MS);
|
||||
unsigned long time;
|
||||
|
||||
time = wait_for_completion_timeout(&cs42l43->device_detach, timeout);
|
||||
|
|
@ -561,7 +561,7 @@ static int cs42l43_soft_reset(struct cs42l43 *cs42l43)
|
|||
static int cs42l43_wait_for_attach(struct cs42l43 *cs42l43)
|
||||
{
|
||||
if (!cs42l43->attached) {
|
||||
unsigned long timeout = msecs_to_jiffies(CS42L43_SDW_ATTACH_TIMEOUT);
|
||||
unsigned long timeout = msecs_to_jiffies(CS42L43_SDW_ATTACH_TIMEOUT_MS);
|
||||
unsigned long time;
|
||||
|
||||
time = wait_for_completion_timeout(&cs42l43->device_attach, timeout);
|
||||
|
|
@ -603,7 +603,7 @@ static int cs42l43_mcu_stage_2_3(struct cs42l43 *cs42l43, bool shadow)
|
|||
|
||||
ret = regmap_read_poll_timeout(cs42l43->regmap, CS42L43_BOOT_STATUS,
|
||||
val, (val == CS42L43_MCU_BOOT_STAGE3),
|
||||
CS42L43_MCU_POLL, CS42L43_MCU_CMD_TIMEOUT);
|
||||
CS42L43_MCU_POLL_US, CS42L43_MCU_CMD_TIMEOUT_US);
|
||||
if (ret) {
|
||||
dev_err(cs42l43->dev, "Failed to move to stage 3: %d, 0x%x\n", ret, val);
|
||||
return ret;
|
||||
|
|
@ -652,7 +652,7 @@ static int cs42l43_mcu_disable(struct cs42l43 *cs42l43)
|
|||
|
||||
ret = regmap_read_poll_timeout(cs42l43->regmap, CS42L43_SOFT_INT_SHADOW, val,
|
||||
(val & CS42L43_CONTROL_APPLIED_INT_MASK),
|
||||
CS42L43_MCU_POLL, CS42L43_MCU_CMD_TIMEOUT);
|
||||
CS42L43_MCU_POLL_US, CS42L43_MCU_CMD_TIMEOUT_US);
|
||||
if (ret) {
|
||||
dev_err(cs42l43->dev, "Failed to disable firmware: %d, 0x%x\n", ret, val);
|
||||
return ret;
|
||||
|
|
@ -696,7 +696,7 @@ static void cs42l43_mcu_load_firmware(const struct firmware *firmware, void *con
|
|||
|
||||
ret = regmap_read_poll_timeout(cs42l43->regmap, CS42L43_SOFT_INT_SHADOW, val,
|
||||
(val & CS42L43_PATCH_APPLIED_INT_MASK),
|
||||
CS42L43_MCU_POLL, CS42L43_MCU_UPDATE_TIMEOUT);
|
||||
CS42L43_MCU_POLL_US, CS42L43_MCU_UPDATE_TIMEOUT_US);
|
||||
if (ret) {
|
||||
dev_err(cs42l43->dev, "Failed to update firmware: %d, 0x%x\n", ret, val);
|
||||
cs42l43->firmware_error = ret;
|
||||
|
|
@ -957,7 +957,7 @@ static int cs42l43_power_up(struct cs42l43 *cs42l43)
|
|||
}
|
||||
|
||||
/* vdd-p must be on for 50uS before any other supply */
|
||||
usleep_range(CS42L43_VDDP_DELAY, 2 * CS42L43_VDDP_DELAY);
|
||||
usleep_range(CS42L43_VDDP_DELAY_US, 2 * CS42L43_VDDP_DELAY_US);
|
||||
|
||||
gpiod_set_value_cansleep(cs42l43->reset, 1);
|
||||
|
||||
|
|
@ -973,7 +973,7 @@ static int cs42l43_power_up(struct cs42l43 *cs42l43)
|
|||
goto err_core_supplies;
|
||||
}
|
||||
|
||||
usleep_range(CS42L43_VDDD_DELAY, 2 * CS42L43_VDDD_DELAY);
|
||||
usleep_range(CS42L43_VDDD_DELAY_US, 2 * CS42L43_VDDD_DELAY_US);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
@ -1057,7 +1057,7 @@ int cs42l43_dev_probe(struct cs42l43 *cs42l43)
|
|||
if (ret)
|
||||
return ret;
|
||||
|
||||
pm_runtime_set_autosuspend_delay(cs42l43->dev, CS42L43_AUTOSUSPEND_TIME);
|
||||
pm_runtime_set_autosuspend_delay(cs42l43->dev, CS42L43_AUTOSUSPEND_TIME_MS);
|
||||
pm_runtime_use_autosuspend(cs42l43->dev);
|
||||
pm_runtime_set_active(cs42l43->dev);
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user