diff options
| author | Hemant Hariyani <hemanthariyani@ti.com> | 2012-04-30 19:34:03 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-06-22 10:22:16 +0800 |
| commit | ae9fea351012f0edc3a390b9790f81ea715b91be (patch) | |
| tree | f9a5b3fd0e65d86fd5fa58f9079b9d3e739ff616 /arch | |
| parent | 4b13afd08b86866d1c70ad0845c923769230d688 (diff) | |
| download | panda-ae9fea351012f0edc3a390b9790f81ea715b91be.tar.gz | |
Kernel changes for hwmod and omap_device initialization for GPU.
Change-Id: I4bd96e76af31d0991ce9e67b0c499f0d6f39a1a8
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/gpu.h | 33 |
3 files changed, 38 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 10d14c35365..333424c206e 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -34,6 +34,7 @@ #include <plat/board.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> @@ -1102,6 +1103,7 @@ static int __init omap2_init_devices(void) omap_init_fdif(); omap_init_sl2if(); omap_init_iss(); + omap_init_gpu(); return 0; } diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index f6364c5d865..bdb3543aa70 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -6094,6 +6094,9 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = { /* hsi class */ /* &omap44xx_hsi_hwmod, */ + /* gpu class */ + &omap44xx_gpu_hwmod, + /* i2c class */ &omap44xx_i2c1_hwmod, &omap44xx_i2c2_hwmod, 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 |