From c37a1747acbfc83641338a29952fff99bff6deb0 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 10 Sep 2012 22:31:06 -0700 Subject: [PATCH] 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 Cc: Greg Kroah-Hartman Signed-off-by: Tony Lindgren Signed-off-by: Greg Kroah-Hartman --- drivers/staging/tidspbridge/core/dsp-clock.c | 2 ++ drivers/staging/tidspbridge/core/tiomap3430.c | 4 ++-- drivers/staging/tidspbridge/core/wdt.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/staging/tidspbridge/core/dsp-clock.c b/drivers/staging/tidspbridge/core/dsp-clock.c index c7df34e6b60b..7eac01e5fe0b 100644 --- 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 /* ----------------------------------- Host OS */ diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c index a19bf5ce58b6..012c5a0cc6c8 100644 --- 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 870f934f4f3b..1ed1474d0b56 100644 --- a/drivers/staging/tidspbridge/core/wdt.c +++ b/drivers/staging/tidspbridge/core/wdt.c @@ -25,7 +25,8 @@ #include -#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; -- 2.39.5