diff options
| author | Sammy He <r62914@freescale.com> | 2011-05-31 17:49:24 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2011-08-16 12:37:07 +0800 |
| commit | 7269900e7823097da1c040d33cf2ba36948e88a4 (patch) | |
| tree | 60a5fb98e8ad8b74e84b1f01e72cdd2c614159b3 | |
| parent | a57c02c02fa69640b8701eace1dab190fade25fa (diff) | |
ENGR00144306-2 vpu: Add iram info to vpu platform data for each platform
Add iram info to vpu platform data for each platform in linux/arch folder.
Disable iram on MX51 and enable iram on MX53 platform.
And remove VPU_IRAM_SIZE usage.
Signed-off-by: Sammy He <r62914@freescale.com>
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Signed-off-by: Eric Miao <eric.miao@linaro.org>
| -rw-r--r-- | arch/arm/mach-mx5/clock.c | 5 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-imx_vpu.c | 8 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/devices-common.h | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc_vpu.h | 2 |
4 files changed, 11 insertions, 6 deletions
diff --git a/arch/arm/mach-mx5/clock.c b/arch/arm/mach-mx5/clock.c index 974b8e34fac9..cae020e4c6a7 100644 --- a/arch/arm/mach-mx5/clock.c +++ b/arch/arm/mach-mx5/clock.c @@ -4034,9 +4034,6 @@ static struct clk vpu_clk[] = { { __INIT_CLK_DEBUG(vpu_clk_2) .parent = &emi_fast_clk, -#ifdef CONFIG_MXC_VPU_IRAM - .secondary = &emi_intr_clk[0], -#endif } }; @@ -4985,6 +4982,8 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc, unsigned long esdhc3_clk[0].get_rate = _clk_esdhc3_get_rate; esdhc3_clk[0].set_rate = _clk_sdhc3_set_rate; + vpu_clk[2].secondary = &emi_intr_clk[0]; + #if defined(CONFIG_USB_STATIC_IRAM) \ || defined(CONFIG_USB_STATIC_IRAM_PPH) usboh3_clk[1].secondary = &emi_intr_clk[1]; diff --git a/arch/arm/plat-mxc/devices/platform-imx_vpu.c b/arch/arm/plat-mxc/devices/platform-imx_vpu.c index 599592d1aa34..4d27cd3bd8e7 100644 --- a/arch/arm/plat-mxc/devices/platform-imx_vpu.c +++ b/arch/arm/plat-mxc/devices/platform-imx_vpu.c @@ -9,10 +9,12 @@ #include <mach/hardware.h> #include <mach/devices-common.h> -#define imx5_vpu_data_entry_single(soc, vpu_reset, vpu_pg) \ +#define imx5_vpu_data_entry_single(soc, flag, size, vpu_reset, vpu_pg) \ { \ .iobase = soc ## _VPU_BASE_ADDR, \ .irq = soc ## _INT_VPU, \ + .iram_enable = flag, \ + .iram_size = size, \ .reset = vpu_reset, \ .pg = vpu_pg, \ } @@ -53,7 +55,7 @@ void mx51_vpu_pg(int enable) } const struct imx_vpu_data imx51_vpu_data __initconst = imx5_vpu_data_entry_single(MX51, - mx51_vpu_reset, mx51_vpu_pg); + false, 0x14000, mx51_vpu_reset, mx51_vpu_pg); #endif #ifdef CONFIG_SOC_IMX53 @@ -93,7 +95,7 @@ void mx53_vpu_pg(int enable) const struct imx_vpu_data imx53_vpu_data __initconst = imx5_vpu_data_entry_single(MX53, - mx53_vpu_reset, mx53_vpu_pg); + true, 0x14000, mx53_vpu_reset, mx53_vpu_pg); #endif struct platform_device *__init imx_add_vpu( diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index 634558ae75e6..1baf909fc98a 100644 --- a/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/arch/arm/plat-mxc/include/mach/devices-common.h @@ -289,6 +289,8 @@ struct platform_device *__init imx_add_ipuv3( struct imx_vpu_data { resource_size_t iobase; resource_size_t irq; + bool iram_enable; + int iram_size; void (*reset) (void); void (*pg) (int); }; diff --git a/arch/arm/plat-mxc/include/mach/mxc_vpu.h b/arch/arm/plat-mxc/include/mach/mxc_vpu.h index f12311367692..19c01b2e46af 100644 --- a/arch/arm/plat-mxc/include/mach/mxc_vpu.h +++ b/arch/arm/plat-mxc/include/mach/mxc_vpu.h @@ -29,6 +29,8 @@ #include <linux/fs.h> struct mxc_vpu_platform_data { + bool iram_enable; + int iram_size; void (*reset) (void); void (*pg) (int); }; |