Skip to content

Commit

Permalink
staging: tidspbridge: Prepare for irqs.h removal
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tony Lindgren authored and Greg Kroah-Hartman committed Sep 11, 2012
1 parent 86f9150 commit c37a174
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions drivers/staging/tidspbridge/core/dsp-clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/

#define L4_34XX_BASE 0x48000000

#include <linux/types.h>

/* ----------------------------------- Host OS */
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/tidspbridge/core/tiomap3430.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 2 additions & 1 deletion drivers/staging/tidspbridge/core/wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit c37a174

Please sign in to comment.