From e3ca4aa394e90579fc34fff8565c05640a7534e5 Mon Sep 17 00:00:00 2001 From: Mayuresh Kulkarni Date: Fri, 24 Feb 2012 15:46:51 +0530 Subject: video: tegra: host: Merge tegra_grhost and host1x devices - tegra_grhost is a platform device that represents host1x - nvhost has device host1x which represents the same hardware - merge these two device structs - as the new struct is a nvhost_device, platform_driver is also converted into a nvhost_driver - register nvhost device before other graphics devices. this ensures that nvhost_probe() is called as soon as nvhost_driver is registered with the core. - this also ensures that nvmap is probed first, followed by nvhost, followed by tegra-dc and nvavp (if they are enabled). Change-Id: Ic420a6516a9cb20d6f481692a4db10fa6053dd90 Signed-off-by: Terje Bergstrom Signed-off-by: Mayuresh Kulkarni Reviewed-on: http://git-master/r/82631 Reviewed-by: Simone Willett Tested-by: Simone Willett --- arch/arm/mach-tegra/board-ventana-panel.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'arch/arm/mach-tegra/board-ventana-panel.c') diff --git a/arch/arm/mach-tegra/board-ventana-panel.c b/arch/arm/mach-tegra/board-ventana-panel.c index e2a54cdb2a68..83bfb7822357 100644 --- a/arch/arm/mach-tegra/board-ventana-panel.c +++ b/arch/arm/mach-tegra/board-ventana-panel.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-ventana-panel.c * - * Copyright (c) 2010-2011, NVIDIA Corporation. + * Copyright (c) 2010-2012, NVIDIA Corporation. * * 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 @@ -336,9 +336,6 @@ static struct platform_device ventana_nvmap_device = { static struct platform_device *ventana_gfx_devices[] __initdata = { #if defined(CONFIG_TEGRA_NVMAP) &ventana_nvmap_device, -#endif -#ifdef CONFIG_TEGRA_GRHOST - &tegra_grhost_device, #endif &tegra_pwfm2_device, &ventana_backlight_device, -- cgit v1.2.3