diff options
| author | Sumeet Gupta <sumeetg@nvidia.com> | 2012-09-11 20:07:57 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-09-25 11:48:45 -0700 |
| commit | 43158af3922e330efb4a02f00ac896fc1d4760d6 (patch) | |
| tree | e2a5454172eb119a1a7b3d91f5dcb60dc16b5417 /arch/arm/mach-tegra/board-p1852.c | |
| parent | dcd076459e65fca6d57d6b7e69928eca70cd1b29 (diff) | |
arm: tegra: 1852: Fix boot issues with K3.4.
Camera device still causes boot to hang.
So, disabling CONFIG_TEGRA_CAMERA
(The hang is in power-gating the partition)
Bug 1044978
Change-Id: Ife8c377ac8d3173fbfb027342eec685a3c5f9448
Signed-off-by: Sumeet Gupta <sumeetg@nvidia.com>
Reviewed-on: http://git-master/r/131446
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-p1852.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-p1852.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-p1852.c b/arch/arm/mach-tegra/board-p1852.c index a84ff3097a6a..a2d120f6dde6 100644 --- a/arch/arm/mach-tegra/board-p1852.c +++ b/arch/arm/mach-tegra/board-p1852.c @@ -51,6 +51,7 @@ #include <asm/mach/flash.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +#include <asm/hardware/gic.h> #include <asm/system.h> #include <mach/usb_phy.h> #include <mach/tegra_fiq_debugger.h> @@ -367,6 +368,7 @@ static struct platform_device *p1852_devices[] __initdata = { &tegra_avp_device, #endif &tegra_camera, + &tegra_wdt0_device, &tegra_wdt1_device, &tegra_wdt2_device @@ -685,4 +687,5 @@ MACHINE_START(P1852, "p1852") .map_io = tegra_map_common_io, .reserve = tegra_p1852_reserve, .timer = &tegra_timer, + .handle_irq = gic_handle_irq, MACHINE_END |