diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-28 14:47:01 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-28 14:47:01 +0200 |
| commit | 472fd5401561f94698f4c8f9dbbbfbf76ab55626 (patch) | |
| tree | 2b026da522975ca03bfcdd80b66bb266ed6553a9 /arch/arm/mach-omap2/dsp.c | |
| parent | Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanup (diff) | |
| parent | Merge tag 'omap-cleanup-a-for-3.6' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-472fd5401561f94698f4c8f9dbbbfbf76ab55626.tar.xz linux-472fd5401561f94698f4c8f9dbbbfbf76ab55626.zip | |
Merge branch 'cleanup-hwmod' into cleanup
Conflicts:
arch/arm/mach-omap2/dsp.c
Diffstat (limited to 'arch/arm/mach-omap2/dsp.c')
| -rw-r--r-- | arch/arm/mach-omap2/dsp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/dsp.c b/arch/arm/mach-omap2/dsp.c index 88ffa1e645cd..a636ebc16b39 100644 --- a/arch/arm/mach-omap2/dsp.c +++ b/arch/arm/mach-omap2/dsp.c @@ -23,6 +23,7 @@ #include <asm/memblock.h> +#include "control.h" #include "cm2xxx_3xxx.h" #include "prm2xxx_3xxx.h" #ifdef CONFIG_BRIDGE_DVFS @@ -46,6 +47,9 @@ static struct omap_dsp_platform_data omap_dsp_pdata __initdata = { .dsp_cm_read = omap2_cm_read_mod_reg, .dsp_cm_write = omap2_cm_write_mod_reg, .dsp_cm_rmw_bits = omap2_cm_rmw_mod_reg_bits, + + .set_bootaddr = omap_ctrl_write_dsp_boot_addr, + .set_bootmode = omap_ctrl_write_dsp_boot_mode, }; static phys_addr_t omap_dsp_phys_mempool_base; |