Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

iio: dac: ad3552r-hs: update function name (non functional)

Update ad3552r_qspi_update_reg_bits function name to a more
generic name, since used mode can be SIMPLE/DUAL/QUAD SPI.

Reviewed-by: David Lechner <dlechner@baylibre.com>
Signed-off-by: Angelo Dureghello <adureghello@baylibre.com>
Link: https://patch.msgid.link/20250114-wip-bl-ad3552r-axi-v0-iio-testing-carlos-v4-9-979402e33545@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

authored by

Angelo Dureghello and committed by
Jonathan Cameron
1ec0d78d 350d1ebf

+29 -31
+29 -31
drivers/iio/dac/ad3552r-hs.c
··· 65 65 return st->data->bus_reg_read(st->back, reg, val, xfer_size); 66 66 } 67 67 68 - static int ad3552r_qspi_update_reg_bits(struct ad3552r_hs_state *st, 69 - u32 reg, u32 mask, u32 val, 70 - size_t xfer_size) 68 + static int ad3552r_hs_update_reg_bits(struct ad3552r_hs_state *st, u32 reg, 69 + u32 mask, u32 val, size_t xfer_size) 71 70 { 72 71 u32 rval; 73 72 int ret; ··· 214 215 */ 215 216 216 217 /* Primary region access, set streaming mode (now in SPI + SDR). */ 217 - ret = ad3552r_qspi_update_reg_bits(st, 218 - AD3552R_REG_ADDR_INTERFACE_CONFIG_B, 219 - AD3552R_MASK_SINGLE_INST, 0, 1); 218 + ret = ad3552r_hs_update_reg_bits(st, 219 + AD3552R_REG_ADDR_INTERFACE_CONFIG_B, 220 + AD3552R_MASK_SINGLE_INST, 0, 1); 220 221 if (ret) 221 222 return ret; 222 223 ··· 225 226 * 0x2c or 0x2a, in descending loop (2 or 4 bytes), keeping loop len 226 227 * value so that it's not cleared hereafter when _CS is deasserted. 227 228 */ 228 - ret = ad3552r_qspi_update_reg_bits(st, 229 - AD3552R_REG_ADDR_TRANSFER_REGISTER, 230 - AD3552R_MASK_STREAM_LENGTH_KEEP_VALUE, 231 - AD3552R_MASK_STREAM_LENGTH_KEEP_VALUE, 1); 229 + ret = ad3552r_hs_update_reg_bits(st, AD3552R_REG_ADDR_TRANSFER_REGISTER, 230 + AD3552R_MASK_STREAM_LENGTH_KEEP_VALUE, 231 + AD3552R_MASK_STREAM_LENGTH_KEEP_VALUE, 232 + 1); 232 233 if (ret) 233 234 goto exit_err_streaming; 234 235 ··· 251 252 252 253 /* 253 254 * From here onward mode is DDR, so reading any register is not possible 254 - * anymore, including calling "ad3552r_qspi_update_reg_bits" function. 255 + * anymore, including calling "ad3552r_hs_update_reg_bits" function. 255 256 */ 256 257 257 258 /* Set target to best high speed mode (D or QSPI). */ ··· 352 353 * Back to simple SPI for secondary region too now, so to be able to 353 354 * dump/read registers there too if needed. 354 355 */ 355 - ret = ad3552r_qspi_update_reg_bits(st, 356 - AD3552R_REG_ADDR_TRANSFER_REGISTER, 357 - AD3552R_MASK_MULTI_IO_MODE, 358 - AD3552R_SPI, 1); 356 + ret = ad3552r_hs_update_reg_bits(st, AD3552R_REG_ADDR_TRANSFER_REGISTER, 357 + AD3552R_MASK_MULTI_IO_MODE, 358 + AD3552R_SPI, 1); 359 359 if (ret) 360 360 return ret; 361 361 362 362 /* Back to single instruction mode, disabling loop. */ 363 - ret = ad3552r_qspi_update_reg_bits(st, 364 - AD3552R_REG_ADDR_INTERFACE_CONFIG_B, 365 - AD3552R_MASK_SINGLE_INST, 366 - AD3552R_MASK_SINGLE_INST, 1); 363 + ret = ad3552r_hs_update_reg_bits(st, 364 + AD3552R_REG_ADDR_INTERFACE_CONFIG_B, 365 + AD3552R_MASK_SINGLE_INST, 366 + AD3552R_MASK_SINGLE_INST, 1); 367 367 if (ret) 368 368 return ret; 369 369 ··· 379 381 else 380 382 val = FIELD_PREP(AD3552R_MASK_CH1_RANGE, mode); 381 383 382 - return ad3552r_qspi_update_reg_bits(st, 383 - AD3552R_REG_ADDR_CH0_CH1_OUTPUT_RANGE, 384 - AD3552R_MASK_CH_OUTPUT_RANGE_SEL(ch), 385 - val, 1); 384 + return ad3552r_hs_update_reg_bits(st, 385 + AD3552R_REG_ADDR_CH0_CH1_OUTPUT_RANGE, 386 + AD3552R_MASK_CH_OUTPUT_RANGE_SEL(ch), 387 + val, 1); 386 388 } 387 389 388 390 static int ad3552r_hs_reset(struct ad3552r_hs_state *st) ··· 398 400 fsleep(10); 399 401 gpiod_set_value_cansleep(st->reset_gpio, 0); 400 402 } else { 401 - ret = ad3552r_qspi_update_reg_bits(st, 402 - AD3552R_REG_ADDR_INTERFACE_CONFIG_A, 403 - AD3552R_MASK_SOFTWARE_RESET, 404 - AD3552R_MASK_SOFTWARE_RESET, 1); 403 + ret = ad3552r_hs_update_reg_bits(st, 404 + AD3552R_REG_ADDR_INTERFACE_CONFIG_A, 405 + AD3552R_MASK_SOFTWARE_RESET, 406 + AD3552R_MASK_SOFTWARE_RESET, 1); 405 407 if (ret) 406 408 return ret; 407 409 } ··· 542 544 543 545 val = ret; 544 546 545 - ret = ad3552r_qspi_update_reg_bits(st, 546 - AD3552R_REG_ADDR_SH_REFERENCE_CONFIG, 547 - AD3552R_MASK_REFERENCE_VOLTAGE_SEL, 548 - val, 1); 547 + ret = ad3552r_hs_update_reg_bits(st, 548 + AD3552R_REG_ADDR_SH_REFERENCE_CONFIG, 549 + AD3552R_MASK_REFERENCE_VOLTAGE_SEL, 550 + val, 1); 549 551 if (ret) 550 552 return ret; 551 553