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

[u-boot] / arch / powerpc / include / asm / fsl_liodn.h

diff --git a/arch/powerpc/include/asm/fsl_liodn.h b/arch/powerpc/include/asm/fsl_liodn.h
index 801571f9eb56314aa8ff36a3bb7c2241e44f743b..d759de975ea32b53b10f6e15f4add559022e6fa0 100644 (file)
--- a/arch/powerpc/include/asm/fsl_liodn.h
+++ b/arch/powerpc/include/asm/fsl_liodn.h
@@ -25,6 +25,26 @@
 
 #include <asm/types.h>
 
+struct srio_liodn_id_table {
+       u32 id[2];
+       unsigned long reg_offset[2];
+       u8 num_ids;
+       u8 portid;
+};
+#define SET_SRIO_LIODN_1(port, idA) \
+       { .id = { idA }, .num_ids = 1, .portid = port, \
+         .reg_offset[0] = offsetof(ccsr_gur_t, rio##port##liodnr) \
+               + CONFIG_SYS_MPC85xx_GUTS_OFFSET + CONFIG_SYS_CCSRBAR, \
+       }
+
+#define SET_SRIO_LIODN_2(port, idA, idB) \
+       { .id = { idA, idB }, .num_ids = 2, .portid = port, \
+         .reg_offset[0] = offsetof(ccsr_gur_t, rio##port##liodnr) \
+               + CONFIG_SYS_MPC85xx_GUTS_OFFSET + CONFIG_SYS_CCSRBAR, \
+         .reg_offset[1] = offsetof(ccsr_gur_t, rio##port##maintliodnr) \
+               + CONFIG_SYS_MPC85xx_GUTS_OFFSET + CONFIG_SYS_CCSRBAR, \
+       }
+
 struct liodn_id_table {
        const char * compat;
        u32 id[2];
@@ -74,6 +94,11 @@ extern void fdt_fixup_liodn(void *blob);
        SET_GUTS_LIODN(compat, liodn, pex##pciNum##liodnr,\
                CONFIG_SYS_MPC85xx_PCIE##pciNum##_OFFSET)
 
+#define SET_PCI_LIODN_BASE(compat, pciNum, liodn) \
+       SET_LIODN_ENTRY_1(compat, liodn,\
+               offsetof(ccsr_pcix_t, liodn_base) + CONFIG_SYS_MPC85xx_PCIE##pciNum##_OFFSET,\
+               CONFIG_SYS_MPC85xx_PCIE##pciNum##_OFFSET)
+
 /* reg nodes for DMA start @ 0x300 */
 #define SET_DMA_LIODN(dmaNum, liodn) \
        SET_GUTS_LIODN("fsl,eloplus-dma", liodn, dma##dmaNum##liodnr,\
@@ -98,6 +123,12 @@ extern void fdt_fixup_liodn(void *blob);
                CONFIG_SYS_FSL_CORENET_PME_OFFSET, \
                CONFIG_SYS_FSL_CORENET_PME_OFFSET)
 
+#define SET_PMAN_LIODN(num, liodn) \
+       SET_LIODN_ENTRY_2("fsl,pman", liodn, 0, \
+               offsetof(struct ccsr_pman, ppa1) + \
+               CONFIG_SYS_FSL_CORENET_PMAN##num##_OFFSET, \
+               CONFIG_SYS_FSL_CORENET_PMAN##num##_OFFSET)
+
 /* -1 from portID due to how immap has the registers */
 #define FM_PPID_RX_PORT_OFFSET(fmNum, portID) \
        CONFIG_SYS_FSL_FM##fmNum##_OFFSET + \
@@ -147,9 +178,30 @@ extern void fdt_fixup_liodn(void *blob);
                offsetof(ccsr_sec_t, decoliodnr[num].ls) + \
                CONFIG_SYS_FSL_SEC_OFFSET, 0)
 
+#define SET_RAID_ENGINE_JQ_LIODN_ENTRY(jqNum, rNum, liodnA) \
+       SET_LIODN_ENTRY_1("fsl,raideng-v1.0-job-ring", \
+       liodnA, \
+       offsetof(struct ccsr_raide, jq[jqNum].ring[rNum].cfg1) + \
+       CONFIG_SYS_FSL_RAID_ENGINE_OFFSET, \
+       offsetof(struct ccsr_raide, jq[jqNum].ring[rNum].cfg0) + \
+       CONFIG_SYS_FSL_RAID_ENGINE_OFFSET)
+
+#define SET_RMAN_LIODN(ibNum, liodn) \
+       SET_LIODN_ENTRY_1("fsl,rman-inbound-block", liodn, \
+               offsetof(struct ccsr_rman, mmitdr) + \
+               CONFIG_SYS_FSL_CORENET_RMAN_OFFSET, \
+               CONFIG_SYS_FSL_CORENET_RMAN_OFFSET + ibNum * 0x1000)
+
 extern struct liodn_id_table liodn_tbl[], liodn_bases[], sec_liodn_tbl[];
+extern struct liodn_id_table raide_liodn_tbl[];
 extern struct liodn_id_table fman1_liodn_tbl[], fman2_liodn_tbl[];
-extern int liodn_tbl_sz, sec_liodn_tbl_sz;
+#ifdef CONFIG_SYS_SRIO
+extern struct srio_liodn_id_table srio_liodn_tbl[];
+extern int srio_liodn_tbl_sz;
+#endif
+extern struct liodn_id_table rman_liodn_tbl[];
+extern int liodn_tbl_sz, sec_liodn_tbl_sz, raide_liodn_tbl_sz;
 extern int fman1_liodn_tbl_sz, fman2_liodn_tbl_sz;
+extern int rman_liodn_tbl_sz;
 
 #endif