Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / staging / tidspbridge / core / tiomap3430.c

diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 7bf55c4..066a3ce 100644 (file)
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -328,7 +328,7 @@ static int bridge_brd_read(struct bridge_dev_context *dev_ctxt,
                                           ul_num_bytes, mem_type);
                return status;
        }
-       /* copy the data from  DSP memory, */
+       /* copy the data from DSP memory */
        memcpy(host_buff, (void *)(dsp_base_addr + offset), ul_num_bytes);
        return status;
 }
@@ -415,10 +415,10 @@ static int bridge_brd_start(struct bridge_dev_context *dev_ctxt,
                /* Assert RST1 i.e only the RST only for DSP megacell */
                if (!status) {
                        /*
-                        * XXX: ioremapping  MUST be removed once ctrl
+                        * XXX: OMAP343X_CTRL_BASE ioremapping  MUST be removed once ctrl
                         * function is made available.
                         */
-                       void __iomem *ctrl = ioremap(OMAP343X_CTRL_BASE, SZ_4K);
+                       void __iomem *ctrl = ioremap(0x48002000, SZ_4K);
                        if (!ctrl)
                                return -ENOMEM;
 
@@ -1745,7 +1745,7 @@ static int mem_map_vmalloc(struct bridge_dev_context *dev_context,
        pa_next = page_to_phys(page[0]);
        while (!status && (i < num_pages)) {
                /*
-                * Reuse pa_next from the previous iteraion to avoid
+                * Reuse pa_next from the previous iteration to avoid
                 * an extra va2pa call
                 */
                pa_curr = pa_next;