Skip to content

Commit 32cfb3c

Browse files
committed
Merge tag 'char-misc-6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull misc driver fixes from Greg KH: "Here are some small char/misc/iio fixes for 6.12-rc6 that resolve some reported issues. Included in here are the following: - small IIO driver fixes for many reported issues - mei driver fix for a suddenly much reported issue for an "old" issue. - MAINTAINERS update for a developer who has moved companies and forgot to update their old entry. All of these have been in linux-next this week with no reported issues" * tag 'char-misc-6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: mei: use kvmalloc for read buffer MAINTAINERS: add netup_unidvb maintainer iio: dac: Kconfig: Fix build error for ltc2664 iio: adc: ad7124: fix division by zero in ad7124_set_channel_odr() staging: iio: frequency: ad9832: fix division by zero in ad9832_calc_freqreg() docs: iio: ad7380: fix supply for ad7380-4 iio: adc: ad7380: fix supplies for ad7380-4 iio: adc: ad7380: add missing supplies iio: adc: ad7380: use devm_regulator_get_enable_read_voltage() dt-bindings: iio: adc: ad7380: fix ad7380-4 reference supply iio: light: veml6030: fix microlux value calculation iio: gts-helper: Fix memory leaks for the error path of iio_gts_build_avail_scale_table() iio: gts-helper: Fix memory leaks in iio_gts_build_avail_scale_table()
2 parents 295ba65 + d0bc3b9 commit 32cfb3c

File tree

10 files changed

+177
-68
lines changed

10 files changed

+177
-68
lines changed

Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ properties:
6767
A 2.5V to 3.3V supply for the external reference voltage. When omitted,
6868
the internal 2.5V reference is used.
6969

70+
refin-supply:
71+
description:
72+
A 2.5V to 3.3V supply for external reference voltage, for ad7380-4 only.
73+
7074
aina-supply:
7175
description:
7276
The common mode voltage supply for the AINA- pin on pseudo-differential
@@ -135,6 +139,23 @@ allOf:
135139
ainc-supply: false
136140
aind-supply: false
137141

142+
# ad7380-4 uses refin-supply as external reference.
143+
# All other chips from ad738x family use refio as optional external reference.
144+
# When refio-supply is omitted, internal reference is used.
145+
- if:
146+
properties:
147+
compatible:
148+
enum:
149+
- adi,ad7380-4
150+
then:
151+
properties:
152+
refio-supply: false
153+
required:
154+
- refin-supply
155+
else:
156+
properties:
157+
refin-supply: false
158+
138159
examples:
139160
- |
140161
#include <dt-bindings/interrupt-controller/irq.h>

Documentation/iio/ad7380.rst

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,22 @@ supports only 1 SDO line.
4141
Reference voltage
4242
-----------------
4343

44-
2 possible reference voltage sources are supported:
44+
ad7380-4
45+
~~~~~~~~
46+
47+
ad7380-4 supports only an external reference voltage (2.5V to 3.3V). It must be
48+
declared in the device tree as ``refin-supply``.
49+
50+
All other devices from ad738x family
51+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
52+
53+
All other devices from ad738x support 2 possible reference voltage sources:
4554

4655
- Internal reference (2.5V)
4756
- External reference (2.5V to 3.3V)
4857

4958
The source is determined by the device tree. If ``refio-supply`` is present,
50-
then the external reference is used, else the internal reference is used.
59+
then it is used as external reference, else the internal reference is used.
5160

5261
Oversampling and resolution boost
5362
---------------------------------

MAINTAINERS

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14141,6 +14141,15 @@ S: Maintained
1414114141
T: git git://linuxtv.org/media_tree.git
1414214142
F: drivers/media/platform/nxp/imx-pxp.[ch]
1414314143

14144+
MEDIA DRIVERS FOR ASCOT2E
14145+
M: Abylay Ospan <aospan@amazon.com>
14146+
L: linux-media@vger.kernel.org
14147+
S: Supported
14148+
W: https://linuxtv.org
14149+
W: http://netup.tv/
14150+
T: git git://linuxtv.org/media_tree.git
14151+
F: drivers/media/dvb-frontends/ascot2e*
14152+
1414414153
MEDIA DRIVERS FOR CXD2099AR CI CONTROLLERS
1414514154
M: Jasmin Jessich <jasmin@anw.at>
1414614155
L: linux-media@vger.kernel.org
@@ -14149,6 +14158,15 @@ W: https://linuxtv.org
1414914158
T: git git://linuxtv.org/media_tree.git
1415014159
F: drivers/media/dvb-frontends/cxd2099*
1415114160

14161+
MEDIA DRIVERS FOR CXD2841ER
14162+
M: Abylay Ospan <aospan@amazon.com>
14163+
L: linux-media@vger.kernel.org
14164+
S: Supported
14165+
W: https://linuxtv.org
14166+
W: http://netup.tv/
14167+
T: git git://linuxtv.org/media_tree.git
14168+
F: drivers/media/dvb-frontends/cxd2841er*
14169+
1415214170
MEDIA DRIVERS FOR CXD2880
1415314171
M: Yasunari Takiguchi <Yasunari.Takiguchi@sony.com>
1415414172
L: linux-media@vger.kernel.org
@@ -14193,13 +14211,49 @@ F: drivers/media/platform/nxp/imx-mipi-csis.c
1419314211
F: drivers/media/platform/nxp/imx7-media-csi.c
1419414212
F: drivers/media/platform/nxp/imx8mq-mipi-csi2.c
1419514213

14214+
MEDIA DRIVERS FOR HELENE
14215+
M: Abylay Ospan <aospan@amazon.com>
14216+
L: linux-media@vger.kernel.org
14217+
S: Supported
14218+
W: https://linuxtv.org
14219+
W: http://netup.tv/
14220+
T: git git://linuxtv.org/media_tree.git
14221+
F: drivers/media/dvb-frontends/helene*
14222+
14223+
MEDIA DRIVERS FOR HORUS3A
14224+
M: Abylay Ospan <aospan@amazon.com>
14225+
L: linux-media@vger.kernel.org
14226+
S: Supported
14227+
W: https://linuxtv.org
14228+
W: http://netup.tv/
14229+
T: git git://linuxtv.org/media_tree.git
14230+
F: drivers/media/dvb-frontends/horus3a*
14231+
14232+
MEDIA DRIVERS FOR LNBH25
14233+
M: Abylay Ospan <aospan@amazon.com>
14234+
L: linux-media@vger.kernel.org
14235+
S: Supported
14236+
W: https://linuxtv.org
14237+
W: http://netup.tv/
14238+
T: git git://linuxtv.org/media_tree.git
14239+
F: drivers/media/dvb-frontends/lnbh25*
14240+
1419614241
MEDIA DRIVERS FOR MXL5XX TUNER DEMODULATORS
1419714242
L: linux-media@vger.kernel.org
1419814243
S: Orphan
1419914244
W: https://linuxtv.org
1420014245
T: git git://linuxtv.org/media_tree.git
1420114246
F: drivers/media/dvb-frontends/mxl5xx*
1420214247

14248+
MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
14249+
M: Abylay Ospan <aospan@amazon.com>
14250+
L: linux-media@vger.kernel.org
14251+
S: Supported
14252+
W: https://linuxtv.org
14253+
W: http://netup.tv/
14254+
T: git git://linuxtv.org/media_tree.git
14255+
F: drivers/media/pci/netup_unidvb/*
14256+
1420314257
MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
1420414258
M: Dmitry Osipenko <digetx@gmail.com>
1420514259
L: linux-media@vger.kernel.org

drivers/iio/adc/ad7124.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ static int ad7124_write_raw(struct iio_dev *indio_dev,
637637

638638
switch (info) {
639639
case IIO_CHAN_INFO_SAMP_FREQ:
640-
if (val2 != 0) {
640+
if (val2 != 0 || val == 0) {
641641
ret = -EINVAL;
642642
break;
643643
}

0 commit comments

Comments
 (0)