diff options
| author | Jin Qian <jqian@nvidia.com> | 2010-12-29 17:35:51 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:48:55 -0700 |
| commit | 5042cb6656ce34baf449d2d5f2f2890d1ff82e4f (patch) | |
| tree | 6be29f2c50e813fc40128acd06c0bd523d5eac26 /drivers | |
| parent | 93cd7e592f9ac76c0f2799436a9e46b26b22febe (diff) | |
Merge remote branch 'git-master/android-tegra-2.6.36' into merge-android
Conflicts:
arch/arm/configs/tegra_defconfig
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-ventana-power.c
arch/arm/mach-tegra/board-ventana-sensors.c
arch/arm/mach-tegra/board-ventana.c
arch/arm/mach-tegra/clock.c
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/cpu-tegra.c
arch/arm/mach-tegra/fuse.c
arch/arm/mach-tegra/headsmp.S
arch/arm/mach-tegra/tegra2_dvfs.c
arch/arm/tools/mach-types
drivers/rtc/rtc-tegra.c
drivers/usb/gadget/fsl_udc_core.c
drivers/video/tegra/host/dev.c
drivers/video/tegra/host/nvhost_channel.c
drivers/video/tegra/host/nvhost_intr.c
Original-Change-Id: I1e9b6d0e761cf1e95cf90b78b5932b53fcb9bb5e
(cherry picked from commit 2f331e046f7c4cfc6ab54fca3193035b3bf3a14f)
Reviewed-on: http://git-master/r/14572
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: I29db8796b2e27a8d218c332de36f880a7cf4bcb2
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/rtc/rtc-tegra.c | 5 | ||||
| -rw-r--r-- | drivers/video/tegra/host/dev.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-tegra.c b/drivers/rtc/rtc-tegra.c index 04292d4057fc..c1fbf9597b34 100644 --- a/drivers/rtc/rtc-tegra.c +++ b/drivers/rtc/rtc-tegra.c @@ -23,12 +23,11 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/module.h> +#include <asm/io.h> #include <linux/delay.h> #include <linux/rtc.h> #include <linux/platform_device.h> -#include <asm/io.h> - /* how many attempts to wait in tegra_rtc_wait_while_busy(). */ #define RTC_TEGRA_RETRIES 15 @@ -481,8 +480,10 @@ static struct platform_driver tegra_rtc_driver = { .name = "tegra_rtc", .owner = THIS_MODULE, }, +#ifdef CONFIG_PM .suspend = tegra_rtc_suspend, .resume = tegra_rtc_resume, +#endif }; static int __init tegra_rtc_init(void) diff --git a/drivers/video/tegra/host/dev.c b/drivers/video/tegra/host/dev.c index a5c4ec59fcc6..eeffcef06bdb 100644 --- a/drivers/video/tegra/host/dev.c +++ b/drivers/video/tegra/host/dev.c @@ -30,6 +30,7 @@ #include <linux/platform_device.h> #include <linux/uaccess.h> #include <linux/file.h> +#include <linux/clk.h> #include <asm/io.h> @@ -726,12 +727,12 @@ static int __devinit nvhost_probe(struct platform_device *pdev) err = nvhost_module_init(&host->mod, "host1x", power_host, NULL, &pdev->dev); if (err) goto fail; + platform_set_drvdata(pdev, host); + clk_enable(host->mod.clk[0]); nvhost_syncpt_reset(&host->syncpt); clk_disable(host->mod.clk[0]); - platform_set_drvdata(pdev, host); - nvhost_bus_register(host); nvhost_debug_init(host); |