staging: tidspbridge: Prepare for irqs.h removal

Let's define some things locally to avoid breaking build
when irqs.h is removed.

This is needed for the ARM common zImage support.

Cc: Omar Ramirez Luna <omar.ramirez@ti.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/tidspbridge/core/dsp-clock.c b/drivers/staging/tidspbridge/core/dsp-clock.c
index c7df34e6b60b125cfe9444c6be6a8b9c9b5cbde3..7eac01e5fe0bc2e11cf7facb1e36cc0f86df10ee 100644 (file)
--- a/drivers/staging/tidspbridge/core/dsp-clock.c
+++ b/drivers/staging/tidspbridge/core/dsp-clock.c
@@ -16,6 +16,8 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#define L4_34XX_BASE           0x48000000
+
 #include <linux/types.h>
 
 /*  ----------------------------------- Host OS */

diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index a19bf5ce58b6ff81ef666aceb5e5fa79b5ec75b6..012c5a0cc6c852a3a6f10348f7e16d9ec50876a2 100644 (file)
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -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;
 

diff --git a/drivers/staging/tidspbridge/core/wdt.c b/drivers/staging/tidspbridge/core/wdt.c
index 870f934f4f3bee4002e0400ba77afc96e155cc23..1ed1474d0b564b78bbc500ef5ce963c1379ab0c4 100644 (file)
--- a/drivers/staging/tidspbridge/core/wdt.c
+++ b/drivers/staging/tidspbridge/core/wdt.c
@@ -25,7 +25,8 @@
 #include <dspbridge/host_os.h>
 
 
-#define OMAP34XX_WDT3_BASE             (L4_PER_34XX_BASE + 0x30000)
+#define OMAP34XX_WDT3_BASE             (0x49000000 + 0x30000)
+#define INT_34XX_WDT3_IRQ              36
 
 static struct dsp_wdt_setting dsp_wdt;