7 years agoARM: tegra3: Cluster Switch and LP0 require PM_SLEEP
Scott Williams [Thu, 21 Jul 2011 21:09:24 +0000]
ARM: tegra3: Cluster Switch and LP0 require PM_SLEEP

Change-Id: If3d4fa59cf6d7cd8692f6e5b59414a923abcfd0d
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Rec3560499e4c64fd76a873689691cbae59f7602b

7 years agoARM: tegra: LP2: Update statistics
Scott Williams [Fri, 22 Jul 2011 20:33:58 +0000]
ARM: tegra: LP2: Update statistics

Change-Id: Ic878edc316865df79a571255fd0462360599472a
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R206b2c1cd07c360ea2f5be1a54c9b29944bc1df3

7 years agoARM: tegra: LP2: Choose the earliest wakeup request
Scott Williams [Fri, 22 Jul 2011 20:25:52 +0000]
ARM: tegra: LP2: Choose the earliest wakeup request

This will wake up earlier if the other CPU's request is shorter.

Change-Id: I0abf20d482e5bd28893b2e014fcf50e6ac557241
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R65c18d77baf7b49be32bb7eb6825af2d1865d356

7 years agoARM: tegra: Add LP2 exit latency correction
Scott Williams [Fri, 22 Jul 2011 20:21:08 +0000]
ARM: tegra: Add LP2 exit latency correction

Change-Id: I37cb57f8674d8ddea3861fdc59543c3dfa8498db
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R0a1d0c79e22f9191bde70b8b05541c5bfe26f4df

7 years agoARM: tegra: Keep track of actual LP2 time
Scott Williams [Fri, 22 Jul 2011 20:15:39 +0000]
ARM: tegra: Keep track of actual LP2 time

Change-Id: I570b771b67f76123fb81b41ceb27bebb9c9e011f
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R5cace01cb03450d21fda2aca33ea806f13cc3015

7 years agoARM: tegra: Catch early LP2 exits
Scott Williams [Fri, 22 Jul 2011 00:44:21 +0000]
ARM: tegra: Catch early LP2 exits

Change-Id: I107d301ec8e8cd3b69ea293faab15b8d766e38f4
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R9f8f016c1850e2c65f30f2f67241a94acf8a7755

7 years agoARM: tegra: Prevent LP2 if request is less than target residency
Scott Williams [Fri, 22 Jul 2011 00:26:07 +0000]
ARM: tegra: Prevent LP2 if request is less than target residency

Change-Id: Icc7409b611439ba94ec504579c00ab9227c9a857
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R4b56e98c821627de480a67c241363608ebfc2f07

7 years agoARM: tegra: Idle event wakeup timer
Scott Williams [Fri, 22 Jul 2011 00:06:46 +0000]
ARM: tegra: Idle event wakeup timer

Change-Id: If072ef10f02d5be7560fdf42584ab11b2a863481
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Rf1ace67e281b1581501aaa936cd9137d326f2c4a

7 years agoARM: tegra2: Fix CONFIG_HOTPLUG_CPU dependencies
Scott Williams [Thu, 21 Jul 2011 20:55:08 +0000]
ARM: tegra2: Fix CONFIG_HOTPLUG_CPU dependencies

Change-Id: I54fab1134f2c51337da6f7b2ccc5ab304b600dea
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R45b2521f5d574774f1db13f6ef9ade5c116da9b4

7 years agoARM: tegra: Remove LP0/1/2 dependence on CONFIG_SMP
Scott Williams [Thu, 21 Jul 2011 20:52:01 +0000]
ARM: tegra: Remove LP0/1/2 dependence on CONFIG_SMP

LP0/1/2 do not require SMP.

Change-Id: I85572da9056a5120c13cd7e65a8062309541b52a
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Rf20625360cc8926949283b8cb477cf596f7fc3e9

7 years agoARM: tegra: Update tegra_lp0_suspend_init stubbing
Scott Williams [Thu, 21 Jul 2011 20:43:41 +0000]
ARM: tegra: Update tegra_lp0_suspend_init stubbing

Change-Id: I961125e938e72506dc304025b418e80387a5062e
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R393c5a77803f276467d2974041653eb92026601e

7 years agoARM: tegra: Rename flow control registers
Scott Williams [Thu, 21 Jul 2011 20:32:21 +0000]
ARM: tegra: Rename flow control registers

Change-Id: I2647718dc9c9420e57b24a810738c33ef05bcf61
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R6d5c6a52a2b0fd1dafd021d4a187528aeca26516

7 years agoARM: tegra: Always compile sleep.S
Scott Williams [Thu, 21 Jul 2011 20:29:11 +0000]
ARM: tegra: Always compile sleep.S

Decouple LP3 (WFI) mode and CPU hotplug shutdown from CONFIG_PM_SLEEP.

Change-Id: Ie959fa5e044ab4a7f84772d3b743ce2680465acc
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R8f01e646e7bf65350db44557de87c4c2a33d8059

7 years agoARM: tegra: sleep: Remove hard-coded register offset
Scott Williams [Thu, 21 Jul 2011 20:20:02 +0000]
ARM: tegra: sleep: Remove hard-coded register offset

Change-Id: I0fb4dc6ff2158d2d9661e3a231e02fc3ae0cc86e
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Ra4a5d9780d6329b2d029e3391c5d5145940c29c7

7 years agoARM: tegra: Rearrange pm.c for cleaner ifdefs
Scott Williams [Thu, 21 Jul 2011 20:16:25 +0000]
ARM: tegra: Rearrange pm.c for cleaner ifdefs

Change-Id: I02a8a10ee842bcc02d590f116484f4ff8d0705b0
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R1105e3976f266bf4e229510c8c5ae876f900b2ce

7 years agoARM: tegra: Fail when tegra2_cpu_reset is called by CPU 0
Scott Williams [Tue, 19 Jul 2011 22:19:42 +0000]
ARM: tegra: Fail when tegra2_cpu_reset is called by CPU 0

CPU 0 must be the last CPU to shutdown since it's the only one that can
perform CPU power gating or rail gating. Therefore, CPU 0 can reset CPU
1, but the reverse is not allowed.

Change-Id: I61296ee49d219a67c1fb864badc1170cd4684f8e
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R722033713d671fe702d9a7c0813993f9c7e6bd01

7 years agoARM: tegra2: Don't use tegra_cpu_save to exit coherency on reset
Scott Williams [Tue, 19 Jul 2011 22:13:40 +0000]
ARM: tegra2: Don't use tegra_cpu_save to exit coherency on reset

Change tegra2_sleep_reset not to depend on tegra_cpu_save to exit
coherency.

Now tegra2_sleep_reset no longer depends on CONFIG_PM_SLEEP

Change-Id: I478e723e826fd3ddbd6a6e8bceaedf795bd2ee26
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R2138dcf60971f7a9ad78e6a39fc2206c99faf7b5

7 years agoARM: tegra: Enable headsmp.S without CONFIG_SMP
Scott Williams [Tue, 19 Jul 2011 22:08:43 +0000]
ARM: tegra: Enable headsmp.S without CONFIG_SMP

In the current implementation for Tegra2, tegra_resume is required for
low power states, and it's coupled with CONFIG_SMP in headsmp.S. In
the implementation for Tegra3, we'll want to use tegra_resume even
without SMP.

Change-Id: I868eaf1de4f2898d2b1ad220638c0588901384c3
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R25c78e24b79d8bdd244c9cf5df85742047f71291

7 years agoARM: tegra: Clean up headsmp.S #ifdefs
Scott Williams [Tue, 19 Jul 2011 22:06:21 +0000]
ARM: tegra: Clean up headsmp.S #ifdefs

Should be functionally identical

Change-Id: Ib22b0bf3f529b32fcaec51f42f61a01aba45eec4
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Ra2a76d338caaed07ada1e24002cefe2bcf643bd2

7 years agoARM: tegra3: Remove FIXME for LP2 timers
Dan Willemsen [Thu, 21 Jul 2011 20:12:34 +0000]
ARM: tegra3: Remove FIXME for LP2 timers

Now that the LP2 timers exist, remove the FIXME

Change-Id: I72e3a5b1aadf79f3adfe40a865ac23c94342cf47
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Rceb895f0e2ef1871156a09ff6b582a47907ad3ec

7 years agoARM: tegra2: Add LP2 Timers
Scott Williams [Tue, 19 Jul 2011 00:42:46 +0000]
ARM: tegra2: Add LP2 Timers

Restore the Tegra2 LP2 timers that were dropped in the port to Linux
2.6.39.

Change-Id: Ie3958fa3c89886d5dc5a5858c694400bd1421741
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R63ede668965d11ac2b2114ffa817b690a616205a

7 years agoARM: tegra: Split sleep.S for Tegra2
Scott Williams [Mon, 18 Jul 2011 22:20:56 +0000]
ARM: tegra: Split sleep.S for Tegra2

Change-Id: I22bbfe62c6fed753a6852b12246f4a1f2414a96f
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R2d7985afe7ffafac651d747205e528331f5f993e

7 years agoARM: tegra: Build pm.c even without PM_SLEEP
Scott Williams [Mon, 18 Jul 2011 21:31:04 +0000]
ARM: tegra: Build pm.c even without PM_SLEEP

Change-Id: I13799aa03f86c7d83faf8ffa49954fef15aa0bdc
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Ra6e14b10f89a40a1f09169d864dbaa9e62c7280a

7 years agoARM: tegra: Make LP2 require CONFIG_PM_SLEEP
Scott Williams [Mon, 18 Jul 2011 21:19:07 +0000]
ARM: tegra: Make LP2 require CONFIG_PM_SLEEP

Change-Id: Iaaf96375eaf7408f5bedc4196d33a04fb94129ef
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R98567e0d894acbdac770b191f7e46f16592d5d0b

7 years agoARM: tegra2: Move LP2 into cpuidle-t2.c
Scott Williams [Mon, 18 Jul 2011 20:41:32 +0000]
ARM: tegra2: Move LP2 into cpuidle-t2.c

Move Tegra2 SOC-specific CPU idle functionality to cpuidle-t2.c

Change-Id: I26c94ca74d7a78665c52e23571c5058e3da240a7
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R1246e3942623458f5121ccdac3e6d4a1d40ad624

7 years agoARM: tegra: Move Tegra2 idlestats to cpuidle-t2.c
Scott Williams [Mon, 18 Jul 2011 18:34:12 +0000]
ARM: tegra: Move Tegra2 idlestats to cpuidle-t2.c

Change-Id: I2c0814cfefd820626beeba468edd9c462c6be8bb
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Rbbb70f49af4e731c953315ae81a96480ac25ff4d

7 years agoARM: tegra: Add cpuidle.h
Scott Williams [Fri, 22 Jul 2011 21:49:17 +0000]
ARM: tegra: Add cpuidle.h

Change-Id: I75ec091f9dcd0fa3fa56b1542f58a02006c1a314
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Ree5fce2632aff6dc59879817ad7ad3f2b1538244

7 years agoARM: tegra: Finish power.h -> sleep.h rename
Scott Williams [Mon, 18 Jul 2011 21:57:19 +0000]
ARM: tegra: Finish power.h -> sleep.h rename

Change-Id: I7e7698ee3a0b51e5d7ea21212806701b34e39064
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R324cb2c52cc2967be1189ef64ee6ac1bee8f60d0

7 years agoARM: tegra: Finish suspend.h -> pm.h rename
Scott Williams [Mon, 18 Jul 2011 18:51:19 +0000]
ARM: tegra: Finish suspend.h -> pm.h rename

Change-Id: Iad4b8a7c73ebe4b23a24b5986807358d481aac55
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Rb796a9ffc20dd4fbf9c463bc9cf3c175f4b03f88

7 years agoARM: tegra: update copyrights
Scott Williams [Thu, 21 Jul 2011 21:28:38 +0000]
ARM: tegra: update copyrights

Change-Id: If50d29696867787b38febd909910dda75475cc30
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R2275ad736d4dbee0a7b716ee6ea19b1863d8d4f8

7 years agoARM: tegra: Makefile reformat
Scott Williams [Mon, 18 Jul 2011 18:25:41 +0000]
ARM: tegra: Makefile reformat

Change-Id: If6003c2f30487b808303c9bfd1fba94bbee8026f
Signed-off-by: Scott Williams <scwilliams@nvidia.com>
DW: Split into logical changes
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R280a168f09d7b7ee521ec167fd6411ae6d2f8ddd

7 years agoHACK: cardhu: Disable KBC for now
Dan Willemsen [Fri, 15 Jul 2011 21:03:28 +0000]
HACK: cardhu: Disable KBC for now

Change-Id: I3d521bd16291e259d3fbbd07b1edf084b5d5d1d4
Reviewed-on: http://git-master/r/41284
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R02186adb5bea70779d009189fd4a8ab6878963c3

7 years agoARM: tegra: cardhu: Enable Atmel touchscreen
Dan Willemsen [Thu, 14 Jul 2011 20:52:33 +0000]
ARM: tegra: cardhu: Enable Atmel touchscreen

Config from android-tegra-2.6.36
bd2851636f71599498952db09c81a26d9e378da4

Change-Id: I5537567d80aa1b597733ebbec2b3bd6568e4df76
Reviewed-on: http://git-master/r/41085
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>

Rebase-Id: Rb0c3ce1016f3ac17efa259c4bc1515d9bdf17e21

7 years agoHACK: disable enterprise KBC
Dan Willemsen [Sun, 26 Jun 2011 02:14:25 +0000]
HACK: disable enterprise KBC

Rebase-Id: Rd59a699ec939d2098ab3ad60010bc4112e4eda0e

7 years agoHACK: enterprise: remove RESET_HANDLER
Dan Willemsen [Sun, 26 Jun 2011 02:03:37 +0000]
HACK: enterprise: remove RESET_HANDLER

Rebase-Id: R345db936d1d5892655ac69ebc2c67e001325f884

7 years agofixup whistler k39
Dan Willemsen [Fri, 24 Jun 2011 00:50:39 +0000]
fixup whistler k39

Rebase-Id: R7640f14db9b7d5a2bfaa73557dd781cec9290098

7 years agoARM: tegra: fuse: Don't fail when priv not passed in
Dan Willemsen [Wed, 15 Jun 2011 22:25:31 +0000]
ARM: tegra: fuse: Don't fail when priv not passed in

Rebase-Id: R63d06986e871cea59b0eb39d4290fa44b0312024

7 years agoHACK: cardhu: get sdmmc working
Dan Willemsen [Wed, 15 Jun 2011 01:03:18 +0000]
HACK: cardhu: get sdmmc working

Rebase-Id: Ra95b7ededf8b46c0646b20736153622de66aabef

7 years agoHACK: switch twd to cpu_cmplx clock parent
Dan Willemsen [Tue, 14 Jun 2011 22:17:18 +0000]
HACK: switch twd to cpu_cmplx clock parent

Rebase-Id: R7f45604fcf16338e8b182d40de8e2a96d41b445a

7 years agoHACK: tegra3: limit CPU DVFS to 'safe' values
Dan Willemsen [Tue, 14 Jun 2011 22:16:29 +0000]
HACK: tegra3: limit CPU DVFS to 'safe' values

Rebase-Id: Rb8c6bb9a9766387feb8d4c1a6b9d55d0cc8d8c56

7 years agoARM: tegra: clock: Don't fail clk_enable when max_rate has been lowered
Dan Willemsen [Tue, 14 Jun 2011 22:15:46 +0000]
ARM: tegra: clock: Don't fail clk_enable when max_rate has been lowered

Rebase-Id: Rea679b3ebef177d19f96bfc298d1f5da8588d6ad

7 years agoHACK: tegra3: disable Core DVFS
Dan Willemsen [Tue, 14 Jun 2011 01:58:54 +0000]
HACK: tegra3: disable Core DVFS

Rebase-Id: R11032fbfc6b2c722655d40df54e3e49a1a492926

7 years agoHACKY: timer-t3 updates for K39
Dan Willemsen [Tue, 14 Jun 2011 01:42:28 +0000]
HACKY: timer-t3 updates for K39

Rebase-Id: Re2ca6bafa842d114859a40c7ab19097fd86fc635

7 years agoHACK: allow tegra3 compile without SMP
Dan Willemsen [Tue, 14 Jun 2011 01:42:01 +0000]
HACK: allow tegra3 compile without SMP

Rebase-Id: R2f09e8a42a4fe3622924aa66acb13af0bb124e98

7 years agofixup: cardhu k39 updates
Dan Willemsen [Tue, 14 Jun 2011 01:41:18 +0000]
fixup: cardhu k39 updates

Rebase-Id: R3bfb891d902c53397bf23a004e1df078dc5a53d8

7 years agoHACK: cardhu: ignore audio
Dan Willemsen [Tue, 14 Jun 2011 01:41:00 +0000]
HACK: cardhu: ignore audio

Rebase-Id: R64fe759b83c0a49cd92e985610dcae070d1fc123

7 years agoHACK: cardhu: sdhci disable for upstream driver
Dan Willemsen [Tue, 14 Jun 2011 01:40:39 +0000]
HACK: cardhu: sdhci disable for upstream driver

Rebase-Id: Rf9b3ef358ab12992fef3a90c60ea1644c6194cf7

7 years agoARM: tegra: Move tegra_mc_init to arch_initcall
Dan Willemsen [Tue, 14 Jun 2011 00:51:06 +0000]
ARM: tegra: Move tegra_mc_init to arch_initcall

It's current spot, in tegra_early_init, was too early. It was being
called before we could allocate memory.

Rebase-Id: Rff026504107e75b33dccf714c5219d78c0d1dac9

7 years agoARM: tegra: Update cardhu boardfiles for K39
Dan Willemsen [Mon, 13 Jun 2011 22:35:15 +0000]
ARM: tegra: Update cardhu boardfiles for K39

Rebase-Id: R53c264de0e30d06937fd88d97b9709b35c069f6d

7 years agoget tegra3 compiling
Dan Willemsen [Mon, 13 Jun 2011 20:32:48 +0000]
get tegra3 compiling

Rebase-Id: R03f1fc69f4859a0dc66fbd145eb0df31650de3ac

7 years agoHACK: platsmp.c/pm-t3.c ignore compile errors
Dan Willemsen [Sat, 11 Jun 2011 03:23:16 +0000]
HACK: platsmp.c/pm-t3.c ignore compile errors

Rebase-Id: Ra4550b3ee066c825b3484bac1e928fe8c086e0c4

7 years agoHACK: disable headsmp-t3.S
Dan Willemsen [Sat, 11 Jun 2011 01:18:03 +0000]
HACK: disable headsmp-t3.S

Rebase-Id: R6001fd0dada0a331fdfe083d4396ba472d470b3d

7 years agofixup tegra3_clocks.c twd clock
Dan Willemsen [Sat, 11 Jun 2011 01:17:21 +0000]
fixup tegra3_clocks.c twd clock

Rebase-Id: Rdf8da5a3f9ed1bdaa16cddf9ada51cf02905052e

7 years agofixup tegra3_clocks.c includes
Dan Willemsen [Sat, 11 Jun 2011 01:17:08 +0000]
fixup tegra3_clocks.c includes

Rebase-Id: R4e1ea8c17100b9533a2303d872ae72aaf48dada9

7 years agofix tegra_cluster_switch compile
Dan Willemsen [Sat, 11 Jun 2011 00:57:06 +0000]
fix tegra_cluster_switch compile

Rebase-Id: R6ebe0a0a67317e00b7cc30d2d2b9485c9c396185

7 years agoARM: tegra: Disable tegra3_save.S
Dan Willemsen [Fri, 10 Jun 2011 20:57:12 +0000]
ARM: tegra: Disable tegra3_save.S

Rebase-Id: R97ea582dcab2af31a9ea19b5531d5829baacf0c6

7 years agosee bbc81fd4327f9ed4480b05981e38acd48b1d184a
Dan Willemsen [Fri, 10 Jun 2011 20:33:05 +0000]
see bbc81fd4327f9ed4480b05981e38acd48b1d184a

Rebase-Id: Re974e9426a989f702b33a78b612cd5485ce89d12

7 years agoHACK: disable DVFS - tegra otg was calling clk_enable in atomic context
Dan Willemsen [Sun, 15 May 2011 00:04:36 +0000]
HACK: disable DVFS - tegra otg was calling clk_enable in atomic context

Rebase-Id: Rfab78b9c453b9c1f55c780f8c99507a58cbeaece

7 years agoGet ventana booting
Dan Willemsen [Fri, 10 Jun 2011 00:22:49 +0000]
Get ventana booting

Rebase-Id: R2a51f3c9837582a4a1283ed9c292de2d334682c5

7 years agoARM: tegra: ventana GPIO keys, regulator power
Dan Willemsen [Wed, 18 May 2011 22:07:02 +0000]
ARM: tegra: ventana GPIO keys, regulator power

Rebase-Id: Rcd2e8847135818a4a08515767cb6e050a6acd08e

7 years agoFix kernel panic
Dan Willemsen [Wed, 18 May 2011 17:01:22 +0000]
Fix kernel panic

Rebase-Id: R752f37acc613a810b659f9ccc48b8f2abb340bb2

7 years agoconvert to new atmel driver
Dan Willemsen [Tue, 17 May 2011 22:07:32 +0000]
convert to new atmel driver

Rebase-Id: Rf7adaaf2eaa1a12e8686e2518a2a2ccfb56df5c9

7 years agoARM: tegra: ventana: Fix battery driver registration
Dan Willemsen [Tue, 17 May 2011 21:15:44 +0000]
ARM: tegra: ventana: Fix battery driver registration

Rebase-Id: R06b79ae8b8d9610ff1fd4958b09e67852ab79dc8

7 years agoARM: tegra: ventana: Update KBC for upstream driver
Dan Willemsen [Tue, 17 May 2011 20:07:35 +0000]
ARM: tegra: ventana: Update KBC for upstream driver

Rebase-Id: R022aebd091ae3dabe82863434cc25208518c8445

7 years agoARM: tegra: Update ventana boardfiles for k39
Dan Willemsen [Sat, 14 May 2011 02:28:03 +0000]
ARM: tegra: Update ventana boardfiles for k39

Rebase-Id: Rc1fbe4548e4482dab61877b36a6a7921a8602b57

7 years agoremove placeholders
Dan Willemsen [Thu, 5 May 2011 03:47:54 +0000]
remove placeholders

Rebase-Id: R1dbf37d34132ebe69f0c250a9457a7c5096e3d31

7 years agoDEVFIX: fix dc merge
Dan Willemsen [Thu, 5 May 2011 01:38:56 +0000]
DEVFIX: fix dc merge

Rebase-Id: Rd6f97c469cf65f29226275364e6573e0b26c53b4

7 years agoDEVFIX: upstreamed
Dan Willemsen [Wed, 13 Apr 2011 20:30:33 +0000]
DEVFIX: upstreamed

Rebase-Id: Rebec6e6d6ea7463417a63bcf5fe30cb9f8aa0211

7 years agoresolve merge: drivers/media/video/tegra/Makefile
Dan Willemsen [Tue, 15 Feb 2011 23:11:31 +0000]
resolve merge: drivers/media/video/tegra/Makefile

Rebase-Id: R093dc181bed1f6cebc8f97893ef0962c06a08bcd

7 years agoARM: tegra: dc: Keep DC interrupts disabled on FPGA
Scott Williams [Tue, 29 Mar 2011 17:37:38 +0000]
ARM: tegra: dc: Keep DC interrupts disabled on FPGA

Ignore DC interrupts on FPGA because they are a known limitation of
FPGAs and there's nothing that can be done about them.

Original-Change-Id: I161f422082dc0b1a581209b98421888dfff6fefa
Reviewed-on: http://git-master/r/24709
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: Id69afe129d8256abbaed726fc55387f6b23dc36d

Rebase-Id: R1059fca241305e350b4f2a7ea32d6fb1bd3924e8

7 years agoarm: tegra: Re-enable system reset
Scott Williams [Thu, 10 Feb 2011 23:45:06 +0000]
arm: tegra: Re-enable system reset

Bug 790662

Original-Change-Id: I0c194455d4fb6e3326b60a14a5e459fe0e181c56
Reviewed-on: http://git-master/r/19158
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: Ia91788b8ada6bcc411c3ee8c2ebf1ee717ca0199

Rebase-Id: R77131d678c4589b4731c0bc1fafd02174e69e561

7 years agoarm: tegra: Disable system reset
Scott Williams [Fri, 28 Jan 2011 11:26:28 +0000]
arm: tegra: Disable system reset

Temporarily disable the ability of the OS to reset the target.

Original-Change-Id: I12b3b7b1d66061bb17dcd9fabd4fd79395c37880
Reviewed-on: http://git-master/r/17464
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: I36b7471965378a342d50369700ab5d439f80cf9d

Rebase-Id: Re38709f60b8082cd05b77a13c8c9012d8a6772b0

7 years agotegra: dc: Don't enable display interrupt on FPGA
Scott Williams [Mon, 10 Jan 2011 21:32:23 +0000]
tegra: dc: Don't enable display interrupt on FPGA

Bug 776857

Original-Change-Id: I4b357ab66ec167f53a4112a4cd0e165dced4b947
Reviewed-on: http://git-master/r/15423
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Reviewed-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: I7aefe9605ec983cf73b19964b7d59c3bba3f43ef

Rebase-Id: Re9bdb6acac56cb903ab7cdc3cc9af74c67f0d79d

7 years agotegra: dc: Support non-standard FPGA display panel
Scott Williams [Mon, 10 Jan 2011 21:07:57 +0000]
tegra: dc: Support non-standard FPGA display panel

The display panel sub-board used on FPGA platforms (panel 86)
is non-standard. It expects the Data Enable signal on the WR
pin instead of the DE pin.

Bug 776857

Original-Change-Id: Icdb5ed46010c41155c1729ceca6d4df7a7041bf1
Reviewed-on: http://git-master/r/15420
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: Iaa588090df72167d9d25bdff97e369f20b957fd8

Rebase-Id: R10dec84f7cadb511245d55a6271fc171068cb8d3

7 years agoarm: tegra: Don't permit reset on an FPGA target
Scott Williams [Sat, 8 Jan 2011 04:43:13 +0000]
arm: tegra: Don't permit reset on an FPGA target

Do not allow the framework to attempt to reset an FPGA target platform.
It won't work and it will destroy the ability to debug the cause.

Bug 776857

Original-Change-Id: I27c410c42a10e8a952c7c4c978020a3675937a89
Reviewed-on: http://git-master/r/15318
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Jin Qian <jqian@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: If61c786841ae5ff62c5997f0f51eb909890ac6b2

Rebase-Id: R72b785f9535c276e2d8993874b194ad1e622f322

7 years agoARM: Disallow DCC writes from secondary processors
Scott Williams [Mon, 20 Dec 2010 23:40:35 +0000]
ARM: Disallow DCC writes from secondary processors

An attempt to access the DCC console from secondary processors will
result in those processors hanging because the JTAG debugger can only
communicate with one core at a time. Allow DCC output only from CPU 0.

Useful for bringup, not necessarily for upstream

Original-Change-Id: I9118555438f5b72b16a2dfccd5b6f98860505d6d
Reviewed-on: http://git-master/r/13876
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Tested-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: I36bb0351e0899f4ad8732fe784623f7eea57dff5

Rebase-Id: R32383c2b0268f8111444b7b75c4fa3d2b3ddbaef

7 years agompu3050: Motion Libraries: Update MPU board file to v3.3.4.
Robert Collins [Wed, 20 Apr 2011 20:27:37 +0000]
mpu3050: Motion Libraries:  Update MPU board file to v3.3.4.

Update 2 of 3: MPU 3050 Board file.  Depends on MPU kernel
and defconfig files.

BUG 808052

Original-Change-Id: Ib6fc78e00c2b747155b480123cb1cdfb029dc4ae
Reviewed-on: http://git-master/r/29725
Reviewed-by: Niket Sirsi <nsirsi@nvidia.com>
Tested-by: Niket Sirsi <nsirsi@nvidia.com>

Rebase-Id: R1750e2cd527b4610fed17f5c4930695527c1806b

7 years agompu3050: Motion Libraries: Update MPU kernel to v3.3.4.
Robert Collins [Wed, 20 Apr 2011 20:23:12 +0000]
mpu3050: Motion Libraries:  Update MPU kernel to v3.3.4.

Update 1 of 3:  MPU kernel files.  Depends on board file and
defconfig file.

BUG 808052

Original-Change-Id: I42b08570d3a8dac090860276e04f6d2ab7545461
Reviewed-on: http://git-master/r/29724
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Robert R Collins <rcollins@nvidia.com>
Tested-by: Robert R Collins <rcollins@nvidia.com>

Rebase-Id: R13b53bb717968041f18f76031f32377fabdf8c43

7 years agoARM: tegra: cardhu: sensor: support for rear right camera
Prayas Mohanty [Wed, 13 Apr 2011 07:00:56 +0000]
ARM: tegra: cardhu: sensor: support for rear right camera

- Add support for camera-B.
- Have separate power on/off handler for each camera sensor.
- Remove invidual query for boardId, and bookkeeping boardId information
in a static variable during cardhu_sensors_init.

bug: 787214
bug: 786928

Original-Change-Id: Icc15a4cd6f113dd54adf197498f3b214595a53fd
Reviewed-on: http://git-master/r/27023
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Original-Change-Id: Ie5c06897a4f5c446aeeda168769e80d1a717e479

Rebase-Id: R776d0b86f61ff9c1daa5f2a0388680ca90871107

7 years agoarm: tegra: cardhu: Registering mpu3050 for E1291 only
Laxman Dewangan [Wed, 13 Apr 2011 08:38:48 +0000]
arm: tegra: cardhu: Registering mpu3050 for E1291 only

Registering the mpu sensor MPU3050 for the E1291 based
cardhu system only.

Original-Change-Id: I614d5496bad34e465d58163e9590d41fefab822e
Reviewed-on: http://git-master/r/27608
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Ramachandrudu Kandhala <rkandhala@nvidia.com>
Reviewed-by: Robert R Collins <rcollins@nvidia.com>
Original-Change-Id: I32bb6997dd504c4c070ba27a5e223f4a325d1f96

Rebase-Id: Rb30429965bb8edf799905a39ca843def5b4cf724

7 years agompu3050: Motion Libraries: Invensense MPU code update to v3.3.3.
Robert Collins [Fri, 18 Mar 2011 21:29:07 +0000]
mpu3050: Motion Libraries: Invensense MPU code update to v3.3.3.

Update Invensense Motion Library (MPL) to production version
v3.3.3. Previous version was engineering release and is not
suitable for mass production. This version of the MPL most
notably fixes problems with suspend/resume where touch screen
would quit working during a suspend/resume cycle.

Original-Change-Id: Id061bccf39adb34dda124f7ba18d5956885328dd
Reviewed-on: http://git-master/r/23590
Reviewed-by: Robert R Collins <rcollins@nvidia.com>
Tested-by: Robert R Collins <rcollins@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Original-Change-Id: Ibef0777548486e7ee2504d979e05bdd8fab3a7d8

Rebase-Id: R726205045a29cba87a941b8af5c8356c0543a6ff

7 years agoARM:tegra:ventana:Sensors Invensense MPU code v3.3.3
vsalve [Tue, 15 Mar 2011 10:19:09 +0000]
ARM:tegra:ventana:Sensors Invensense MPU code v3.3.3

Original-Change-Id: I5e96ea2280326cb91aa4f32c56b88aece9c7aac2
Reviewed-on: http://git-master/r/22991
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

Rebase-Id: Rf0e1503e3e9c4dcfac7295844f476593968e7737

7 years agomisc: mpu3050: Invensense MPU code update v3.3.3
vsalve [Tue, 15 Mar 2011 09:59:43 +0000]
misc: mpu3050: Invensense MPU code update v3.3.3

Update Invensense Motion Library (MPL) to production version
v3.3.3. Previous version was engineering release and is not
suitable for mass production. This version of the MPL most
notably fixes problems with suspend/resume where touch screen
would quit working during a suspend/resume cycle.

Original-Change-Id: Ia33433a677862b3d1e31d410aac7176d7a381a8f
Reviewed-on: http://git-master/r/22987
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

Rebase-Id: R8832ce6cbb6eaec0afb32a2265c55b45f7391cb3

7 years agoInvensense: simplify Kconfig
Dan Willemsen [Sat, 5 Mar 2011 20:00:33 +0000]
Invensense: simplify Kconfig

This change makes the choices optional, and removes redundant entries.
With this change, the minimal defconfig format doesn't want to always
build the mpu3050 as a module.

Original-Change-Id: Ic6dc65e982bc59671e27adbce257bf14bc97777c

Rebase-Id: R197cb8c3a6a2792960819056b5f6eb24b1c720ae

7 years agoDriver: Misc: Sensors: MPU: enable kxtf9 and ak8975
Wen Yi [Fri, 4 Feb 2011 21:55:07 +0000]
Driver: Misc: Sensors: MPU: enable kxtf9 and ak8975

BUG 771526

Corrected the mismatched CONFIG_SENSOR_KXTF9 and
CONFIG_SENSOR_AK8975 to CONFIG_SENSOR_KXTF9_MPU
and CONFIG_SENSOR_AK8975_MPU

Original-Change-Id: I760bfdd5cbdd91acdf9ce10ee5be5fcfa0a9c5ab
Reviewed-on: http://git-master/r/18377
Reviewed-by: Wen Yi <wyi@nvidia.com>
Tested-by: Wen Yi <wyi@nvidia.com>
Reviewed-by: Robert R Collins <rcollins@nvidia.com>
Tested-by: Robert R Collins <rcollins@nvidia.com>
Reviewed-by: Jeremy Wyman <jwyman@nvidia.com>
Tested-by: Jeremy Wyman <jwyman@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>

Rebase-Id: R7428db1a61c508ae56afc6fd590f750afa8ca6a5

7 years ago[ARM] tegra: ventana: Invensense MPU update
Wen Yi [Fri, 28 Jan 2011 23:34:43 +0000]
[ARM] tegra: ventana: Invensense MPU update

Update tegra board file to include Invensense MPU3050 drivers
Depends on Change-Id: Iceb3ef8b11d4ce18fd3cb0947268744775b81758
BUG 784570

Original-Change-Id: Ieb75676128fbde4797f8fe6298e57f29b5a2db13
Reviewed-on: http://git-master/r/17527
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

Rebase-Id: Rd9be2d7c372d6e2bef6b72a686a8864c304a7d5a

7 years ago[ARM/tegra] Invensense MPU3050 sensor board support.
Robert Collins [Wed, 1 Dec 2010 22:44:07 +0000]
[ARM/tegra] Invensense MPU3050 sensor board support.

Original-Change-Id: I17ec64c268bb803966810d3a181140c2b6774245
Reviewed-on: http://git-master/r/11813
Tested-by: Robert R Collins <rcollins@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

Rebase-Id: R27d30b4e1558b0e7c51709fd2f4577accdca344e

7 years agoPort Invensense MPU3050 drivers into tegra-2.6.36
Wen Yi [Fri, 28 Jan 2011 22:38:45 +0000]
Port Invensense MPU3050 drivers into tegra-2.6.36

Original-Change-Id: Iceb3ef8b11d4ce18fd3cb0947268744775b81758
Reviewed-on: http://git-master/r/17525
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>

Rebase-Id: R5aa1acdb6de5265529a9695f6cc996d4cf0dbfec

7 years ago[ARM/tegra] Integrate Accelerometer source code files.
Robert Collins [Tue, 23 Nov 2010 21:54:32 +0000]
[ARM/tegra] Integrate Accelerometer source code files.

Inegrate MPL libraries and the following sensors:
Accelerometers:
kxtf9

Compi:
ak8975

Original-Change-Id: I450b5b7ff018249a19bb23b78e722e9a355b7bd8
Reviewed-on: http://git-master/r/11803
Tested-by: Robert R Collins <rcollins@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

Rebase-Id: R76e2da39a90190d176552fdb11aab2009964023f

7 years agoMerge branch 'boardfiles/whistler' into after-boardfiles
Dan Willemsen [Thu, 1 Dec 2011 05:46:32 +0000]
Merge branch 'boardfiles/whistler' into after-boardfiles

7 years agoMerge branch 'boardfiles/ventana' into after-boardfiles
Dan Willemsen [Thu, 1 Dec 2011 05:46:31 +0000]
Merge branch 'boardfiles/ventana' into after-boardfiles

7 years agoMerge branch 'boardfiles/enterprise' into after-boardfiles
Dan Willemsen [Thu, 1 Dec 2011 05:46:30 +0000]
Merge branch 'boardfiles/enterprise' into after-boardfiles

7 years agoMerge branch 'boardfiles/harmony' into after-boardfiles
Dan Willemsen [Thu, 1 Dec 2011 05:46:30 +0000]
Merge branch 'boardfiles/harmony' into after-boardfiles

7 years agoMerge branch 'boardfiles/cardhu' into after-boardfiles
Dan Willemsen [Thu, 1 Dec 2011 05:46:29 +0000]
Merge branch 'boardfiles/cardhu' into after-boardfiles

7 years agoARM: tegra: Whistler K39 updates
Dan Willemsen [Thu, 23 Jun 2011 23:45:48 +0000]
ARM: tegra: Whistler K39 updates

Rebase-Id: Ra87c1d4245a0ce31e3fe7529f06ca18fbe703706

7 years agoFix incorrect license.
Maria Gutowski [Fri, 27 May 2011 01:44:51 +0000]
Fix incorrect license.

Change-Id: Iefa77c7f9f8dcf9f21ea62ac4ccaf8a7954bfa99
Reviewed-on: http://git-master/r/34230
Reviewed-by: Maria Gutowski <mgutowski@nvidia.com>
Tested-by: Maria Gutowski <mgutowski@nvidia.com>

Rebase-Id: Rbbedcebfaef4d21593024e25b3d17647214dda10

7 years agoarm: tegra: Declare tegra_throttling_enable in .h
Robert Morell [Thu, 19 May 2011 16:31:45 +0000]
arm: tegra: Declare tegra_throttling_enable in .h

The build currently fails for some boards when CONFIG_CPU_FREQ=n, since
we don't build cpu-tegra.c but tegra_throttling_enable is still
referenced.  To fix this:
- Add cpu-tegra.h
- Define tegra_throttling_enable to NULL in the header if either
  CONFIG_CPU_FREQ or CONFIG_TEGRA_THERMAL_THROTTLE are not set
- Use the header file instead of declaring the function extern
  everywhere it's used

Bug 829501

Change-Id: Ice84309546dee201f991a1194fefd80583afc455
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Reviewed-on: http://git-master/r/32208
Reviewed-by: Allen R Martin <amartin@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Diwakar Tundlam <dtundlam@nvidia.com>
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Diwakar Tundlam <dtundlam@nvidia.com>
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>

Rebase-Id: Rb5c3398cf5682d6b5573f91b2faccca931059b45

7 years agoARM: tegra: Modify DDC (i2c2) clock rate as 100KHz
Haley Teng [Mon, 2 May 2011 05:59:08 +0000]
ARM: tegra: Modify DDC (i2c2) clock rate as 100KHz

Per the 8.4.1 section of HDMI spec version 1.4a, 100KHz is the maximum
clock rate of DDC i2c bus.

Bug 820552

Change-Id: I7990309c4f3485c9c356623468cfabe25d733604
Signed-off-by: Haley Teng <hteng@nvidia.com>
Reviewed-on: http://git-master/r/29966
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Alok Chauhan <alokc@nvidia.com>

Rebase-Id: Rbdb18e5942ce5a9ae3edcdfe7e1aeee4ae94e925

7 years agoHACK: fix whistler build
Dan Willemsen [Tue, 26 Apr 2011 00:47:03 +0000]
HACK: fix whistler build

Change-Id: Ic78a86dd1e7a465f0de1f3fb9a5c72e2eb3e8ab0

Rebase-Id: Rf493e8ce71a8cd12f0e1bd406ca9c20b6ce12514

7 years agoMerge remote branch 'git-master/android-tegra-2.6.36' into merge-android
Jin Qian [Thu, 30 Dec 2010 01:35:51 +0000]
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

Rebase-Id: R3ddecd31d02becef183c6113ee1c3bd9c7741791