Skip to content

Conversation

@pamolloy
Copy link
Collaborator

@pamolloy pamolloy commented Nov 4, 2025

This base series is a refactored version of the current adsp-main-6.12 branch. The minimal diff with adsp-main-6.12 is below. Note this is getting merged into a new branch, adsp-6.12.0-y.

I will then apply a set of fixup commits in an attempt to pass CI/CD. Only the fixup commits need to be reviewed.

Once merged adsp-main-6.12 can be replaced. And then this series can be manually rebased on top of adsp-main-6.12.38-y, which contains Artur's series that is being mainlined.

diff --git a/arch/arm/configs/sc594-som-ezkit_defconfig b/arch/arm/configs/sc594-som-ezkit_defconfig
index 95ee136225b73..137f1163bf94a 100644
--- a/arch/arm/configs/sc594-som-ezkit_defconfig
+++ b/arch/arm/configs/sc594-som-ezkit_defconfig
@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="-yocto-standard"
 CONFIG_SYSVIPC=y
 CONFIG_USELIB=y
 CONFIG_GENERIC_IRQ_DEBUGFS=y
diff --git a/arch/arm/mach-sc5xx/Kconfig b/arch/arm/mach-sc5xx/Kconfig
index ca7fc607d2b97..d982ed8496f69 100644
--- a/arch/arm/mach-sc5xx/Kconfig
+++ b/arch/arm/mach-sc5xx/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)-or-later
 menuconfig ARCH_SC5XX
-       bool "SC5xx SoCs (Cortex-A5-based)" 
+       bool "SC5xx SoCs (Cortex-A5-based)"
        depends on ARCH_MULTI_V7
        select ARM_GIC
        select PINCTRL
@@ -46,7 +46,7 @@ config ARCH_SC58X
        select COMMON_CLK_ADI_SC58X
        help
                This enables support for 32-bit Cortex-A5-based ADI ADSP SC-58X
-               SoCs, like the SC589. 
+               SoCs, like the SC589.
 
 config MACH_SC589_MINI
        bool "ADI sc589-mini board"

Signed-off-by: Philip Molloy <[email protected]>
@pamolloy pamolloy requested review from a team, gastmaier and nunojsa November 4, 2025 13:11
UtsavAgarwalADI and others added 8 commits November 4, 2025 14:25
Only supports the ADZS-SC589-MINI

Signed-off-by: Utsav Agarwal <[email protected]>
Signed-off-by: Utsav Agarwal <[email protected]>
Signed-off-by: Arturs Artamonovs <[email protected]>
Co-developed-by: Nathan Barrett-Morrison <[email protected]>
Signed-off-by: Nathan Barrett-Morrison <[email protected]>
Co-developed-by: Greg Malysa <[email protected]>
Signed-off-by: Greg Malysa <[email protected]>
Signed-off-by: Utsav Agarwal <[email protected]>
Signed-off-by: Arturs Artamonovs <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants