mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-04-12 16:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

IIO: 1st set of fixes for the 6.14 cycle

Browse Source 
hid-sensors
 - Fix an ABI issue that occurred when we gained multiple proximity sensor
   support.
 adi,adi-axi-adc
 - Fix missing pwm-names inItems entry in dt binding.
 adi,ad3552r
 - Make sure to clear the reset bit in the status flag so future
   resets can be detected.
 adi,ad7192
 - Fix use of value where it should be bit(value) to select channel.
 adi,ad7606
 - Fix up reporting of wrong available scales.
 adi,admv8818
 - Force SDO line to be initialized without relying on it already being
   intialized to read back current register value.
 atmel,sama5d2
 - Fix wrong number of bits reported for readings from sama7g5
 avago,apds9306
 - Fix wrong scaling of scale values (missing a few zeros).
 microchip,pac1921
 - Fix resource leak by moving ACPI_FREE() call up a few lines.
 tyhx,hx9023s
 - Fix a use after free caused by releasing firmware a few lines early.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEbilms4eEBlKRJoGxVIU0mcT0FogFAmeqUx4RHGppYzIzQGtl
 cm5lbC5vcmcACgkQVIU0mcT0FoiomRAAkYP7rgS/NftAIzHZwNVsI23gUE9Cn+pe
 ZCOqcKxcgJ5V89sp3Q+3Qnva89X6ha8wgFajN9X6tJLiWE1k+vPUr59+58LugKMz
 XivJ0LoG6lT2x4pewyCmpVPGVFo92tJUzql6mZhs1AnUBN4FXGmcejTve8jty7Yr
 so9ShetZXxS/UwKbJal9N7oPk1d3XNnMihOkNPRo6eIaNeOSLU4aj0+rnSIDnmrZ
 7zDXpSmI9tiQv3GLBwJwUrT8WFcKuL1S4y9TWo4MF5rdJQ4puLe8YLOVqvsD8H70
 mEza34HBG5X19lh29C7Bcf7DR4NmDoGlGC+LpiuckW+OPp0dqKeGje75RBE5lK25
 U3eSotw4o6GBIFZlpEP6loM2C1Yaz5wNyG3EL1xSFKlIEDrLIse53X4U5g3MyFoh
 GKxf9NM3Gwi3b9Bj2unSirXB3CISuvDoJ0nQQsHKkcUHW8sHavaVfsygvtjAHr3L
 RhW5Y+jDPEZAYia7XCt3mqH6Ch2fR/eNnLyNQR3mN6X8xlGkzY+2y8C9PwYH5rrm
 50LmNibTaapTAEfM8XUb0V2CuTx3GFBZkT8rVe3f5osmDuP4//izVQ6l7QVY9itl
 t1efhE+QxZgW7tcayF2ViV+EZqCdSKMQX6KmullAjmI45QItHg1JPPn5ZzBJbfFf
 7J35sTLqQtI=
 =askj
 -----END PGP SIGNATURE-----

Merge tag 'iio-fixes-for-6.14a' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus

Jonathan writes:

IIO: 1st set of fixes for the 6.14 cycle

hid-sensors
- Fix an ABI issue that occurred when we gained multiple proximity sensor
  support.
adi,adi-axi-adc
- Fix missing pwm-names inItems entry in dt binding.
adi,ad3552r
- Make sure to clear the reset bit in the status flag so future
  resets can be detected.
adi,ad7192
- Fix use of value where it should be bit(value) to select channel.
adi,ad7606
- Fix up reporting of wrong available scales.
adi,admv8818
- Force SDO line to be initialized without relying on it already being
  intialized to read back current register value.
atmel,sama5d2
- Fix wrong number of bits reported for readings from sama7g5
avago,apds9306
- Fix wrong scaling of scale values (missing a few zeros).
microchip,pac1921
- Fix resource leak by moving ACPI_FREE() call up a few lines.
tyhx,hx9023s
- Fix a use after free caused by releasing firmware a few lines early.

* tag 'iio-fixes-for-6.14a' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jic23/iio:
  iio: filter: admv8818: Force initialization of SDO
  iio: adc: ad7606: fix wrong scale available
  dt-bindings: iio: dac: adi-axi-adc: fix ad7606 pwm-names
  iio: dac: ad3552r: clear reset status flag
  iio: adc: ad7192: fix channel select
  iio: hid-sensor-prox: Split difference from multiple channels
  iio: proximity: Fix use-after-free in hx9023s_send_cfg()
  iio: adc: at91-sama5d2_adc: fix sama7g5 realbits value
  iio: adc: pac1921: Move ACPI_FREE() to cover all branches
  iio: light: apds9306: fix max_scale_nano values
This commit is contained in:
Greg Kroah-Hartman 2025-02-12 10:26:17 +01:00
commit e45e07c167
10 changed files with 62 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml
View File

@ -146,6 +146,7 @@ properties:
maxItems: 2
pwm-names:
minItems: 1
items:
- const: convst1
- const: convst2

2
drivers/iio/adc/ad7192.c
View File

@ -1084,7 +1084,7 @@ static int ad7192_update_scan_mode(struct iio_dev *indio_dev, const unsigned lon
conf &= ~AD7192_CONF_CHAN_MASK;
for_each_set_bit(i, scan_mask, 8)
conf |= FIELD_PREP(AD7192_CONF_CHAN_MASK, i);
conf |= FIELD_PREP(AD7192_CONF_CHAN_MASK, BIT(i));
ret = ad_sd_write_reg(&st->sd, AD7192_REG_CONF, 3, conf);
if (ret < 0)

2
drivers/iio/adc/ad7606.c
View File

@ -1047,7 +1047,7 @@ static int ad7606_read_avail(struct iio_dev *indio_dev,
cs = &st->chan_scales[ch];
*vals = (int *)cs->scale_avail;
*length = cs->num_scales;
*length = cs->num_scales * 2;
*type = IIO_VAL_INT_PLUS_MICRO;
return IIO_AVAIL_LIST;

68
drivers/iio/adc/at91-sama5d2_adc.c
View File

@ -329,7 +329,7 @@ static const struct at91_adc_reg_layout sama7g5_layout = {
#define AT91_HWFIFO_MAX_SIZE_STR "128"
#define AT91_HWFIFO_MAX_SIZE 128
#define AT91_SAMA5D2_CHAN_SINGLE(index, num, addr) \
#define AT91_SAMA_CHAN_SINGLE(index, num, addr, rbits) \
{ \
.type = IIO_VOLTAGE, \
.channel = num, \
@ -337,7 +337,7 @@ static const struct at91_adc_reg_layout sama7g5_layout = {
.scan_index = index, \
.scan_type = { \
.sign = 'u', \
.realbits = 14, \
.realbits = rbits, \
.storagebits = 16, \
}, \
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
@ -350,7 +350,13 @@ static const struct at91_adc_reg_layout sama7g5_layout = {
.indexed = 1, \
}
#define AT91_SAMA5D2_CHAN_DIFF(index, num, num2, addr) \
#define AT91_SAMA5D2_CHAN_SINGLE(index, num, addr) \
AT91_SAMA_CHAN_SINGLE(index, num, addr, 14)
#define AT91_SAMA7G5_CHAN_SINGLE(index, num, addr) \
AT91_SAMA_CHAN_SINGLE(index, num, addr, 16)
#define AT91_SAMA_CHAN_DIFF(index, num, num2, addr, rbits) \
{ \
.type = IIO_VOLTAGE, \
.differential = 1, \
@ -360,7 +366,7 @@ static const struct at91_adc_reg_layout sama7g5_layout = {
.scan_index = index, \
.scan_type = { \
.sign = 's', \
.realbits = 14, \
.realbits = rbits, \
.storagebits = 16, \
}, \
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
@ -373,6 +379,12 @@ static const struct at91_adc_reg_layout sama7g5_layout = {
.indexed = 1, \
}
#define AT91_SAMA5D2_CHAN_DIFF(index, num, num2, addr) \
AT91_SAMA_CHAN_DIFF(index, num, num2, addr, 14)
#define AT91_SAMA7G5_CHAN_DIFF(index, num, num2, addr) \
AT91_SAMA_CHAN_DIFF(index, num, num2, addr, 16)
#define AT91_SAMA5D2_CHAN_TOUCH(num, name, mod) \
{ \
.type = IIO_POSITIONRELATIVE, \
@ -666,30 +678,30 @@ static const struct iio_chan_spec at91_sama5d2_adc_channels[] = {
};
static const struct iio_chan_spec at91_sama7g5_adc_channels[] = {
AT91_SAMA5D2_CHAN_SINGLE(0, 0, 0x60),
AT91_SAMA5D2_CHAN_SINGLE(1, 1, 0x64),
AT91_SAMA5D2_CHAN_SINGLE(2, 2, 0x68),
AT91_SAMA5D2_CHAN_SINGLE(3, 3, 0x6c),
AT91_SAMA5D2_CHAN_SINGLE(4, 4, 0x70),
AT91_SAMA5D2_CHAN_SINGLE(5, 5, 0x74),
AT91_SAMA5D2_CHAN_SINGLE(6, 6, 0x78),
AT91_SAMA5D2_CHAN_SINGLE(7, 7, 0x7c),
AT91_SAMA5D2_CHAN_SINGLE(8, 8, 0x80),
AT91_SAMA5D2_CHAN_SINGLE(9, 9, 0x84),
AT91_SAMA5D2_CHAN_SINGLE(10, 10, 0x88),
AT91_SAMA5D2_CHAN_SINGLE(11, 11, 0x8c),
AT91_SAMA5D2_CHAN_SINGLE(12, 12, 0x90),
AT91_SAMA5D2_CHAN_SINGLE(13, 13, 0x94),
AT91_SAMA5D2_CHAN_SINGLE(14, 14, 0x98),
AT91_SAMA5D2_CHAN_SINGLE(15, 15, 0x9c),
AT91_SAMA5D2_CHAN_DIFF(16, 0, 1, 0x60),
AT91_SAMA5D2_CHAN_DIFF(17, 2, 3, 0x68),
AT91_SAMA5D2_CHAN_DIFF(18, 4, 5, 0x70),
AT91_SAMA5D2_CHAN_DIFF(19, 6, 7, 0x78),
AT91_SAMA5D2_CHAN_DIFF(20, 8, 9, 0x80),
AT91_SAMA5D2_CHAN_DIFF(21, 10, 11, 0x88),
AT91_SAMA5D2_CHAN_DIFF(22, 12, 13, 0x90),
AT91_SAMA5D2_CHAN_DIFF(23, 14, 15, 0x98),
AT91_SAMA7G5_CHAN_SINGLE(0, 0, 0x60),
AT91_SAMA7G5_CHAN_SINGLE(1, 1, 0x64),
AT91_SAMA7G5_CHAN_SINGLE(2, 2, 0x68),
AT91_SAMA7G5_CHAN_SINGLE(3, 3, 0x6c),
AT91_SAMA7G5_CHAN_SINGLE(4, 4, 0x70),
AT91_SAMA7G5_CHAN_SINGLE(5, 5, 0x74),
AT91_SAMA7G5_CHAN_SINGLE(6, 6, 0x78),
AT91_SAMA7G5_CHAN_SINGLE(7, 7, 0x7c),
AT91_SAMA7G5_CHAN_SINGLE(8, 8, 0x80),
AT91_SAMA7G5_CHAN_SINGLE(9, 9, 0x84),
AT91_SAMA7G5_CHAN_SINGLE(10, 10, 0x88),
AT91_SAMA7G5_CHAN_SINGLE(11, 11, 0x8c),
AT91_SAMA7G5_CHAN_SINGLE(12, 12, 0x90),
AT91_SAMA7G5_CHAN_SINGLE(13, 13, 0x94),
AT91_SAMA7G5_CHAN_SINGLE(14, 14, 0x98),
AT91_SAMA7G5_CHAN_SINGLE(15, 15, 0x9c),
AT91_SAMA7G5_CHAN_DIFF(16, 0, 1, 0x60),
AT91_SAMA7G5_CHAN_DIFF(17, 2, 3, 0x68),
AT91_SAMA7G5_CHAN_DIFF(18, 4, 5, 0x70),
AT91_SAMA7G5_CHAN_DIFF(19, 6, 7, 0x78),
AT91_SAMA7G5_CHAN_DIFF(20, 8, 9, 0x80),
AT91_SAMA7G5_CHAN_DIFF(21, 10, 11, 0x88),
AT91_SAMA7G5_CHAN_DIFF(22, 12, 13, 0x90),
AT91_SAMA7G5_CHAN_DIFF(23, 14, 15, 0x98),
IIO_CHAN_SOFT_TIMESTAMP(24),
AT91_SAMA5D2_CHAN_TEMP(AT91_SAMA7G5_ADC_TEMP_CHANNEL, "temp", 0xdc),
};

2
drivers/iio/adc/pac1921.c
View File

@ -1198,11 +1198,11 @@ static int pac1921_match_acpi_device(struct iio_dev *indio_dev)
label = devm_kstrdup(dev, status->package.elements[0].string.pointer,
GFP_KERNEL);
ACPI_FREE(status);
if (!label)
return -ENOMEM;
indio_dev->label = label;
ACPI_FREE(status);
return 0;
}

6
drivers/iio/dac/ad3552r.c
View File

@ -410,6 +410,12 @@ static int ad3552r_reset(struct ad3552r_desc *dac)
return ret;
}
/* Clear reset error flag, see ad3552r manual, rev B table 38. */
ret = ad3552r_write_reg(dac, AD3552R_REG_ADDR_ERR_STATUS,
AD3552R_MASK_RESET_STATUS);
if (ret)
return ret;
return ad3552r_update_reg_field(dac,
AD3552R_REG_ADDR_INTERFACE_CONFIG_A,
AD3552R_MASK_ADDR_ASCENSION,

14
drivers/iio/filter/admv8818.c
View File

@ -574,21 +574,15 @@ static int admv8818_init(struct admv8818_state *st)
struct spi_device *spi = st->spi;
unsigned int chip_id;
ret = regmap_update_bits(st->regmap, ADMV8818_REG_SPI_CONFIG_A,
ADMV8818_SOFTRESET_N_MSK |
ADMV8818_SOFTRESET_MSK,
FIELD_PREP(ADMV8818_SOFTRESET_N_MSK, 1) |
FIELD_PREP(ADMV8818_SOFTRESET_MSK, 1));
ret = regmap_write(st->regmap, ADMV8818_REG_SPI_CONFIG_A,
ADMV8818_SOFTRESET_N_MSK | ADMV8818_SOFTRESET_MSK);
if (ret) {
dev_err(&spi->dev, "ADMV8818 Soft Reset failed.\n");
return ret;
}
ret = regmap_update_bits(st->regmap, ADMV8818_REG_SPI_CONFIG_A,
ADMV8818_SDOACTIVE_N_MSK |
ADMV8818_SDOACTIVE_MSK,
FIELD_PREP(ADMV8818_SDOACTIVE_N_MSK, 1) |
FIELD_PREP(ADMV8818_SDOACTIVE_MSK, 1));
ret = regmap_write(st->regmap, ADMV8818_REG_SPI_CONFIG_A,
ADMV8818_SDOACTIVE_N_MSK | ADMV8818_SDOACTIVE_MSK);
if (ret) {
dev_err(&spi->dev, "ADMV8818 SDO Enable failed.\n");
return ret;

4
drivers/iio/light/apds9306.c
View File

@ -108,11 +108,11 @@ static const struct part_id_gts_multiplier apds9306_gts_mul[] = {
{
.part_id = 0xB1,
.max_scale_int = 16,
.max_scale_nano = 3264320,
.max_scale_nano = 326432000,
}, {
.part_id = 0xB3,
.max_scale_int = 14,
.max_scale_nano = 9712000,
.max_scale_nano = 97120000,
},
};

7
drivers/iio/light/hid-sensor-prox.c
View File

@ -49,9 +49,10 @@ static const u32 prox_sensitivity_addresses[] = {
#define PROX_CHANNEL(_is_proximity, _channel) \
{\
.type = _is_proximity ? IIO_PROXIMITY : IIO_ATTENTION,\
.info_mask_separate = _is_proximity ? BIT(IIO_CHAN_INFO_RAW) :\
BIT(IIO_CHAN_INFO_PROCESSED),\
.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |\
.info_mask_separate = \
(_is_proximity ? BIT(IIO_CHAN_INFO_RAW) :\
BIT(IIO_CHAN_INFO_PROCESSED)) |\
BIT(IIO_CHAN_INFO_OFFSET) |\
BIT(IIO_CHAN_INFO_SCALE) |\
BIT(IIO_CHAN_INFO_SAMP_FREQ) |\
BIT(IIO_CHAN_INFO_HYSTERESIS),\

3
drivers/iio/proximity/hx9023s.c
View File

@ -1036,12 +1036,13 @@ static int hx9023s_send_cfg(const struct firmware *fw, struct hx9023s_data *data
return -ENOMEM;
memcpy(bin->data, fw->data, fw->size);
release_firmware(fw);
bin->fw_size = fw->size;
bin->fw_ver = bin->data[FW_VER_OFFSET];
bin->reg_count = get_unaligned_le16(bin->data + FW_REG_CNT_OFFSET);
release_firmware(fw);
return hx9023s_bin_load(data, bin);
}