SPDX: Convert all of our single license tags to Linux Kernel style

[u-boot] / arch / powerpc / cpu / mpc85xx / t1040_ids.c

diff --git a/arch/powerpc/cpu/mpc85xx/t1040_ids.c b/arch/powerpc/cpu/mpc85xx/t1040_ids.c
index 32075ce220e6c4c299922826bec9a2ec6778ef85..99b52bacdad6fb5970147ae953989b77b2f948a1 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/t1040_ids.c
+++ b/arch/powerpc/cpu/mpc85xx/t1040_ids.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2012 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -21,30 +20,9 @@ struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = {
        SET_QP_INFO(8, 34, 1, 3),
        SET_QP_INFO(9, 35, 1, 0),
        SET_QP_INFO(10, 36, 1, 0),
-       SET_QP_INFO(11, 37, 1, 1),
-       SET_QP_INFO(12, 38, 1, 1),
-       SET_QP_INFO(13, 39, 1, 2),
-       SET_QP_INFO(14, 40, 1, 2),
-       SET_QP_INFO(15, 41, 1, 3),
-       SET_QP_INFO(16, 42, 1, 3),
-       SET_QP_INFO(17, 43, 1, 0),
-       SET_QP_INFO(18, 44, 1, 0),
-       SET_QP_INFO(19, 45, 1, 1),
-       SET_QP_INFO(20, 46, 1, 1),
-       SET_QP_INFO(21, 47, 1, 2),
-       SET_QP_INFO(22, 48, 1, 2),
-       SET_QP_INFO(23, 49, 1, 3),
-       SET_QP_INFO(24, 50, 1, 3),
-       SET_QP_INFO(25, 51, 1, 0),
 };
 #endif
 
-struct srio_liodn_id_table srio_liodn_tbl[] = {
-       SET_SRIO_LIODN_1(1, 307),
-       SET_SRIO_LIODN_1(2, 387),
-};
-int srio_liodn_tbl_sz = ARRAY_SIZE(srio_liodn_tbl);
-
 struct liodn_id_table liodn_tbl[] = {
 #ifdef CONFIG_SYS_DPAA_QBMAN
        SET_QMAN_LIODN(62),
@@ -53,32 +31,36 @@ struct liodn_id_table liodn_tbl[] = {
 
        SET_SDHC_LIODN(1, 552),
 
+       SET_PME_LIODN(117),
+
        SET_USB_LIODN(1, "fsl-usb2-mph", 553),
+       SET_USB_LIODN(2, "fsl-usb2-dr", 554),
 
-       SET_PCI_LIODN("fsl,qoriq-pcie-v2.2", 1, 148),
+       SET_SATA_LIODN(1, 555),
+       SET_SATA_LIODN(2, 556),
 
-       SET_DMA_LIODN(1, 147),
-       SET_DMA_LIODN(2, 227),
+       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_GUTS_LIODN("fsl,rapidio-delta", 199, rio1liodnr, 0),
-       SET_GUTS_LIODN(NULL, 200, rio2liodnr, 0),
-       SET_GUTS_LIODN(NULL, 201, rio1maintliodnr, 0),
-       SET_GUTS_LIODN(NULL, 202, rio2maintliodnr, 0),
+       SET_DMA_LIODN(1, "fsl,elo3-dma", 147),
+       SET_DMA_LIODN(2, "fsl,elo3-dma", 227),
 
        /* SET_NEXUS_LIODN(557), -- not yet implemented */
+       SET_QE_LIODN(559),
+       SET_TDM_LIODN(560),
 };
 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),
        SET_FMAN_RX_1G_LIODN(1, 3, 91),
        SET_FMAN_RX_1G_LIODN(1, 4, 92),
        SET_FMAN_RX_1G_LIODN(1, 5, 93),
-       SET_FMAN_RX_10G_LIODN(1, 0, 94),
-       SET_FMAN_RX_10G_LIODN(1, 1, 95),
 };
 int fman1_liodn_tbl_sz = ARRAY_SIZE(fman1_liodn_tbl);
 #endif
@@ -94,26 +76,21 @@ struct liodn_id_table sec_liodn_tbl[] = {
        SET_SEC_RTIC_LIODN_ENTRY(d, 551),
        SET_SEC_DECO_LIODN_ENTRY(0, 541, 610),
        SET_SEC_DECO_LIODN_ENTRY(1, 542, 611),
+       SET_SEC_DECO_LIODN_ENTRY(2, 543, 612),
+       SET_SEC_DECO_LIODN_ENTRY(3, 544, 613),
+       SET_SEC_DECO_LIODN_ENTRY(4, 545, 614),
+       SET_SEC_DECO_LIODN_ENTRY(5, 546, 615),
+       SET_SEC_DECO_LIODN_ENTRY(6, 547, 616),
+       SET_SEC_DECO_LIODN_ENTRY(7, 548, 617),
 };
 int sec_liodn_tbl_sz = ARRAY_SIZE(sec_liodn_tbl);
 
-#ifdef CONFIG_SYS_DPAA_RMAN
-struct liodn_id_table rman_liodn_tbl[] = {
-       /* Set RMan block 0-3 liodn offset */
-       SET_RMAN_LIODN(0, 678),
-       SET_RMAN_LIODN(1, 679),
-       SET_RMAN_LIODN(2, 680),
-       SET_RMAN_LIODN(3, 681),
-};
-int rman_liodn_tbl_sz = ARRAY_SIZE(rman_liodn_tbl);
-#endif
-
 struct liodn_id_table liodn_bases[] = {
        [FSL_HW_PORTAL_SEC]  = SET_LIODN_BASE_2(462, 558),
 #ifdef CONFIG_SYS_DPAA_FMAN
        [FSL_HW_PORTAL_FMAN1] = SET_LIODN_BASE_1(973),
 #endif
-#ifdef CONFIG_SYS_DPAA_RMAN
-       [FSL_HW_PORTAL_RMAN] = SET_LIODN_BASE_1(922),
+#ifdef CONFIG_SYS_DPAA_PME
+       [FSL_HW_PORTAL_PME]   = SET_LIODN_BASE_2(770, 846),
 #endif
 };