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

[karo-tx-uboot.git] / board / freescale / common / cds_pci_ft.c

diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c
index 6f221aff26fcfa79969fb563c128850cbbd01e3c..571dfbbaada6e6607ebd1f416259a2dd43d16470 100644 (file)
--- a/board/freescale/common/cds_pci_ft.c
+++ b/board/freescale/common/cds_pci_ft.c
@@ -1,23 +1,7 @@
 /*
  * Copyright 2004 Freescale Semiconductor.
  *
- * 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>
@@ -28,13 +12,13 @@
 #if defined(CONFIG_OF_BOARD_SETUP)
 static void cds_pci_fixup(void *blob)
 {
-       int node, tmp[2];
+       int node;
        const char *path;
        int len, slot, i;
-       u32 *map = NULL;
+       u32 *map = NULL, *piccells = NULL;
+       int off, cells;
 
        node = fdt_path_offset(blob, "/aliases");
-       tmp[0] = 0;
        if (node >= 0) {
                path = fdt_getprop(blob, node, "pci0", NULL);
                if (path) {
@@ -42,6 +26,25 @@ static void cds_pci_fixup(void *blob)
                        if (node >= 0) {
                                map = fdt_getprop_w(blob, node, "interrupt-map", &len);
                        }
+                       /* Each item in "interrupt-map" property is translated with
+                        * following cells:
+                        * PCI #address-cells, PCI #interrupt-cells,
+                        * PIC address, PIC #address-cells, PIC #interrupt-cells.
+                        */
+                       cells = fdt_getprop_u32_default(blob, path, "#address-cells", 1);
+                       cells += fdt_getprop_u32_default(blob, path, "#interrupt-cells", 1);
+                       off = fdt_node_offset_by_phandle(blob, fdt32_to_cpu(*(map+cells)));
+                       if (off <= 0)
+                               return;
+                       cells += 1;
+                       piccells = (u32 *)fdt_getprop(blob, off, "#address-cells", NULL);
+                       if (piccells == NULL)
+                               return;
+                       cells += *piccells;
+                       piccells = (u32 *)fdt_getprop(blob, off, "#interrupt-cells", NULL);
+                       if (piccells == NULL)
+                               return;
+                       cells += *piccells;
                }
        }
 
@@ -50,23 +53,24 @@ static void cds_pci_fixup(void *blob)
 
                slot = get_pci_slot();
 
-               for (i=0;i<len;i+=7) {
+               for (i=0;i<len;i+=cells) {
                        /* We rotate the interrupt pins so that the mapping
                         * changes depending on the slot the carrier card is in.
                         */
                        map[3] = ((map[3] + slot - 2) % 4) + 1;
-                       map+=7;
+                       map+=cells;
                }
        }
 }
 
-void
-ft_board_setup(void *blob, bd_t *bd)
+int ft_board_setup(void *blob, bd_t *bd)
 {
        ft_cpu_setup(blob, bd);
 #ifdef CONFIG_PCI
        ft_pci_setup(blob, bd);
        cds_pci_fixup(blob);
 #endif
+
+       return 0;
 }
 #endif