summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Strozek <mstrozek@opensource.cirrus.com>2024-12-05 14:58:19 +0300
committerLee Jones <lee@kernel.org>2024-12-17 16:17:25 +0300
commitd496ad33e637da91257699732c46dc4eac19ff13 (patch)
tree624cb1748fd9b79c3d143ce706d0ef5cb0529d5e
parentb787a44fb11f4c5f56be117d4fbb5d99949b57fd (diff)
downloadlinux-d496ad33e637da91257699732c46dc4eac19ff13.tar.xz
mfd: cs42l43: Prepare support for updated bios patch
Newer bios patch firmware versions now require use of the shadow register interface, which was previously only required by the full firmware, update the check accordingly. Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com> Link: https://lore.kernel.org/r/20241205115822.2371719-1-ckeepax@opensource.cirrus.com Signed-off-by: Lee Jones <lee@kernel.org>
-rw-r--r--drivers/mfd/cs42l43.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/cs42l43.c b/drivers/mfd/cs42l43.c
index e5f17fc430e4..11a1b7f1e121 100644
--- a/drivers/mfd/cs42l43.c
+++ b/drivers/mfd/cs42l43.c
@@ -48,6 +48,7 @@
#define CS42L43_MCU_SUPPORTED_REV 0x2105
#define CS42L43_MCU_SHADOW_REGS_REQUIRED_REV 0x2200
+#define CS42L43_BIOS_SHADOW_REGS_REQUIRED_REV 0x1002
#define CS42L43_MCU_SUPPORTED_BIOS_REV 0x0001
#define CS42L43_VDDP_DELAY_US 50
@@ -773,7 +774,8 @@ static int cs42l43_mcu_update_step(struct cs42l43 *cs42l43)
* Later versions of the firmwware require the driver to access some
* features through a set of shadow registers.
*/
- shadow = mcu_rev >= CS42L43_MCU_SHADOW_REGS_REQUIRED_REV;
+ shadow = (mcu_rev >= CS42L43_MCU_SHADOW_REGS_REQUIRED_REV) ||
+ (bios_rev >= CS42L43_BIOS_SHADOW_REGS_REQUIRED_REV);
ret = regmap_read(cs42l43->regmap, CS42L43_BOOT_CONTROL, &secure_cfg);
if (ret) {