Skip to content

linux-v6.12.y-2026r1 : adi-i3c-master + ad4062 backport for release branch#3185

Open
gastmaier wants to merge 25 commits intoxlnx/release/linux-v6.12.y-2026r1from
staging/2026_R1/ad4062
Open

linux-v6.12.y-2026r1 : adi-i3c-master + ad4062 backport for release branch#3185
gastmaier wants to merge 25 commits intoxlnx/release/linux-v6.12.y-2026r1from
staging/2026_R1/ad4062

Conversation

@gastmaier
Copy link
Collaborator

@gastmaier gastmaier commented Mar 13, 2026 •
edited
Loading

PR Description

Backports adi-i3c-master.c and ad4062.c from linux 7.0 to 6.12.
Changes needed are added as fixup commits with clean autosquash.

Pre-autosquash edition: 59ca5cd

PR Type

  • Bug fix (a change that fixes an issue)
  • New feature (a change that adds new functionality)
  • Breaking change (a change that affects other repos or cause CIs to fail)

PR Checklist

  • I have conducted a self-review of my own code changes
  • I have compiled my changes, including the documentation
  • I have tested the changes on the relevant hardware
  • I have updated the documentation outside this repo accordingly
  • I have provided links for the relevant upstream lore

@gastmaier
Ports the ad4062 from linux 7.0 to 6.12
bfdfde3 
Skipped: 323bbfc ("Convert 'alloc_flex' family to use the new default GFP_KERNEL argument")
Skipped: bf4afc5 ("Convert 'alloc_obj' family to use the new default GFP_KERNEL argument")
Skipped: 69050f8 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types")
Skipped: eaa0870 ("i3c: master: switch to use new callback .i3c_xfers() from .priv_xfers()")
Skipped: a02d46b ("iio: adc: ad4062: Switch from struct i3c_priv_xfer to struct i3c_xfer")

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
@gastmaier gastmaier force-pushed the staging/2026_R1/ad4062 branch from 65a2515 to e7fe59b Compare March 13, 2026 14:38
@gastmaier gastmaier changed the title Staging/2026 r1/ad4062 linux-v6.12.y-2026r1 : adi-i3c-master + ad4062 backport for release branch Mar 13, 2026
@gastmaier gastmaier marked this pull request as ready for review March 13, 2026 14:57
@gastmaier gastmaier force-pushed the staging/2026_R1/ad4062 branch 2 times, most recently from 04b6115 to 59ca5cd Compare March 13, 2026 16:57
gastmaier and others added 8 commits March 13, 2026 18:16
@gastmaier
i3c: master: Add driver for Analog Devices I3C Controller IP
9c4a7f5 
Add support for Analog Devices I3C Controller IP, an AXI-interfaced IP
core that supports I3C and I2C devices, multiple speed-grades and
I3C IBIs.

Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Link: https://lore.kernel.org/r/20250827-adi-i3c-master-v9-2-04413925abe1@analog.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit a79ac2c)

Changes:
- adi_i3c_master_i2c_xfers.msg : struct i2c_msg -> const struct i2c_msg
- devm_clk_bulk_get_all_enabled -> devm_clk_bulk_get_all_enable
@alexandrebelloni @gastmaier
i3c: master: adi: fix header location
8b12955 
The adi-axi-common header has been moved to the upper directory.

Acked-by: Jorge Marques <jorge.marques@analog.com>
Link: https://lore.kernel.org/r/20250519-dev-axi-clkgen-limits-v6-3-bc4b3b61d1d4@analog.com
Acked-by: Nuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20250916091252.39265-1-alexandre.belloni@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 3ab1da2)
@alexandrebelloni @gastmaier
i3c: master: adi: fix number of bytes written to fifo
4376c0f 
adi_i3c_master_wr_to_tx_fifo computes the maximum number of bytes that can be
sent to the fifo but never makes use of it, actually limit the number of bytes
sent.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202509190505.fKGvEJRa-lkp@intel.com/
Reviewed-by: Jorge Marques <jorge.marques@analog.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20250924195600.122142-1-alexandre.belloni@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 8a1f3fd)
@krzk @gastmaier
i3c: adi: Fix confusing cleanup.h syntax
0b17368 
Initializing automatic __free variables to NULL without need (e.g.
branches with different allocations), followed by actual allocation is
in contrary to explicit coding rules guiding cleanup.h:

"Given that the "__free(...) = NULL" pattern for variables defined at
the top of the function poses this potential interdependency problem the
recommendation is to always define and assign variables in one statement
and not group variable definitions at the top of the function when
__free() is used."

Code does not have a bug, but is less readable and uses discouraged
coding practice, so fix that by moving declaration to the place of
assignment.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Link: https://patch.msgid.link/20251208020750.4727-4-krzysztof.kozlowski@oss.qualcomm.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 136209e)
@gastmaier
i3c: master: Add inline i3c_readl_fifo() and i3c_writel_fifo()
adcc7e6 
The I3C abstraction expects u8 buffers, but some controllers operate with
a 32-bit bus width FIFO and cannot flag valid bytes individually. To avoid
reading or writing outside the buffer bounds, use 32-bit accesses where
possible and apply memcpy for any remaining bytes

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Suggested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20250624-i3c-writesl-readsl-v3-1-63ccf0870f01@analog.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 733b439)
@arndb @gastmaier
i3c: fix big-endian FIFO transfers
fa33880 
Short MMIO transfers that are not a multiple of four bytes in size need
a special case for the final bytes, however the existing implementation
is not endian-safe and introduces an incorrect byteswap on big-endian
kernels.

This usually does not cause problems because most systems are
little-endian and most transfers are multiple of four bytes long, but
still needs to be fixed to avoid the extra byteswap.

Change the special case for both i3c_writel_fifo() and i3c_readl_fifo()
to use non-byteswapping writesl() and readsl() with a single element
instead of the byteswapping writel()/readl() that are meant for individual
MMIO registers. As data is copied between a FIFO and a memory buffer,
the writesl()/readsl() loops are typically based on __raw_readl()/
__raw_writel(), resulting in the order of bytes in the FIFO to match
the order in the buffer, regardless of the CPU endianess.

The earlier versions in the dw-i3c and i3c-master-cdns had a correct
implementation, but the generic version that was recently added broke it.

Fixes: 733b439 ("i3c: master: Add inline i3c_readl_fifo() and i3c_writel_fifo()")
Cc: Manikanta Guntupalli <manikanta.guntupalli@amd.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Jorge Marques <jorge.marques@analog.com>
Link: https://lore.kernel.org/r/20250924201837.3691486-1-arnd@kernel.org
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit d6ddd9b)
@gastmaier
i3c: add missing include to internal header
9bbde5e 
LKP found a random config which failed to build because IO accessors
were not defined:

   In file included from drivers/i3c/master.c:21:
   drivers/i3c/internals.h: In function 'i3c_writel_fifo':
>> drivers/i3c/internals.h:35:9: error: implicit declaration of function 'writesl' [-Werror=implicit-function-declaration]

Add the proper header to where the IO accessors are used.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202507150208.BZDzzJ5E-lkp@intel.com/
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Link: https://lore.kernel.org/r/20250717120046.9022-2-wsa+renesas@sang-engineering.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 3b661ca)
@gastmaier
bitops: add generic parity calculation for u8
a73102b 
There are multiple open coded implementations for getting the parity of
a byte in the kernel, even using different approaches. Take the pretty
efficient version from SPD5118 driver and make it generally available by
putting it into the bitops header. As long as there is just one parity
calculation helper, the creation of a distinct 'parity.h' header was
discarded. Also, the usage of hweight8() for architectures having a
popcnt instruction is postponed until a use case within hot paths is
desired. The motivation for this patch is the frequent use of odd parity
in the I3C specification and to simplify drivers there.

Changes compared to the original SPD5118 version are the addition of
kernel documentation, switching the return type from bool to int, and
renaming the argument of the function.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Yury Norov <yury.norov@gmail.com>
Reviewed-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Tested-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Link: https://lore.kernel.org/r/20250107090204.6593-2-wsa+renesas@sang-engineering.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit c320592)
@gastmaier gastmaier force-pushed the staging/2026_R1/ad4062 branch from 59ca5cd to 52f0e45 Compare March 13, 2026 17:22
@gastmaier
dt-bindings: iio: adc: Add adi,ad4062
7724942 
Add dt-bindings for AD4062 family, devices AD4060/AD4062, low-power with
monitor capabilities SAR ADCs. Each variant of the family differs in
resolution. The device contains two outputs (gp0, gp1). The outputs can
be configured for range of options, such as threshold and data ready.
The device uses a 2-wire I3C interface.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Reviewed-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
(cherry picked from commit 9e6c765)
@gastmaier
docs: iio: New docs for ad4062 driver
00f5c83 
This adds a new page to document how to use the ad4062 ADC driver.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
(cherry picked from commit 1b1ddab)
@gastmaier
iio: adc: Add support for ad4062
0756318 
The AD4060/AD4062 are versatile, 16-bit/12-bit, successive approximation
register (SAR) analog-to-digital converter (ADC) with low-power and
threshold monitoring modes.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
(cherry picked from commit d528440)

Changes:
- PM_RUNTIME_ACQUIRE -> pm_runtime_resume_and_get
gastmaier and others added 13 commits March 13, 2026 19:42
@gastmaier
docs: iio: ad4062: Add IIO Trigger support
6e58b2e 
Explains the IIO Trigger support and timings involved.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
(cherry picked from commit c31721d)
@gastmaier
iio: adc: ad4062: Add IIO Trigger support
8eee45d 
Adds support for IIO Trigger. Optionally, gp1 is assigned as Data Ready
signal, if not present, fallback to an I3C IBI with the same role.
The software trigger is allocated by the device, but must be attached by
the user before enabling the buffer. The purpose is to not impede
removing the driver due to the increased reference count when
iio_trigger_set_immutable() or iio_trigger_get() is used.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
(cherry picked from commit 23cc922)

Changes:
- iio_push_to_buffers_with_ts -> iio_push_to_buffers_with_timestamp
- PM_RUNTIME_ACQUIRE -> pm_runtime_resume_and_get
@gastmaier
docs: iio: ad4062: Add IIO Events support
8a49a13 
Explains the IIO Events support.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
(cherry picked from commit c894e05)
@gastmaier
iio: adc: ad4062: Add IIO Events support
a5fc546 
Adds support for IIO Events. Optionally, gp0 is assigned as Threshold
Either signal, if not present, fallback to an I3C IBI with the same
role.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
(cherry picked from commit ba3a34b)

Changes:
- PM_RUNTIME_ACQUIRE -> pm_runtime_resume_and_get
- ad4062_monitor_mode_enable.state : bool -> int
@gastmaier
docs: iio: ad4062: Add GPIO Controller support
30c8104 
Explains the GPIO controller support with emphasis on the mask
depending on which GPs are exposed.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
(cherry picked from commit d2ca7af)
@gastmaier
iio: adc: ad4062: Add GPIO Controller support
1c53e50 
When gp0 or gp1 is not taken as an interrupt, expose them as GPO if
gpio-contoller is set in the devicetree. gpio-regmap is not used
because the GPO static low is 'b101 and static high is 0b110; low state
requires setting bit 0, not fitting the abstraction of low=0 and
high=mask.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
Reviewed-by: Linus Walleij <linusw@kernel.org>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
(cherry picked from commit da1d359)

Changes:
- ad4062_gpio_set : int -> void
@gastmaier
iio: adc: ad4062: Add missing IS_ERR() check
9d494c2 
In the function ad4062_sizeof_storagebits() iio_get_current_scan_type()
is called which can return an error pointer and is not checked for it.
Also the function ad4062_sizeof_storagebits() returns type size_t but,
is only used once and the variable assigned from it is type u8.

Add check for error pointer in ad4062_sizeof_storagebits() and change
return type to int so the error code can be properly propagated and then
checked.

Fixes: 23cc922 ("iio: adc: ad4062: Add IIO Trigger support")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
Closes: https://lore.kernel.org/r/202512280539.AholFF7m-lkp@intel.com/
Signed-off-by: Ethan Tidmore <ethantidmore06@gmail.com>
Reviewed-by: Jorge Marques <jorge.marques@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
(cherry picked from commit 5cf5654)
@outman119 @gastmaier
iio: adc: ad4062: Replace IRQF_ONESHOT with IRQF_NO_THREAD
024323b 
In ad4062_request_irq(), when request irq for "gp1", the code uses
IRQF_ONESHOT flag, which is not appropriate for a primary handler
that does not have a secondary threaded handler.

And since commit aef30c8 ("genirq: Warn about using IRQF_ONESHOT
without a threaded handler"), the IRQ core checks IRQF_ONESHOT flag
in IRQ request and gives a warning if there is no threaded handler.

Since there is no threaded handler, replace devm_request_threaded_irq
with devm_request_irq, and replace IRQF_ONESHOT with IRQF_NO_THREAD.

Also remove an extraneous semicolon at the end of
ad4062_write_raw_dispatch().

Found by code review, compile pass.

Fixes: d528440 ("iio: adc: Add support for ad4062")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
(cherry picked from commit 20c2a46)
@gastmaier
iio: Kconfig.adi: imply AD4062
d31409e 
Add entry for the AD4062 driver.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
@gastmaier
arm: socfpga_adi_defconfig: enable ADI_I3C_MASTER
b3c3e2f 
Required for DE10-Nano with AD4062.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
@gastmaier
arm: adi_versal_defconfig: enable ADI_I3C_MASTER
1c6c510 
Required for AD4062.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
@gastmaier
arm: dts: xilinx: Add dts for AD4060 on cora
c91688c 
Add device tree for using AD4060 on CoraZ7.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
@gastmaier
arm: dts: xilinx: Add dts for AD4062 on cora
3a0a0ca 
Add device tree for using AD4062 on CoraZ7.

Signed-off-by: Jorge Marques <jorge.marques@analog.com>
@gastmaier gastmaier force-pushed the staging/2026_R1/ad4062 branch from 52f0e45 to 3a0a0ca Compare March 13, 2026 18:42
@gastmaier gastmaier mentioned this pull request Mar 13, 2026
Draft
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nunojsa nunojsa Awaiting requested review from nunojsa nunojsa is a code owner

@mhennerich mhennerich Awaiting requested review from mhennerich mhennerich is a code owner

@dbogdan dbogdan Awaiting requested review from dbogdan dbogdan is a code owner

@btogorean btogorean Awaiting requested review from btogorean btogorean is a code owner

@chegbeli chegbeli Awaiting requested review from chegbeli chegbeli is a code owner

@buha buha Awaiting requested review from buha buha is a code owner

@amiclaus amiclaus Awaiting requested review from amiclaus amiclaus is a code owner

@rbolboac rbolboac Awaiting requested review from rbolboac rbolboac is a code owner

@danmois danmois Awaiting requested review from danmois danmois is a code owner

@CiprianRegus CiprianRegus Awaiting requested review from CiprianRegus CiprianRegus is a code owner

@machschmitt machschmitt Awaiting requested review from machschmitt machschmitt is a code owner

@stefpopa stefpopa Awaiting requested review from stefpopa stefpopa is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@gastmaier @alexandrebelloni @krzk @arndb @outman119