diff options
| author | Dinh Nguyen <Dinh.Nguyen@freescale.com> | 2010-03-18 14:44:36 -0500 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-25 11:20:13 +0200 |
| commit | f5f6182ae75da1981f3fc50798a630af5e63349e (patch) | |
| tree | fed37b15423c2d880c908f2467273bb9894d6561 /arch/arm/mach-mx5 | |
| parent | fe5f8e57cebd49332675067f969ed232465abb4c (diff) | |
ENGR00121656 MX53: Add support for VPU
Add support for VPU on MX53 EVK board.
Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Sammy He <r62914@freescale.com>
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'arch/arm/mach-mx5')
| -rw-r--r-- | arch/arm/mach-mx5/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/mx51_3stack.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/mx51_babbage.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mx5/mx53_evk.c | 7 |
5 files changed, 13 insertions, 6 deletions
diff --git a/arch/arm/mach-mx5/cpu.c b/arch/arm/mach-mx5/cpu.c index b487d2d16e10..b45f2e9578a7 100644 --- a/arch/arm/mach-mx5/cpu.c +++ b/arch/arm/mach-mx5/cpu.c @@ -63,7 +63,7 @@ static void __init mipi_hsc_disable(void) iounmap(reg_hsc_mcd); } -void mx51_vpu_reset(void) +void mx5_vpu_reset(void) { u32 reg; void __iomem *src_base; diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c index c83bdd9078d9..567d5c8e2c6f 100644 --- a/arch/arm/mach-mx5/devices.c +++ b/arch/arm/mach-mx5/devices.c @@ -1229,6 +1229,8 @@ int __init mxc_init_devices(void) pwm2_resources[0].end -= MX53_OFFSET; mxc_fec_resources[0].start -= MX53_OFFSET; mxc_fec_resources[0].end -= MX53_OFFSET; + vpu_resources[0].start -= MX53_OFFSET; + vpu_resources[0].end -= MX53_OFFSET; mxcspi1_resources[0].start -= MX53_OFFSET; mxcspi1_resources[0].end -= MX53_OFFSET; mxcspi2_resources[0].start -= MX53_OFFSET; diff --git a/arch/arm/mach-mx5/mx51_3stack.c b/arch/arm/mach-mx5/mx51_3stack.c index 7e992c50cb59..61e122811950 100644 --- a/arch/arm/mach-mx5/mx51_3stack.c +++ b/arch/arm/mach-mx5/mx51_3stack.c @@ -140,9 +140,9 @@ static struct mxc_ipu_config mxc_ipu_data = { .rev = 2, }; -extern void mx51_vpu_reset(void); +extern void mx5_vpu_reset(void); static struct mxc_vpu_platform_data mxc_vpu_data = { - .reset = mx51_vpu_reset, + .reset = mx5_vpu_reset, }; extern void mx51_babbage_gpio_spi_chipselect_active(int cspi_mode, int status, diff --git a/arch/arm/mach-mx5/mx51_babbage.c b/arch/arm/mach-mx5/mx51_babbage.c index e346c2e2b347..258e534fd2bb 100644 --- a/arch/arm/mach-mx5/mx51_babbage.c +++ b/arch/arm/mach-mx5/mx51_babbage.c @@ -159,9 +159,9 @@ static struct mxc_ipu_config mxc_ipu_data = { .rev = 2, }; -extern void mx51_vpu_reset(void); +extern void mx5_vpu_reset(void); static struct mxc_vpu_platform_data mxc_vpu_data = { - .reset = mx51_vpu_reset, + .reset = mx5_vpu_reset, }; extern void mx51_babbage_gpio_spi_chipselect_active(int cspi_mode, int status, diff --git a/arch/arm/mach-mx5/mx53_evk.c b/arch/arm/mach-mx5/mx53_evk.c index 4b828cdd613d..30f8b3ddbe8e 100644 --- a/arch/arm/mach-mx5/mx53_evk.c +++ b/arch/arm/mach-mx5/mx53_evk.c @@ -154,6 +154,11 @@ static struct mxc_ipu_config mxc_ipu_data = { .rev = 3, }; +extern void mx5_vpu_reset(void); +static struct mxc_vpu_platform_data mxc_vpu_data = { + .reset = mx5_vpu_reset, +}; + extern void mx53_evk_gpio_spi_chipselect_active(int cspi_mode, int status, int chipselect); extern void mx53_evk_gpio_spi_chipselect_inactive(int cspi_mode, int status, @@ -529,7 +534,7 @@ static void __init mxc_board_init(void) mxc_register_device(&mxc_ipu_device, &mxc_ipu_data); mxc_register_device(&lcd_wvga_device, &lcd_wvga_data); mxc_register_device(&mxc_tve_device, &tve_data); - mxc_register_device(&mxcvpu_device, NULL); + mxc_register_device(&mxcvpu_device, &mxc_vpu_data); mxc_register_device(&gpu_device, NULL); /* mxc_register_device(&mx53_lpmode_device, NULL); |