diff options
| author | Mayuresh Kulkarni <mkulkarni@nvidia.com> | 2012-02-24 15:46:51 +0530 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2012-03-23 21:03:36 -0700 |
| commit | 7d2dc84dc809d9b7a3ce8826e7959f605d2d6f9e (patch) | |
| tree | 8a087f3d141701cfe989e76b3997e78404df0710 /arch/arm/mach-tegra/board-harmony-panel.c | |
| parent | 57e3de2ad837f072fe5ce31aa6178f2b30c2ad64 (diff) | |
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 <tbergstrom@nvidia.com>
Signed-off-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Reviewed-on: http://git-master/r/82631
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Rebase-Id: Race3bad20a25490124a41c0a9b845e3778e94408
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony-panel.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony-panel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-harmony-panel.c b/arch/arm/mach-tegra/board-harmony-panel.c index 4ea6725101ee..d9974f1b1caa 100644 --- a/arch/arm/mach-tegra/board-harmony-panel.c +++ b/arch/arm/mach-tegra/board-harmony-panel.c @@ -1,7 +1,7 @@ /* * arch/arm/mach-tegra/board-harmony-panel.c * - * Copyright (c) 2010-2011, NVIDIA Corporation. + * Copyright (c) 2010-2012, NVIDIA Corporation. * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and @@ -325,7 +325,6 @@ static struct platform_device *harmony_gfx_devices[] __initdata = { #if defined(CONFIG_TEGRA_NVMAP) &harmony_nvmap_device, #endif - &tegra_grhost_device, &tegra_pwfm0_device, &harmony_backlight_device, }; |