Skip to content

board: adi: sc846: fix carrier-board config and boot SPI bus #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ozan956 wants to merge 6 commits into
base: adi-u-boot-2025.10.y
Choose a base branch
from
Open

board: adi: sc846: fix carrier-board config and boot SPI bus #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
214ca04
board: adi: sc846: share board_init
ozan956 Aug 5, 2026
9caa2f8
arch: sc5xx: fix wrongly forced symbol
ozan956 Aug 5, 2026
7866610
arch: sc5xx: remove dead symbol
ozan956 Aug 5, 2026
dea2d72
configs: adi: sc846-som: set SPI bus to match hardware
ozan956 Aug 5, 2026
3221887
board: adi: sc846: drop bare-SOM-only config
ozan956 Aug 8, 2026
9c538ea
board: adi: carriers: check gpio_hog_lookup_name
ozan956 Aug 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/top-level.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ jobs:
- 'sc598-htol-spl_defconfig'
- 'sc598-som-ezkit-spl_defconfig'
- 'sc598-som-ezlite-spl_defconfig'
- 'sc846-som_defconfig'
- 'sc846-som-ezkit_defconfig'
- 'xilinx_zynqmp_virt_defconfig'

Expand Down
16 changes: 3 additions & 13 deletions arch/arm/mach-sc5xx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ config SC846
select COMMON_CLK_ADI_SC846
select GICV3
select GICV3_SUPPORT_GIC600
select GIC_600_CLEAR_RDPD
select MMC_SDHCI_ADMA_FORCE_32BIT
select NOP_PHY if PHY
endchoice
Expand Down Expand Up @@ -131,18 +130,10 @@ endif

if SC846

choice
prompt "SC846 64-bit board select"

config TARGET_SC846_SOM
bool
prompt "SC846-SOM (no carrier board)"

config TARGET_SC846_SOM_EZKIT
bool
prompt "SC846-SOM with SOMCRR2-EZKIT (carrier board)"
bool "SC846-SOM with SOMCRR2-EZKIT (carrier board)"
select ADI_CARRIER_SOMCRR2_EZKIT
endchoice

endif

config SC5XX_UBOOT_SPL_OFFSET
Expand Down Expand Up @@ -326,7 +317,7 @@ endchoice

choice
prompt "Analog Devices SC84x SOM Carrier Board Variant"
depends on (SC846)
depends on TARGET_SC846_SOM_EZKIT
default ADI_CARRIER_SOMCRR2_EZKIT
help
Select the specific EV-SOMCRR2 carrier board that you are using.
Expand Down Expand Up @@ -679,7 +670,6 @@ config PINCTRL_ADI
default y

source "board/adi/sc846-som-ezkit/Kconfig"
source "board/adi/sc846-som/Kconfig"
source "board/adi/sc598-som-ezkit/Kconfig"
source "board/adi/sc598-som-ezlite/Kconfig"
source "board/adi/sc594-som-ezkit/Kconfig"
Expand Down
10 changes: 4 additions & 6 deletions board/adi/carriers/somcrr2_ezkit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,14 @@ void adi_somcrr_enable_ethernet(void)
{
struct gpio_desc *eth0_reset;

gpio_hog_lookup_name("eth0-reset", &eth0_reset);

dm_gpio_set_value(eth0_reset, 0);
if (!gpio_hog_lookup_name("eth0-reset", &eth0_reset))
dm_gpio_set_value(eth0_reset, 0);
}

void adi_somcrr_disable_ethernet(void)
{
struct gpio_desc *eth0_reset;

gpio_hog_lookup_name("eth0-reset", &eth0_reset);

dm_gpio_set_value(eth0_reset, 1);
if (!gpio_hog_lookup_name("eth0-reset", &eth0_reset))
dm_gpio_set_value(eth0_reset, 1);
}
3 changes: 1 addition & 2 deletions board/adi/sc846-som/Makefile → board/adi/common-sc846-som/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
#
# (C) Copyright 2025 - Analog Devices, Inc.
# (C) Copyright 2026 - Analog Devices, Inc.
#

obj-y := sc846-som.o
obj-y += ../carriers/
3 changes: 3 additions & 0 deletions board/adi/sc846-som/sc846-som.c → board/adi/common-sc846-som/sc846-som.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@

int board_init(void)
{
adi_somcrr_init_ethernet();
sc5xx_enable_rgmii();

return 0;
}
2 changes: 1 addition & 1 deletion board/adi/sc846-som-ezkit/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
# (C) Copyright 2026 - Analog Devices, Inc.
#

obj-y := sc846-som.o
obj-y := ../common-sc846-som/sc846-som.o
obj-y += ../carriers/
22 changes: 0 additions & 22 deletions board/adi/sc846-som-ezkit/sc846-som.c
View file
Open in desktop

This file was deleted.

162 changes: 0 additions & 162 deletions board/adi/sc846-som/Kconfig
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions board/adi/sc846-som/sc846-som.env
View file
Open in desktop

This file was deleted.

Loading