Skip to content

Conversation

@pamolloy
Copy link
Collaborator

@pamolloy pamolloy commented Jan 29, 2026

This is just a quick test, rebasing onto 6.18. The conflicts were very minor, just in Makefiles and the like. Still a few compilation errors left to clean up.

  • Squash all commits with Fixes
  • Fix the Fixes to point to ADI commits
  • Reword some of the commit messages
  • Port applicable commits back to 6.12
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
@pamolloy pamolloy added this to ADSP Jan 29, 2026
pamolloy and others added 16 commits January 29, 2026 22:14
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Only supports the ADZS-SC589-MINI

Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
Signed-off-by: UtsavAgarwalADI <utsav.agarwal@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
Signed-off-by: Arturs Artamonovs <arturs.artamonovs@analog.com>
Co-developed-by: Nathan Barrett-Morrison <nathan.morrison@timesys.com>
Signed-off-by: Nathan Barrett-Morrison <nathan.morrison@timesys.com>
Co-developed-by: Greg Malysa <greg.malysa@timesys.com>
Signed-off-by: Greg Malysa <greg.malysa@timesys.com>
Signed-off-by: Utsav Agarwal <Utsav.Agarwal@analog.com>
Signed-off-by: Arturs Artamonovs <arturs.artamonovs@analog.com>
Signed-off-by: Arturs Artamonovs <arturs.artamonovs@analog.com>
Adding SoC audio support for the following modes:

- ASoC (linux only audio)
- SHARC ALSA (Hybrid Audio)
- SHARC

Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
UtsavAgarwalADI and others added 15 commits January 29, 2026 22:14
Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
GPIO works via PINT, which in turn makes it into a
dependency on both, hardware as well as software.

Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
Adding glue layer for adsp platforms sc57x/sc58x.

This is enables support for the following:

* usbboot: Mount and boot into file systems contained on USB devices by
switching OTG to host mode.

* usb gadget audio: Utilize linux's USB gadget for streaming audio from
another device by switching OTG to device mode.

Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
Co-developed-by: Greg Malysa <malysagreg@gmail.com>
Signed-off-by: Greg Malysa <malysagreg@gmail.com>
Co-developed-by: Nathan Barrett-Morrison <nathan.morrison@timesys.com>
Signed-off-by: Nathan Barrett-Morrison <nathan.morrison@timesys.com>
Co-developed-by: Caleb Ethridge <caleb.ethridge@analog.com>
Signed-off-by: Caleb Ethridge <caleb.ethridge@analog.com>
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
Signed-off-by: Arturs Artamonovs <arturs.artamonovs@analog.com>
Signed-off-by: UtsavAgarwalADI <utsav.agarwal@analog.com>
Adding device tree support for sc594-som-ezlite

Signed-off-by: UtsavAgarwalADI <utsav.agarwal@analog.com>
The only evaluation board for the ADSP-SC573 was named EZKIT and EZLITE
in different places

Signed-off-by: UtsavAgarwalADI <utsav.agarwal@analog.com>
Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
… carrier

Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
…EZLITE carrier

Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
… EZKIT carrier

Signed-off-by: Philip Molloy <philip.molloy@analog.com>
…LITE carrier

Signed-off-by: Utsav Agarwal <utsav.agarwal@analog.com>
@pamolloy pamolloy force-pushed the adsp-6.18.0/philip/rebase-adsp-6.12.0 branch from c85eae8 to 1c71d22 Compare January 29, 2026 21:20
@pamolloy pamolloy self-assigned this Jan 29, 2026
pamolloy and others added 9 commits January 30, 2026 16:51
Update the driver to match the new `void` return type and remove the
useless `return 0;`.

The `remove` callback in `struct platform_driver` has transitioned to
returning `void` instead of `int`. This transition started with commit
5c5a768 ("platform: Provide a remove callback that returns no
value"), continued with commit 0edb555 ("platform: Make
platform_driver::remove() return void"), and was finalized in commit
e70140b ("Get rid of "remove_new" relic from platform driver
struct").

Fixes: f72ed8b ("sound: soc: adi: Add ALSA support for ADSP-SC598")
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Update the driver to match the new `void` return type and remove the
useless `return 0;`.

The `remove` callback in `struct platform_driver` has transitioned to
returning `void` instead of `int`. This transition started with commit
5c5a768 ("platform: Provide a remove callback that returns no
value"), continued with commit 0edb555 ("platform: Make
platform_driver::remove() return void"), and was finalized in commit
e70140b ("Get rid of "remove_new" relic from platform driver
struct").

Fixes: f72ed8b ("sound: soc: adi: Add ALSA support for ADSP-SC598")
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
Update `adsp_gpio_set_value` to return `int` and return 0 to match the
expected function signature.

The `set` callback in `struct gpio_chip` now returns `int` instead of
`void`. This change was finalized in recent kernel updates where the
legacy `void` return callbacks were removed and the integer-returning
variants (`set_rv`) were renamed back to `set`.

Fixes: 802ae97 ("gpio: Add GPIO port driver for ADSP-SC5xxx SoCs")
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
The ASoC core has removed the old DAI format macros (SND_SOC_DAIFMT_CBM_CFM,
etc.) in favor of the new Provider/Consumer terminology (SND_SOC_DAIFMT_CBP_CFP).

Update the adau1962 driver to use the new macros to fix compilation errors.

Fixes: 6422edf ("sound: soc: adi: Add ALSA support for ADSP-SC598")
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
The ASoC core has removed the old DAI format macros (SND_SOC_DAIFMT_CBM_CFM,
etc.) in favor of the new Provider/Consumer terminology (SND_SOC_DAIFMT_CBP_CFP).

Update the sc5xx-i2s and sc5xx-asoc-card drivers to use the new macros to
fix compilation errors.

Fixes: 6422edf ("sound: soc: adi: Add ALSA support for ADSP-SC598")
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
del_timer() has been removed from the kernel API. Use timer_delete() instead.

Fixes: 325ef9c ("serial: Add UART driver for SC5xx SoCs")
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
devm_spi_alloc_master() has been removed/renamed to devm_spi_alloc_host().
Update the driver to use the new API.

Fixes: a0ce7f8 ("spi: Add v3 SPI controller support for ADSP-SC5xx")
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
The .remove_new callback has been removed after the transition of .remove
callback to return void is complete. Update the driver to use .remove.

Fixes: aca6a1b ("net: stmmac: dwmac-adi: Add support for ADSP-SC598")
Signed-off-by: Philip Molloy <philip.molloy@analog.com>
The .remove_new callback has been removed after the transition of .remove
callback to return void is complete. Update the driver to use .remove.

Fixes: c2cd6b4 ("misc: sram: adi: Add drivers for ADSP-SCxxx SoCs")
Signed-off-by: Philip Molloy <philip@philipmolloy.com>
@pamolloy pamolloy force-pushed the adsp-6.18.0/philip/rebase-adsp-6.12.0 branch from 1c71d22 to 60b1254 Compare January 30, 2026 16:39
Fixes: fa46a50 ("usb: musb: adi: Adding adsp musb glue layer")
Signed-off-by: Philip Molloy <philip@philipmolloy.com>
The .remove_new callback has been removed after the transition of .remove
callback to return void is complete. Update the driver to use .remove.

Fixes: fa46a50 ("usb: musb: adi: Adding adsp musb glue layer")
Signed-off-by: Philip Molloy <philip@philipmolloy.com>

Signed-off-by: Philip Molloy <philip@philipmolloy.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

4 participants