Skip to content

Commit cc2c354

Browse files
Sam Winchenbachjic23
authored andcommitted
iio: filter: admv8818: Force initialization of SDO
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. Fixes: f34fe88 ("iio:filter:admv8818: add support for ADMV8818") Signed-off-by: Sam Winchenbach <[email protected]> Link: https://patch.msgid.link/SA1P110MB106904C961B0F3FAFFED74C0BCF5A@SA1P110MB1069.NAMP110.PROD.OUTLOOK.COM Cc: <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
1 parent bead181 commit cc2c354

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
@@ -574,21 +574,15 @@ static int admv8818_init(struct admv8818_state *st)
574574
struct spi_device *spi = st->spi;
575575
unsigned int chip_id;
576576

577-
ret = regmap_update_bits(st->regmap, ADMV8818_REG_SPI_CONFIG_A,
578-
ADMV8818_SOFTRESET_N_MSK |
579-
ADMV8818_SOFTRESET_MSK,
580-
FIELD_PREP(ADMV8818_SOFTRESET_N_MSK, 1) |
581-
FIELD_PREP(ADMV8818_SOFTRESET_MSK, 1));
577+
ret = regmap_write(st->regmap, ADMV8818_REG_SPI_CONFIG_A,
578+
ADMV8818_SOFTRESET_N_MSK | ADMV8818_SOFTRESET_MSK);
582579
if (ret) {
583580
dev_err(&spi->dev, "ADMV8818 Soft Reset failed.\n");
584581
return ret;
585582
}
586583

587-
ret = regmap_update_bits(st->regmap, ADMV8818_REG_SPI_CONFIG_A,
588-
ADMV8818_SDOACTIVE_N_MSK |
589-
ADMV8818_SDOACTIVE_MSK,
590-
FIELD_PREP(ADMV8818_SDOACTIVE_N_MSK, 1) |
591-
FIELD_PREP(ADMV8818_SDOACTIVE_MSK, 1));
584+
ret = regmap_write(st->regmap, ADMV8818_REG_SPI_CONFIG_A,
585+
ADMV8818_SDOACTIVE_N_MSK | ADMV8818_SDOACTIVE_MSK);
592586
if (ret) {
593587
dev_err(&spi->dev, "ADMV8818 SDO Enable failed.\n");
594588
return ret;

0 commit comments

Comments
 (0)