random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

arm: mvebu: turris_omnia: Extract code for disabling sata/pcie

Browse Source 
Move code for disabling sata and pcie DT nodes to own functions, so this
code can be called from other places in follow up patches.

Signed-off-by: Pali Rohár <pali@kernel.org>
This commit is contained in:
Pali Rohár 2022-03-02 12:47:56 +01:00 committed by Stefan Roese
parent 1da19dcf3b
commit d80276870d
1 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
board/CZ.NIC/turris_omnia/turris_omnia.c
View File

@ -511,10 +511,53 @@ void spl_board_init(void)
#if IS_ENABLED(CONFIG_OF_BOARD_FIXUP) || IS_ENABLED(CONFIG_OF_BOARD_SETUP) #if IS_ENABLED(CONFIG_OF_BOARD_FIXUP) || IS_ENABLED(CONFIG_OF_BOARD_SETUP)
static void fixup_serdes_0_nodes(void *blob) static void disable_sata_node(void *blob)
{
int node;
fdt_for_each_node_by_compatible(node, blob, -1, "marvell,armada-380-ahci") {
if (!fdtdec_get_is_enabled(blob, node))
continue;
if (fdt_status_disabled(blob, node) < 0)
printf("Cannot disable SATA DT node!\n");
else
debug("Disabled SATA DT node\n");
break;
}
}
static void disable_pcie_node(void *blob, int port)
{
int node;
fdt_for_each_node_by_compatible(node, blob, -1, "marvell,armada-370-pcie") {
int port_node;
if (!fdtdec_get_is_enabled(blob, node))
continue;
fdt_for_each_subnode (port_node, blob, node) {
if (!fdtdec_get_is_enabled(blob, port_node))
continue;
if (fdtdec_get_int(blob, port_node, "marvell,pcie-port", -1) != port)
continue;
if (fdt_status_disabled(blob, port_node) < 0)
printf("Cannot disable PCIe port %d DT node!\n", port);
else
debug("Disabled PCIe port %d DT node\n", port);
return;
}
}
}
static void fixup_msata_port_nodes(void *blob)
{ {
bool mode_sata; bool mode_sata;
int node;
/* /*
* Determine if SerDes 0 is configured to SATA mode. * Determine if SerDes 0 is configured to SATA mode.
@ -534,47 +577,12 @@ static void fixup_serdes_0_nodes(void *blob)
return; return;
} }
/* If mSATA card is not present, disable SATA DT node */
if (!mode_sata) { if (!mode_sata) {
fdt_for_each_node_by_compatible(node, blob, -1, /* If mSATA card is not present, disable SATA DT node */
"marvell,armada-380-ahci") { disable_sata_node(blob);
if (!fdtdec_get_is_enabled(blob, node)) } else {
continue; /* Otherwise disable PCIe port 0 DT node (MiniPCIe / mSATA port) */
disable_pcie_node(blob, 0);
if (fdt_status_disabled(blob, node) < 0)
printf("Cannot disable SATA DT node!\n");
else
debug("Disabled SATA DT node\n");
break;
}
return;
}
/* Otherwise disable PCIe port 0 DT node (MiniPCIe / mSATA port) */
fdt_for_each_node_by_compatible(node, blob, -1,
"marvell,armada-370-pcie") {
int port;
if (!fdtdec_get_is_enabled(blob, node))
continue;
fdt_for_each_subnode (port, blob, node) {
if (!fdtdec_get_is_enabled(blob, port))
continue;
if (fdtdec_get_int(blob, port, "marvell,pcie-port",
-1) != 0)
continue;
if (fdt_status_disabled(blob, port) < 0)
printf("Cannot disable PCIe port 0 DT node!\n");
else
debug("Disabled PCIe port 0 DT node\n");
return;
}
} }
} }
@ -583,7 +591,7 @@ static void fixup_serdes_0_nodes(void *blob)
#if IS_ENABLED(CONFIG_OF_BOARD_FIXUP) #if IS_ENABLED(CONFIG_OF_BOARD_FIXUP)
int board_fix_fdt(void *blob) int board_fix_fdt(void *blob)
{ {
fixup_serdes_0_nodes(blob); fixup_msata_port_nodes(blob);
return 0; return 0;
} }
@ -728,7 +736,7 @@ fail:
int ft_board_setup(void *blob, struct bd_info *bd) int ft_board_setup(void *blob, struct bd_info *bd)
{ {
fixup_spi_nor_partitions(blob); fixup_spi_nor_partitions(blob);
fixup_serdes_0_nodes(blob); fixup_msata_port_nodes(blob);
return 0; return 0;
} }