omap: add dsp platform device
Otherwise tidspbridge cannot work. It looks like this was dropped in the conversion to staging. I took the liberty of doing some cleaning up. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
07dea29a11
commit
90173882ed
|
@ -102,6 +102,10 @@ obj-y += $(iommu-m) $(iommu-y)
|
||||||
i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
|
i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
|
||||||
obj-y += $(i2c-omap-m) $(i2c-omap-y)
|
obj-y += $(i2c-omap-m) $(i2c-omap-y)
|
||||||
|
|
||||||
|
ifneq ($(CONFIG_TIDSPBRIDGE),)
|
||||||
|
obj-y += dsp.o
|
||||||
|
endif
|
||||||
|
|
||||||
# Specific board support
|
# Specific board support
|
||||||
obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
|
obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
|
||||||
obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o
|
obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o
|
||||||
|
|
|
@ -0,0 +1,85 @@
|
||||||
|
/*
|
||||||
|
* TI's OMAP DSP platform device registration
|
||||||
|
*
|
||||||
|
* Copyright (C) 2005-2006 Texas Instruments, Inc.
|
||||||
|
* Copyright (C) 2009 Nokia Corporation
|
||||||
|
*
|
||||||
|
* Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/platform_device.h>
|
||||||
|
#include "prm.h"
|
||||||
|
#include "cm.h"
|
||||||
|
#ifdef CONFIG_BRIDGE_DVFS
|
||||||
|
#include <plat/omap-pm.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <plat/dsp.h>
|
||||||
|
|
||||||
|
extern phys_addr_t omap_dsp_get_mempool_base(void);
|
||||||
|
|
||||||
|
static struct platform_device *omap_dsp_pdev;
|
||||||
|
|
||||||
|
static struct omap_dsp_platform_data omap_dsp_pdata __initdata = {
|
||||||
|
#ifdef CONFIG_BRIDGE_DVFS
|
||||||
|
.dsp_set_min_opp = omap_pm_dsp_set_min_opp,
|
||||||
|
.dsp_get_opp = omap_pm_dsp_get_opp,
|
||||||
|
.cpu_set_freq = omap_pm_cpu_set_freq,
|
||||||
|
.cpu_get_freq = omap_pm_cpu_get_freq,
|
||||||
|
#endif
|
||||||
|
.dsp_prm_read = prm_read_mod_reg,
|
||||||
|
.dsp_prm_write = prm_write_mod_reg,
|
||||||
|
.dsp_prm_rmw_bits = prm_rmw_mod_reg_bits,
|
||||||
|
.dsp_cm_read = cm_read_mod_reg,
|
||||||
|
.dsp_cm_write = cm_write_mod_reg,
|
||||||
|
.dsp_cm_rmw_bits = cm_rmw_mod_reg_bits,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int __init omap_dsp_init(void)
|
||||||
|
{
|
||||||
|
struct platform_device *pdev;
|
||||||
|
int err = -ENOMEM;
|
||||||
|
struct omap_dsp_platform_data *pdata = &omap_dsp_pdata;
|
||||||
|
|
||||||
|
pdata->phys_mempool_base = omap_dsp_get_mempool_base();
|
||||||
|
|
||||||
|
if (pdata->phys_mempool_base) {
|
||||||
|
pdata->phys_mempool_size = CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE;
|
||||||
|
pr_info("%s: %x bytes @ %x\n", __func__,
|
||||||
|
pdata->phys_mempool_size, pdata->phys_mempool_base);
|
||||||
|
}
|
||||||
|
|
||||||
|
pdev = platform_device_alloc("omap-dsp", -1);
|
||||||
|
if (!pdev)
|
||||||
|
goto err_out;
|
||||||
|
|
||||||
|
err = platform_device_add_data(pdev, pdata, sizeof(*pdata));
|
||||||
|
if (err)
|
||||||
|
goto err_out;
|
||||||
|
|
||||||
|
err = platform_device_add(pdev);
|
||||||
|
if (err)
|
||||||
|
goto err_out;
|
||||||
|
|
||||||
|
omap_dsp_pdev = pdev;
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
err_out:
|
||||||
|
platform_device_put(pdev);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
module_init(omap_dsp_init);
|
||||||
|
|
||||||
|
static void __exit omap_dsp_exit(void)
|
||||||
|
{
|
||||||
|
platform_device_unregister(omap_dsp_pdev);
|
||||||
|
}
|
||||||
|
module_exit(omap_dsp_exit);
|
||||||
|
|
||||||
|
MODULE_AUTHOR("Hiroshi DOYU");
|
||||||
|
MODULE_DESCRIPTION("TI's OMAP DSP platform device registration");
|
||||||
|
MODULE_LICENSE("GPL");
|
|
@ -37,6 +37,7 @@
|
||||||
#include <plat/fpga.h>
|
#include <plat/fpga.h>
|
||||||
#include <plat/serial.h>
|
#include <plat/serial.h>
|
||||||
#include <plat/vram.h>
|
#include <plat/vram.h>
|
||||||
|
#include <plat/dsp.h>
|
||||||
|
|
||||||
#include <plat/clock.h>
|
#include <plat/clock.h>
|
||||||
|
|
||||||
|
@ -87,6 +88,7 @@ void __init omap_reserve(void)
|
||||||
{
|
{
|
||||||
omapfb_reserve_sdram_memblock();
|
omapfb_reserve_sdram_memblock();
|
||||||
omap_vram_reserve_sdram_memblock();
|
omap_vram_reserve_sdram_memblock();
|
||||||
|
omap_dsp_reserve_sdram_memblock();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
|
#include <linux/memblock.h>
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <asm/mach-types.h>
|
#include <asm/mach-types.h>
|
||||||
|
@ -272,6 +273,35 @@ static void omap_init_wdt(void)
|
||||||
static inline void omap_init_wdt(void) {}
|
static inline void omap_init_wdt(void) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE)
|
||||||
|
|
||||||
|
static phys_addr_t omap_dsp_phys_mempool_base;
|
||||||
|
|
||||||
|
void __init omap_dsp_reserve_sdram_memblock(void)
|
||||||
|
{
|
||||||
|
phys_addr_t size = CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE;
|
||||||
|
phys_addr_t paddr;
|
||||||
|
|
||||||
|
if (!size)
|
||||||
|
return;
|
||||||
|
|
||||||
|
paddr = __memblock_alloc_base(size, SZ_1M, MEMBLOCK_REAL_LIMIT);
|
||||||
|
if (!paddr) {
|
||||||
|
pr_err("%s: failed to reserve %x bytes\n",
|
||||||
|
__func__, size);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
omap_dsp_phys_mempool_base = paddr;
|
||||||
|
}
|
||||||
|
|
||||||
|
phys_addr_t omap_dsp_get_mempool_base(void)
|
||||||
|
{
|
||||||
|
return omap_dsp_phys_mempool_base;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(omap_dsp_get_mempool_base);
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This gets called after board-specific INIT_MACHINE, and initializes most
|
* This gets called after board-specific INIT_MACHINE, and initializes most
|
||||||
* on-chip peripherals accessible on this board (except for few like USB):
|
* on-chip peripherals accessible on this board (except for few like USB):
|
||||||
|
|
|
@ -0,0 +1,31 @@
|
||||||
|
#ifndef __OMAP_DSP_H__
|
||||||
|
#define __OMAP_DSP_H__
|
||||||
|
|
||||||
|
#include <linux/types.h>
|
||||||
|
|
||||||
|
struct omap_dsp_platform_data {
|
||||||
|
void (*dsp_set_min_opp) (u8 opp_id);
|
||||||
|
u8 (*dsp_get_opp) (void);
|
||||||
|
void (*cpu_set_freq) (unsigned long f);
|
||||||
|
unsigned long (*cpu_get_freq) (void);
|
||||||
|
unsigned long mpu_speed[6];
|
||||||
|
|
||||||
|
/* functions to write and read PRCM registers */
|
||||||
|
void (*dsp_prm_write)(u32, s16 , u16);
|
||||||
|
u32 (*dsp_prm_read)(s16 , u16);
|
||||||
|
u32 (*dsp_prm_rmw_bits)(u32, u32, s16, s16);
|
||||||
|
void (*dsp_cm_write)(u32, s16 , u16);
|
||||||
|
u32 (*dsp_cm_read)(s16 , u16);
|
||||||
|
u32 (*dsp_cm_rmw_bits)(u32, u32, s16, s16);
|
||||||
|
|
||||||
|
phys_addr_t phys_mempool_base;
|
||||||
|
phys_addr_t phys_mempool_size;
|
||||||
|
};
|
||||||
|
|
||||||
|
#if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE)
|
||||||
|
extern void omap_dsp_reserve_sdram_memblock(void);
|
||||||
|
#else
|
||||||
|
static inline void omap_dsp_reserve_sdram_memblock(void) { }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in New Issue