diff options
| author | Daniel Hellstrom <daniel@gaisler.com> | 2013-05-21 10:10:21 +0200 |
|---|---|---|
| committer | Daniel Hellstrom <daniel@gaisler.com> | 2013-05-21 10:10:21 +0200 |
| commit | 8bbca82bf5f895ae097e1cb0c32443ec094bd612 (patch) | |
| tree | f2d1f7351e3aa3e1f28d8abc02568fe226219ddf | |
| parent | 242a9113f0d63cd143ddfc3c9fbcd872ac6c6222 (diff) | |
NGMP PCI: added support for NGMP prototype boardsrcc-v1.2.11
| -rw-r--r-- | c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c | 13 | ||||
| -rw-r--r-- | cpukit/libpci/pci/ids_extra.h | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c b/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c index 7266803e6e..d796da5692 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c +++ b/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c @@ -166,6 +166,7 @@ struct drvmgr_drv_ops gr_cpci_leon4_n2x_ops = struct pci_dev_id_match gr_cpci_leon4_n2x_ids[] = { PCIID_DEVVEND(PCIID_VENDOR_GAISLER, PCIID_DEVICE_GR_LEON4_N2X), + PCIID_DEVVEND(PCIID_VENDOR_GAISLER, PCIID_DEVICE_GR_NGMP_PROTO), PCIID_END_TABLE /* Mark end of table */ }; @@ -353,15 +354,17 @@ int gr_cpci_leon4_n2x_hw_init1(struct gr_cpci_leon4_n2x_priv *priv) /* Get extended Interrupt controller IRQ number */ priv->eirq = (priv->irq->mpstat >> 16) & 0xf; - /* Find first Clock-Gating unit, enable/disable the requested cores */ + /* Find first Clock-Gating unit, enable/disable the requested cores. + * It is optional in order to support FPGA prototypes. + */ + priv->cg = NULL; tmp = (struct ambapp_dev *)ambapp_for_each(&priv->abus, (OPTIONS_ALL|OPTIONS_APB_SLVS), VENDOR_GAISLER, GAISLER_CLKGATE, ambapp_find_by_idx, NULL); - if ( !tmp ) { - return -5; - } - priv->cg = (struct l4n2x_grcg_regs *)DEV_TO_APB(tmp)->start; + if (tmp) + priv->cg = (struct l4n2x_grcg_regs *)DEV_TO_APB(tmp)->start; + /* Do reset and enable sequence only if not already enabled */ if (priv->cg && ((enabled = priv->cg->enable) != priv->cg_en_mask)) { /* First disable already enabled cores */ diff --git a/cpukit/libpci/pci/ids_extra.h b/cpukit/libpci/pci/ids_extra.h index bce41c2b64..a7d2bc5ec1 100644 --- a/cpukit/libpci/pci/ids_extra.h +++ b/cpukit/libpci/pci/ids_extra.h @@ -18,3 +18,4 @@ #define PCIID_DEVICE_GR_TMTC_1553 0x0198 /* GR-TMTC-1553 */ #define PCIID_DEVICE_GR_RASTA_SPW_RTR 0x0062 /* GR-RASTA-SPW-ROUTER */ #define PCIID_DEVICE_GR_LEON4_N2X 0x0061 /* GR-CPCI-LEON4-N2X */ +#define PCIID_DEVICE_GR_NGMP_PROTO 0x0064 /* GR-NGMP_PROTO */ |