diff options
| author | Mayuresh Kulkarni <mkulkarni@nvidia.com> | 2012-02-24 15:46:51 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-02-28 19:16:06 -0800 |
| commit | e3ca4aa394e90579fc34fff8565c05640a7534e5 (patch) | |
| tree | b615c8661fb0311ca48453023b11ab2e595328df /include/linux | |
| parent | 90b79e5712300baab889772a5af348559ac95836 (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>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nvhost.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/nvhost.h b/include/linux/nvhost.h index 55b75d048791..739b6cc1c9ec 100644 --- a/include/linux/nvhost.h +++ b/include/linux/nvhost.h @@ -126,10 +126,10 @@ extern int nvhost_get_irq_byname(struct nvhost_device *, const char *); #define to_nvhost_driver(drv) (container_of((drv), struct nvhost_driver, \ driver)) -#define nvhost_get_drvdata(_dev) dev_get_drvdata(&(_dev)->dev) -#define nvhost_set_drvdata(_dev, data) dev_set_drvdata(&(_dev)->dev, (data)) -#define nvhost_get_host(_dev) ((struct nvhost_master *) \ - dev_get_drvdata((_dev)->dev.parent)) +#define nvhost_get_drvdata(_dev) dev_get_drvdata(&(_dev)->dev) +#define nvhost_set_drvdata(_dev, data) dev_set_drvdata(&(_dev)->dev, (data)) +#define nvhost_get_host(_dev) ((struct nvhost_master *) \ + dev_get_drvdata((_dev)->dev.parent)) int nvhost_bus_add_host(struct nvhost_master *host); |