diff options
| author | Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> | 2011-12-13 12:31:03 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-12-26 22:32:22 +0800 |
| commit | 551aca57f45dab1e9de0c6887a13ec08d8ae4ce3 (patch) | |
| tree | 42530c362e0a9bb8c66b3308493939203589e20a | |
| parent | 29c3a712460a56fbc4cd206c03dde4b220a76d10 (diff) | |
OMAP 4: Fixing gpu initialization code
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 6 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/gpu.h | 33 |
2 files changed, 35 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index ba49c4955f9..c2fae9d6ef1 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -30,6 +30,7 @@ #include <plat/mcbsp.h> #include <plat/mmc.h> #include <plat/dma.h> +#include <plat/gpu.h> #include <plat/omap_hwmod.h> #include <plat/omap_device.h> #include <plat/omap4-keypad.h> @@ -899,8 +900,6 @@ static struct omap_device_pm_latency omap_drm_latency[] = { }, }; -#if 0 - static struct platform_device omap_omaplfb_device = { .name = "omaplfb", .id = -1, @@ -950,8 +949,6 @@ static void omap_init_gpu(void) platform_device_register(&omap_omaplfb_device); } -#endif - /*-------------------------------------------------------------------------*/ static int __init omap2_init_devices(void) @@ -974,6 +971,7 @@ static int __init omap2_init_devices(void) omap_init_sham(); omap_init_aes(); omap_init_vout(); + omap_init_gpu(); return 0; } diff --git a/arch/arm/plat-omap/include/plat/gpu.h b/arch/arm/plat-omap/include/plat/gpu.h new file mode 100644 index 00000000000..70dcc922bcb --- /dev/null +++ b/arch/arm/plat-omap/include/plat/gpu.h @@ -0,0 +1,33 @@ +/* + * arch/arm/plat-omap/include/plat/gpu.h + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef OMAP_GPU_H +#define OMAP_GPU_H + +#include <plat/omap-pm.h> +#include <linux/platform_device.h> + +struct gpu_platform_data { + void (*set_min_bus_tput)(struct device *dev, u8 agent_id, + unsigned long r); + int (*device_enable) (struct platform_device *pdev); + int (*device_shutdown) (struct platform_device *pdev); + int (*device_idle) (struct platform_device *pdev); +}; + +#endif |