Merge branch 'master' of git://git.denx.de/u-boot-usb

[karo-tx-uboot.git] / arch / powerpc / cpu / mpc85xx / p3041_ids.c

diff --git a/arch/powerpc/cpu/mpc85xx/p3041_ids.c b/arch/powerpc/cpu/mpc85xx/p3041_ids.c
index e46a714dccd807511777dc762aa33bdf8de18f2e..2b57703b2e57190561ff9c0441ce6192e183e526 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/p3041_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/p3041_ids.c
@@ -1,23 +1,7 @@
 /*
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -27,16 +11,16 @@
 #ifdef CONFIG_SYS_DPAA_QBMAN
 struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
        /* dqrr liodn, frame data liodn, liodn off, sdest */
-       SET_QP_INFO(1, 2, 1, 0),
-       SET_QP_INFO(3, 4, 2, 1),
-       SET_QP_INFO(5, 6, 3, 2),
-       SET_QP_INFO(7, 8, 4, 3),
-       SET_QP_INFO(9, 10, 5, 0),
-       SET_QP_INFO(11, 12, 1, 1),
-       SET_QP_INFO(13, 14, 2, 2),
-       SET_QP_INFO(15, 16, 3, 3),
-       SET_QP_INFO(17, 18, 4, 0), /* for now sdest to 0 */
-       SET_QP_INFO(19, 20, 5, 0), /* for now sdest to 0 */
+       SET_QP_INFO(1,  2,  1, 0),
+       SET_QP_INFO(3,  4,  2, 1),
+       SET_QP_INFO(5,  6,  3, 2),
+       SET_QP_INFO(7,  8,  4, 3),
+       SET_QP_INFO(9, 10,  5, 0),
+       SET_QP_INFO(1, 12,  6, 1),
+       SET_QP_INFO(13, 14,  7, 2),
+       SET_QP_INFO(15, 16,  8, 3),
+       SET_QP_INFO(17, 18,  9, 0), /* for now sdest to 0 */
+       SET_QP_INFO(19, 20, 10, 0), /* for now sdest to 0 */
 };
 #endif
 
@@ -67,8 +51,8 @@ struct liodn_id_table liodn_tbl[] = {
        SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 3, 195),
        SET_PCI_LIODN(CONFIG_SYS_FSL_PCIE_COMPAT, 4, 196),
 
-       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),