Skip to content

Commit 07cb9a2

Browse files
author
Sam Winchenbach
committed
Force ADMV8818 soft reset and SDO initialization
When a weak pull-up is present on the SDO line, regmap_update_bits fails to write both the SOFTRESET and SDOACTIVE bits because it incorrectly reads them as already set. Since the soft reset disables the SDO line, performing a read-modify-write operation on ADI_SPI_CONFIG_A to enable the SDO line doesn't make sense. This change directly writes to the register instead of using regmap_update_bits. Signed-off-by: Sam Winchenbach <swinchenbach@arka.org>
1 parent 8dda4f6 commit 07cb9a2

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

drivers/iio/filter/admv8818.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -577,21 +577,15 @@ static int admv8818_init(struct admv8818_state *st)
577577
struct spi_device *spi = st->spi;
578578
unsigned int chip_id;
579579

580-
ret = regmap_update_bits(st->regmap, ADMV8818_REG_SPI_CONFIG_A,
581-
ADMV8818_SOFTRESET_N_MSK |
582-
ADMV8818_SOFTRESET_MSK,
583-
FIELD_PREP(ADMV8818_SOFTRESET_N_MSK, 1) |
584-
FIELD_PREP(ADMV8818_SOFTRESET_MSK, 1));
580+
ret = regmap_write(dev->regmap, ADMV8818_REG_SPI_CONFIG_A,
581+
ADMV8818_SOFTRESET_N_MSK | ADMV8818_SOFTRESET_MSK);
585582
if (ret) {
586583
dev_err(&spi->dev, "ADMV8818 Soft Reset failed.\n");
587584
return ret;
588585
}
589586

590-
ret = regmap_update_bits(st->regmap, ADMV8818_REG_SPI_CONFIG_A,
591-
ADMV8818_SDOACTIVE_N_MSK |
592-
ADMV8818_SDOACTIVE_MSK,
593-
FIELD_PREP(ADMV8818_SDOACTIVE_N_MSK, 1) |
594-
FIELD_PREP(ADMV8818_SDOACTIVE_MSK, 1));
587+
ret = regmap_write(dev->regmap, ADMV8818_REG_SPI_CONFIG_A,
588+
ADMV8818_SDOACTIVE_N_MSK | ADMV8818_SDOACTIVE_MSK);
595589
if (ret) {
596590
dev_err(&spi->dev, "ADMV8818 SDO Enable failed.\n");
597591
return ret;

0 commit comments

Comments
 (0)