Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / arch / powerpc / cpu / mpc85xx / p2041_ids.c

diff --git a/arch/powerpc/cpu/mpc85xx/p2041_ids.c b/arch/powerpc/cpu/mpc85xx/p2041_ids.c
index 488e078467c2a1925852ebc220fe7e7ba8d9e91d..8a8334667824ccd969ed4898a570a03abbf282f6 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/p2041_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p2041_ids.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2011 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -50,8 +49,8 @@ struct liodn_id_table liodn_tbl[] = {
        SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 2, 194),
        SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 195),
 
-       SET_DMA_LIODN(1, 197),
-       SET_DMA_LIODN(2, 198),
+       SET_DMA_LIODN(1, "fsl,eloplus-dma", 197),
+       SET_DMA_LIODN(2, "fsl,eloplus-dma", 198),
 
        SET_GUTS_LIODN("fsl,rapidio-delta", 199, rio1liodnr, 0),
        SET_GUTS_LIODN(NULL, 200, rio2liodnr, 0),
@@ -61,7 +60,7 @@ struct liodn_id_table liodn_tbl[] = {
 int liodn_tbl_sz = ARRAY_SIZE(liodn_tbl);
 
 #ifdef CONFIG_SYS_DPAA_FMAN
-struct liodn_id_table fman1_liodn_tbl[] = {
+struct fman_liodn_id_table fman1_liodn_tbl[] = {
        SET_FMAN_RX_1G_LIODN(1, 0, 10),
        SET_FMAN_RX_1G_LIODN(1, 1, 11),
        SET_FMAN_RX_1G_LIODN(1, 2, 12),