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

[u-boot] / board / freescale / common / ls102xa_stream_id.c

diff --git a/board/freescale/common/ls102xa_stream_id.c b/board/freescale/common/ls102xa_stream_id.c
index 6154c9c45886cb1e2cef93f31c539b7a6d4dfcfb..3d5404ee100a1b9d8c8748fecacbc3f22a3b7862 100644 (file)
--- a/board/freescale/common/ls102xa_stream_id.c
+++ b/board/freescale/common/ls102xa_stream_id.c
@@ -10,9 +10,24 @@
 
 void ls102xa_config_smmu_stream_id(struct smmu_stream_id *id, uint32_t num)
 {
-       uint32_t *scfg = (uint32_t *)CONFIG_SYS_FSL_SCFG_ADDR;
+       void *scfg = (void *)CONFIG_SYS_FSL_SCFG_ADDR;
        int i;
 
        for (i = 0; i < num; i++)
-               out_be32(scfg + id[i].offset, id[i].stream_id);
+               out_be32((u32 *)(scfg + id[i].offset), id[i].stream_id);
+}
+
+void ls1021x_config_caam_stream_id(struct liodn_id_table *tbl, int size)
+{
+       int i;
+       u32 liodn;
+
+       for (i = 0; i < size; i++) {
+               if (tbl[i].num_ids == 2)
+                       liodn = (tbl[i].id[0] << 16) | tbl[i].id[1];
+               else
+                       liodn = tbl[i].id[0];
+
+               out_le32((u32 *)(tbl[i].reg_offset), liodn);
+       }
 }