env: Rename getenv_hex(), getenv_yesno(), getenv_ulong()

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

diff --git a/arch/powerpc/cpu/mpc85xx/t2080_ids.c b/arch/powerpc/cpu/mpc85xx/t2080_ids.c
index 068e1f26bf3d22eea229c58060134191bf328ce9..868f2d5ca17221cd5e7f81fad48d7abe5960e013 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/t2080_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/t2080_ids.c
@@ -53,17 +53,19 @@ struct liodn_id_table liodn_tbl[] = {
        SET_USB_LIODN(1, "fsl-usb2-mph", 553),
        SET_USB_LIODN(2, "fsl-usb2-dr", 554),
 
+#ifdef CONFIG_FSL_SATA_V2
        SET_SATA_LIODN(1, 555),
        SET_SATA_LIODN(2, 556),
+#endif
 
        SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 1, 148),
        SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 2, 228),
        SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 308),
        SET_PCI_LIODN_BASE(CONFIG_SYS_FSL_PCIE_COMPAT, 4, 388),
 
-       SET_DMA_LIODN(1, 147),
-       SET_DMA_LIODN(2, 227),
-       SET_DMA_LIODN(3, 226),
+       SET_DMA_LIODN(1, "fsl,elo3-dma", 147),
+       SET_DMA_LIODN(2, "fsl,elo3-dma", 227),
+       SET_DMA_LIODN(3, "fsl,elo3-dma", 226),
 
        SET_GUTS_LIODN("fsl,rapidio-delta", 199, rio1liodnr, 0),
        SET_GUTS_LIODN(NULL, 200, rio2liodnr, 0),
@@ -81,7 +83,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, 88),
        SET_FMAN_RX_1G_LIODN(1, 1, 89),
        SET_FMAN_RX_1G_LIODN(1, 2, 90),