makarand.karvekar [Wed, 27 Oct 2010 20:06:35 +0000 (15:06 -0500)]
[ARM] tegra: edge and multi-touch tuning for stingray
improved touch reporting at edges.
improved multi-touch touch reports(for keypad).
increased number of touches to 10.
Change-Id: I866de3bf45ba96d23ab0d975131a0f0a5055815f
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
Sergey Kudakov [Wed, 20 Oct 2010 20:38:32 +0000 (15:38 -0500)]
input: touchscreen: qtouch: resume touch after display
Signed-off-by: Sergey Kudakov <sergey.kudakov@motorola.com>
Erik Gilling [Wed, 27 Oct 2010 04:09:54 +0000 (21:09 -0700)]
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: I9d242079e228853e884997e8bb6cb4d913f0c34d
Erik Gilling [Wed, 27 Oct 2010 04:08:37 +0000 (21:08 -0700)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: Ifde4541e78b49ef83ed11d3a488c6580cf89af15
Erik Gilling [Wed, 27 Oct 2010 04:05:43 +0000 (21:05 -0700)]
video: tegra: fix dvfs for hdmi
Change-Id: I4e6eef34a1e794e622bec10c9025b3820cd6ba8d
Signed-off-by: Erik Gilling <konkers@android.com>
Colin Cross [Wed, 27 Oct 2010 03:33:24 +0000 (20:33 -0700)]
ARM: tegra: dvfs: hdmi can not be an auto dvfs clock
The hdmi block contains a divider that is not visible to the clock
subsystem, prevent auto dvfs on it so that clk_set_rate can set the
input clock higher than 148.5 MHz.
Change-Id: I7f09f4d099e2f24166a65b1b582fe16c1451deba
Signed-off-by: Colin Cross <ccross@android.com>
James Wylder [Fri, 15 Oct 2010 15:04:57 +0000 (10:04 -0500)]
[ARM] tegra: stingray: update CPU Power Good and Power off Times
Change-Id: I4dc3a5dc3fb26c786b459c16b52b299ce7251506
Signed-off-by: James Wylder <james.wylder@motorola.com>
prabhu annabathula [Mon, 25 Oct 2010 18:31:59 +0000 (13:31 -0500)]
[ARM] tegra: stingray: pull up on TEGRA_PINGROUP_SDIO1 (UARTE)
UARTE used by GPS is changed to 4-wire connect between
Broadcom chip and Tegra from P3 hardwares.
uart5_cts_n is not connected in hardware versions < P3, pull down
on cts line pin to keep it low in hardware versions < P3.
Signed-off-by: prabhu annabathula <prabhu.annabathula@motorola.com>
Greg Meiste [Tue, 26 Oct 2010 20:56:44 +0000 (15:56 -0500)]
firmware: cpcap: Reset SW2 and SW4 on soft reset
When given the signal from the host to stop so a soft reset can
occur, the uC also needs to reset SW2 and SW4 to their default
voltages to ensure the host can power back up.
Change-Id: I40e075011d2bf2caf4c495cb66147f2e2a449fdf
Signed-off-by: Greg Meiste <w30289@motorola.com>
Nathan Connell [Tue, 26 Oct 2010 13:40:16 +0000 (08:40 -0500)]
ARM: tegra: stingray: Run SDIO2 clock from PLLM at 50MHz
Run the SDIO2 clock at 50 MHz to avoid EMI in the GPS receive band
Change-Id: I101b82a99e1071db0916db8c62a321a0563ec5ad
Signed-off-by: Nathan Connell <w14185@motorola.com>
Erik Gilling [Wed, 27 Oct 2010 01:24:50 +0000 (18:24 -0700)]
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Conflicts:
drivers/mmc/host/sdhci-tegra.c
Change-Id: I52c329c835d80d868c731b23ca2d9dfad6e6586e
Erik Gilling [Wed, 27 Oct 2010 01:22:24 +0000 (18:22 -0700)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I0d4216b0a407e50c029a6c0869d727b188f7da04
Erik Gilling [Tue, 26 Oct 2010 22:30:35 +0000 (15:30 -0700)]
video: tegra: flesh out edid support
* read blocks in a single command instead of byte at a time
* allow reading past segment 0 (edid > 256 bytes)
* handle mutiple extention blocks
* add debugfs file for reading edid
Change-Id: Iec8182cdbccdaa2142e4bbc892202d2e8d73c23b
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Tue, 26 Oct 2010 22:29:11 +0000 (15:29 -0700)]
video: tegra: transmute HDMI modes into supported ones
Change-Id: I37222e9d1617a0ace062e05740365cfe5c0c2af8
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Tue, 26 Oct 2010 22:21:23 +0000 (15:21 -0700)]
video: tegra: allow setting output mode without changing fb geometry
Change-Id: I0a723b4e68c99d2727e12d2c26f1506b1f634f8a
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Tue, 26 Oct 2010 21:25:48 +0000 (14:25 -0700)]
video: tegra: add IOCTL for querying modes
Change-Id: Ic312271b96a8bb8d8b2696448d3ff7fd73a7a851
Signed-off-by: Erik Gilling <konkers@android.com>
Colin Cross [Wed, 27 Oct 2010 00:33:31 +0000 (17:33 -0700)]
ARM: tegra: clock: Don't restore PLLP registers
The PLLP registers are now being restored by the low-level resume code,
and the CPU may be running off PLLP, so don't touch them during clock
resume.
Change-Id: Ida248a929c8b59f2e51f43dbbef1cd792ef68737
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 27 Oct 2010 00:32:13 +0000 (17:32 -0700)]
ARM: tegra: suspend: Save and restore PLLP in low-level suspend
Save and restore the PLLP registers in the platform suspend code, as
the CPU clock may be sourced from the PLLP registers later, before
the clock resume that used to re-enable PLLP has been called.
Change-Id: I0ffc18d8a7f2d62c544328bd44ca7cf62848bc44
Signed-off-by: Colin Cross <ccross@android.com>
Iliyan Malchev [Thu, 21 Oct 2010 23:48:37 +0000 (16:48 -0700)]
[ARM] tegra: dma: expose TEGRA_DMA_MAX_TRANSFER_SIZE, fix typo
NV_DMA_MAX_TRASFER_SIZE --> TEGRA_DMA_MAX_TRANSFER_SIZE
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Wed, 20 Oct 2010 23:48:18 +0000 (16:48 -0700)]
[ARM] tegra: dma: make checkpatch happy
Signed-off-by: Iliyan Malchev <malchev@google.com>
Benoit Goby [Wed, 20 Oct 2010 04:58:13 +0000 (21:58 -0700)]
mdm6600: Force tty->low_latency to 1
This makes the tty push data immediately to the ldisc when
flip_buffer_push is called instead of scheduling a delayed
workqueue. This fixes the dropped data problem.
Change-Id: I9558e3b4529653983ec9bf8af8ae7c8f8c25787f
Signed-off-by: Benoit Goby <benoit@android.com>
John Kramer [Tue, 19 Oct 2010 19:31:30 +0000 (14:31 -0500)]
media: video: tegra: Add features to soc2030
Add user white balance, effects and exposure support
to the soc2030 2MP camera sensor driver
Change-Id: I8f572b9369bbbbab89b49a60046f48dbcb54b33d
Signed-off-by: John Kramer <john.kramer@motorola.com>
Todd Poynor [Mon, 11 Oct 2010 22:31:42 +0000 (15:31 -0700)]
tegra sdhci: Enable/disable SDCLK source in set_clock host_op
Change-Id: I08efc82429a2422a6038d7c50399850223fad240
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Colin Cross [Tue, 26 Oct 2010 01:51:19 +0000 (18:51 -0700)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Conflicts:
arch/arm/mach-tegra/tegra2_clocks.c
Change-Id: I175cf5b73d60abd4ac0a9a3f8216a2b7b2ebae84
Colin Cross [Tue, 26 Oct 2010 01:48:16 +0000 (18:48 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Colin Cross [Tue, 26 Oct 2010 01:48:09 +0000 (18:48 -0700)]
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Colin Cross [Mon, 25 Oct 2010 23:23:09 +0000 (16:23 -0700)]
ARM: tegra: clock: Fix warning
Change-Id: I2c175f65b7e7db234f7317e7c51aeea65d33d555
Colin Cross [Sun, 24 Oct 2010 23:10:31 +0000 (16:10 -0700)]
ARM: tegra: Remove debugging from tegra_move_framebuffer
Change-Id: I012b3b565faefe60e7ce581f748905d3baab6da4
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Sun, 24 Oct 2010 06:25:52 +0000 (23:25 -0700)]
ARM: tegra: suspend: Track the amount of time spent in suspend
Change-Id: Iee5ec7da45d3405846d8655104d9736eccedb713
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Sun, 24 Oct 2010 23:11:03 +0000 (16:11 -0700)]
ARM: tegra: timer: Fix us timer time after resume from LP1
In LP1 suspend, or during a failed LP0 suspend, the core power is
not turned off and the timer register is not reset. Saving the
timer value during suspend and adding it to the offset after resume
will cause the timer value to double for each suspend cycle.
To fix, when resuming subtract the current value of the timer
register from the offset. Also, use the rtc registers to add
the time that passed during suspend.
Change-Id: I9f7ee2089b98cf66af45271f8478fbd9eb2ee250
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Sun, 24 Oct 2010 06:22:53 +0000 (23:22 -0700)]
ARM: tegra: timer: Remove 32k clocksource
The 32k clocksource is never used, because it is always registered
at the same time as the us clocksource, which has a higher rating.
Using the 32k clocksource would cause a race condition with the
tegra_rtc driver on the RTC shadow registers. Remove the 32k
clocksource, add a replacement tegra_read_rtc_ms function for the
suspend code to track suspend time, and add a comment on
read_persistent_clock that it should never be called while the
tegra_rtc driver is running. It is currently only called from
timekeeping init, suspend, and resume.
Change-Id: Ic964578e9923b0f0338959f75de1ac170f850337
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Sun, 24 Oct 2010 06:22:07 +0000 (23:22 -0700)]
ARM: tegra: irq: Add debugfs file to show wake irqs
Change-Id: I66124275869d5f83024937010e14018b7980bb05
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Sat, 23 Oct 2010 22:55:32 +0000 (15:55 -0700)]
ARM: tegra: cpuidle: Keep statistics on idle wake interrupts
Change-Id: Ieaee455b4e52f232c5b1285756c22bcdc7fdc6b4
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Sat, 23 Oct 2010 22:01:35 +0000 (15:01 -0700)]
ARM: tegra: suspend: Fix compile issues with CONFIG_SMP=n
Move suspend pagetable creation to suspend.c
Always compile headsmp-t2.S, it's needed for LP2 resume
Change-Id: I9e23c6bf72fff3e98e0549edf1f85bec823a3a38
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Sat, 23 Oct 2010 21:56:27 +0000 (14:56 -0700)]
ARM: tegra: cpuidle: Fix compile issues with CONFIG_SMP=n
Change-Id: Id02744bcdfc079a6091be2e8a736bcd3a6cc0ba6
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Sat, 23 Oct 2010 21:55:56 +0000 (14:55 -0700)]
ARM: tegra: cpufreq: Fix compile issues with CONFIG_SMP=n
Change-Id: Id678df6299adfc23a4321ddaff10b4c64a4ed895
Signed-off-by: Colin Cross <ccross@android.com>
Rebecca Schultz Zavin [Fri, 22 Oct 2010 22:55:17 +0000 (15:55 -0700)]
[ARM] fiq_debugger: Print local timer irqs count
Prints the number of local timer irqs on each cpu when
the irqs command is executed.
Change-Id: Ic70fa9f528d98996fabb2d0cc80e937c5b239c1a
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
James Wylder [Wed, 20 Oct 2010 20:05:09 +0000 (15:05 -0500)]
[ARM] tegra: cpuidle define power_specified
Turn on the cpuidle_device power_specified field
to enable usage of the defined cpuidle_state.power_usage fields
for each state.
Signed-off-by: James Wylder <james.wylder@motorola.com>
Change-Id: Ibca20a937bf4079f61e4b3ae64394d797b4eb287
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Colin Cross [Mon, 25 Oct 2010 21:15:44 +0000 (14:15 -0700)]
ARM: tegra: clock: Remove dependency between "set" and debugfs
Change-Id: I732f9428096d057e08092120c6f8c2890230a242
Colin Cross [Mon, 18 Oct 2010 03:49:48 +0000 (20:49 -0700)]
video: tegra: dc: Call dvfs functions
Change-Id: If3cca5da2abc5e6c3671c8c23af90cd4e029db5c
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 9 Sep 2010 02:49:54 +0000 (19:49 -0700)]
[ARM] tegra: dvfs: Convert cpu to new dvfs, add core dvfs tables
Change-Id: I4020943ee10026866b29302aac177a5bdc259184
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 21 Oct 2010 02:19:58 +0000 (19:19 -0700)]
[ARM] tegra: clock: Refcount periph clock enables
Some peripheral clocks share enable bits. Refcount the enables so
that calling clk_disable on one clock will not turn off another
clock.
Change-Id: Iefb015bc83cac77b3faef8db86cfc42b25c0b6ae
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 14 Oct 2010 04:39:04 +0000 (21:39 -0700)]
[ARM] tegra: clock: Add shared bus clock type
Change-Id: If8022248049e790030f1480f37a074401e24d54c
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 14 Oct 2010 02:16:27 +0000 (19:16 -0700)]
[ARM] tegra: clock: Move unshared clk struct members into union
Change-Id: I4e03194d4a86c73eea4773fbdcaf773e06b6eebf
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 14 Oct 2010 04:38:28 +0000 (21:38 -0700)]
[ARM] tegra: clock: Rearrange static clock tables
Change-Id: I90078bf5e9eaa0fa64681e2ed77c7ac7f7d31804
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 9 Sep 2010 02:46:13 +0000 (19:46 -0700)]
[ARM] tegra: clock: Add new dvfs
New and improved dvfs:
Registered dynamically during init
Exports dvfs functions to control clocks that are not visible to
the clock subsystem
Supports multiple regulators per clock
Fix dvfs on disabled clocks
Adds /d/clock/dvfs to show current voltage requirements
Change-Id: I93794a7761dccc702566e8850bb79f344ff787a2
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 9 Sep 2010 02:41:14 +0000 (19:41 -0700)]
[ARM] tegra: clock: Drop old CPU dvfs
Change-Id: Iaa5377dd1d8bf32e90deb668053c10588642fa03
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 14 Oct 2010 01:04:47 +0000 (18:04 -0700)]
[ARM] tegra: cpufreq: Remove cansleep from clk api
Change-Id: I97614cac27da66a95664664143952f376fc5462e
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 14 Oct 2010 02:16:02 +0000 (19:16 -0700)]
[ARM] tegra: clock: Initialize clocks that have no enable
Change-Id: I136713c2a2ff9fec9fc629ae8f91709e49016618
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 21 Oct 2010 00:47:18 +0000 (17:47 -0700)]
[ARM] tegra: Disable clocks left on by bootloader
Change-Id: I6651ab59b738787ec94f358d5789d950c3d1a563
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 21 Oct 2010 00:47:59 +0000 (17:47 -0700)]
[ARM] tegra: cpufreq: Take an extra reference to pllx
During cpu frequency changes, take an extra reference to pllx so
that it doesn't turn off and on while the cpu is on pllp.
Change-Id: I574d399a67aab21f99473296a29aa1eedc0eedb9
Signed-off-by: Colin Cross <ccross@android.com>
Sergey Kudakov [Wed, 20 Oct 2010 20:40:35 +0000 (15:40 -0500)]
leds: leds-lp8550: Disable suspend/resume
Prevent led driver from resuming while display is suspended
Change-Id: I8881d563cbeff472b99f618f30257a9ca66d9c7e
Signed-off-by: Sergey Kudakov <sergey.kudakov@motorola.com>
Sergey Kudakov [Wed, 20 Oct 2010 20:30:41 +0000 (15:30 -0500)]
[ARM] tegra: stingray: lock gen_i2c for 200ms while
Sharp is powering up to avoid contention
between tegra and Sharp's internal i2c master
Change-Id: I1506c112a34c8ccee7ccbcd4d8bc4e70fa26bec0
Signed-off-by: Sergey Kudakov <sergey.kudakov@motorola.com>
Greg Meiste [Wed, 20 Oct 2010 14:48:58 +0000 (09:48 -0500)]
firmware: cpcap: Fixes for LED blink macro
1) The uC should not have been changing the current, only the
duty cycle.
2) The blink pattern (300ms on, 2700ms off) does not work when
fading is introduced. Change the on/off times to work with
the new pattern (on instantly, then fade for 2 seconds, then
off for 2700ms).
3) Update how the duty cycle is saved. Before it was saved once
and could never been updated again until the device was
restarted. Now the duty cycle can be changed without a reboot.
Change-Id: Iaa193eae35046e53661e0db5386141e4d17ac9c3
Signed-off-by: Greg Meiste <w30289@motorola.com>
Greg Meiste [Wed, 20 Oct 2010 14:47:52 +0000 (09:47 -0500)]
[ARM] tegra: stingray: Change to 2 second fade
Change CPCAP configuration from a 4 second LED fade to a 2 second fade.
Also change the LED mask so the notification LED always turns on
instantly.
Change-Id: I7b3080a4f9f770187dd5a906fc9cf436a4e630f2
Signed-off-by: Greg Meiste <w30289@motorola.com>
Chris Fries [Thu, 21 Oct 2010 04:20:49 +0000 (23:20 -0500)]
[ARM] mfd: cpcap-audio: disable unused audio hardware
Disable unused audio hardware, and decouple the STDAC and CODEC states.
- While controlling output, don't touch CODEC state/mute
- While controlling input, don't touch STDAC state/mute
- Don't enable external input gains, it's not connected.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Greg Goldman [Thu, 21 Oct 2010 21:04:41 +0000 (14:04 -0700)]
net: wireless: bcm4329: Improve BT-coex for eSCO
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
John Michelau [Fri, 22 Oct 2010 01:07:34 +0000 (20:07 -0500)]
[ARM] tegra: stingray: Enable CONFIG_USB_ANDROID_RNDIS_WCEIS
This makes RNDIS enumerate the same as prior devices
Change-Id: I2dcdf41e25ff669958d34319b6fe0752c70da732
Signed-off-by: Mike Lockwood <lockwood@google.com>
Colin Cross [Thu, 9 Sep 2010 02:45:30 +0000 (19:45 -0700)]
[ARM] tegra: common: Enable clocks that should always be on
Change-Id: Ic2cb51d54b0a75081672acf0bccbc859d817cd88
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 16 Sep 2010 21:59:49 +0000 (14:59 -0700)]
[ARM] tegra: clock: Don't use PLL lock bits
The PLL lock bits are not reliable, use per-PLL timeouts instead.
Change-Id: I2749e0d8bcfb0b60dbbcf6378b38307f77ff8d4d
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 9 Sep 2010 03:01:04 +0000 (20:01 -0700)]
[ARM] tegra: clock: Drop debugging
Change-Id: Ic707eb111856eb9bdb165776d011c35d04502a9a
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 9 Sep 2010 02:41:58 +0000 (19:41 -0700)]
[ARM] tegra: clock: Don't BUG on changing an enabled PLL
Change-Id: Id213fd4ad8ae1e4429e31625c8b61d6be3fe708f
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 21 Oct 2010 02:30:48 +0000 (19:30 -0700)]
[ARM] tegra: clock: Add host and avp clocks
Change-Id: Icde28cb63ecb7c210a05d25fbc6be96337f96a17
Signed-off-by: Colin Cross <ccross@android.com>
Dima Zavin [Thu, 21 Oct 2010 22:00:17 +0000 (15:00 -0700)]
Merge commit 'v2.6.36' into android-2.6.36
Colin Cross [Thu, 21 Oct 2010 21:52:49 +0000 (14:52 -0700)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Thu, 21 Oct 2010 21:52:07 +0000 (14:52 -0700)]
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Colin Cross [Thu, 21 Oct 2010 21:52:03 +0000 (14:52 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Colin Cross [Thu, 21 Oct 2010 21:48:14 +0000 (14:48 -0700)]
Merge commit 'v2.6.36' into linux-tegra-2.6.36
Benoit Goby [Thu, 21 Oct 2010 20:57:57 +0000 (13:57 -0700)]
mdm6600: Request irq after wakelocks have been initialized
Change-Id: Iaf316e96818a0c728be57d57a992e072e4c7e4a5
Signed-off-by: Benoit Goby <benoit@android.com>
Brian Swetland [Thu, 21 Oct 2010 21:19:31 +0000 (14:19 -0700)]
staging: remove Greg's TODO, now obsolete.
Signed-off-by: Brian Swetland <swetland@google.com>
Colin Cross [Thu, 21 Oct 2010 00:43:34 +0000 (17:43 -0700)]
[ARM] tegra: stingray: Add vdd_core regulator consumer
Change-Id: I0fa5ec3281322ba42f5a517bbd2974527a4b04fb
Signed-off-by: Colin Cross <ccross@android.com>
Erik Gilling [Thu, 21 Oct 2010 01:28:16 +0000 (18:28 -0700)]
Merge branch 'android-tegra' into android-tegra-moto
Erik Gilling [Thu, 21 Oct 2010 01:27:16 +0000 (18:27 -0700)]
Merge branch 'linux-tegra' into android-tegra
Erik Gilling [Tue, 19 Oct 2010 21:51:09 +0000 (14:51 -0700)]
video: tegra: clear video modes on hdmi unplug
Change-Id: If9aabc5efa1b934c94e71e0210f38979f6f7e58e
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Tue, 19 Oct 2010 21:49:05 +0000 (14:49 -0700)]
video: tegra: allow clearing of video modes in fb driver
Change-Id: Ibec4fd2ef7136843b68c52b60862b2c5c3e795fc
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Tue, 19 Oct 2010 21:48:26 +0000 (14:48 -0700)]
video: tegra: don't enable display when mode is invalid
Change-Id: I84a494f7c125ceadbe39a681a8ed7cfa244a6a2b
Signed-off-by: Erik Gilling <konkers@android.com>
Iliyan Malchev [Wed, 20 Oct 2010 22:18:12 +0000 (15:18 -0700)]
[ARM] tegra: stingray: configure tx/rx for i2s.0 and i2s.1
-- configure i2s.0 only for playback
-- configure i2s.1 for both playback and recording
Signed-off-by: Iliyan Malchev <malchev@google.com>
Colin Cross [Wed, 20 Oct 2010 05:10:29 +0000 (22:10 -0700)]
[ARM] tegra: stingray: Set fb depth to 16, flip fb at probe
Change-Id: Iec30406b433379c1cc06cc70015605e1d43f67d8
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 23:18:22 +0000 (16:18 -0700)]
[ARM] tegra: stingray: Move framebuffer, enable protected aperture
Change-Id: I5aa3cb2e3d735d2c5dede35ec8870f948cf176c5
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 20 Oct 2010 05:09:32 +0000 (22:09 -0700)]
[ARM] tegra: stingray: Update defconfig for nvmap
Turns on NVMAP_RECLAIM_UNPINNED_VM and NVMAP_HIGHMEM_ONLY
Turns off NVMAP_ALLOW_SYSMEM
Change-Id: I428b9336933a113696866809a796b442beef90d1
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 21:49:56 +0000 (14:49 -0700)]
[ARM] tegra: stingray: HACK: Reserve old bootloader framebuffer
In bootloader 1021, the address of the framebuffer is not reported
correctly. Manually reserve the location it is actually at.
Change-Id: Ie989ea0c5d8d7c34893585431228e274c623372f
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 21:48:20 +0000 (14:48 -0700)]
[ARM] tegra: stingray: Use memblock for fb, carveout, and ramconsole
Calls tegra_reserve to reserve memory for the carveout and framebuffer
at the end of memory, and uses memblock_remove on the ram console
memory to allow it to be iomapped later by the ram console driver.
Change-Id: I05cf7c852e3a2260a84e980b2bfb6ae1927168d6
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 20 Oct 2010 21:44:20 +0000 (14:44 -0700)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Wed, 20 Oct 2010 21:39:20 +0000 (14:39 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/tegra_i2s_audio.c
Change-Id: I3e05a70e3fb8fdaa8ca4c5ed78ca020c75ed0caa
Colin Cross [Wed, 20 Oct 2010 21:35:05 +0000 (14:35 -0700)]
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Colin Cross [Wed, 20 Oct 2010 05:11:37 +0000 (22:11 -0700)]
video: tegra: fb: Add flag to flip fb during probe
Change-Id: Ibe65175392fe2fe491cb88b5df0771a17bc0c706
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 14 Oct 2010 01:01:45 +0000 (18:01 -0700)]
video: tegra: dc: Move init to module_init
Move dc init to the device init level so that all clocks are
initialized before the late init level. This depends on I2C
being initialized in the subsys init level.
Change-Id: Iafe759d943b6cc90d5c6718b69e872e14d6acd4e
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 14 Oct 2010 01:00:21 +0000 (18:00 -0700)]
i2c: busses: i2c-tegra: Move init to subsys_initcall
Some drivers (like hdmi) need to communicate over i2c during probe.
Move the i2c bus init to the subsys init level so that i2c is ready
for the start of the device init level.
Change-Id: I81234d42aa26b657ffc619099e47df09e12083bb
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 20 Oct 2010 04:09:29 +0000 (21:09 -0700)]
[ARM] tegra: Add function to copy framebuffer contents
Due to conflicting restrictions on the location of the framebuffer
between the bootloader and the protected aperture, the framebuffer
is likely to need to be moved during boot. This patch provides
tegra_move_framebuffer, which can handle move the framebuffer from
lowmem, highmem, or unmapped memory into unmapped memory.
Change-Id: Ic37e5e337cd3129065fe56fd7777a86d06ad69ac
Colin Cross [Wed, 20 Oct 2010 01:33:52 +0000 (18:33 -0700)]
video: tegra: nvmap: Prevent reverting to sysmem for small allocations
Change-Id: Icfe552ad4a968329a1a2959d5b438062587a83b6
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 23:08:48 +0000 (16:08 -0700)]
[ARM] tegra: suspend: Save protected aperture across LP0
Change-Id: Iab66c566957cfbac8ddab615ec92e57c2164ab68
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 23:12:33 +0000 (16:12 -0700)]
[ARM] tegra: Add function to enable protected aperture
Change-Id: I699cee3bc9a131259b330655126146f5d1f92043
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 21:45:50 +0000 (14:45 -0700)]
[ARM] tegra: Use memblock_remove to allocate carveout and framebuffer
This uses the patch by rmk to allow memblock_remove to be used to
remove areas of memory from the 1:1 mapping, allowing them to be
remapped later using iomap or, for Tegra, nvmap.
Also uses memblock_reserve to reserve the lp0 boot vector, so it
doesn't need to be copied later in tegra_init_suspend.
tegra_reserve should be called from the machine reserve callback
after any board-specific memory areas are reserved.
Change-Id: I26be8544a03b6da74fe66dc53a77681d431c303c
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 19:42:34 +0000 (12:42 -0700)]
[ARM] mm: init: Use memblock to set up memory map
Based on patch by rmk on lkml at http://lkml.org/lkml/2010/10/11/179
Reverts changes to find_limits to fix crash when using memblock_remove
on the end of memory.
Original-author: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Colin Cross <ccross@android.com>
Change-Id: I6137a7939329381e4ed34bfcdc8b713dc50ebcc8
Rebecca Schultz Zavin [Tue, 19 Oct 2010 22:57:40 +0000 (15:57 -0700)]
video: tegra: nvmap: Remove warning from nvmap_pin
The framebuffer driver needs to be able to arbitrarily pin whatever
gets handed to it. Regardless of the interface used, functions need
to unpin as soon as they finish using the gart anyway.
Change-Id: Ida8aea2fb6eaca8bcbf3ae72f8dfa849dc198542
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Chris Fries [Wed, 20 Oct 2010 18:10:29 +0000 (13:10 -0500)]
[ARM] tegra_i2s_audio: support mono capture
Support mono data formats such as DSP PCM Mode with 16 bit mono capture.
This patch also disables the in-driver downsampler.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Linus Torvalds [Wed, 20 Oct 2010 20:30:22 +0000 (13:30 -0700)]
Linux 2.6.36
Linus Torvalds [Wed, 20 Oct 2010 20:18:21 +0000 (13:18 -0700)]
Merge branch 'upstream' of git://git.linux-mips.org/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
MAINTAINERS: Change list for ioc_serial to linux-serial.
SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
MIPS: jz4740: Fix Kbuild Platform file.
MIPS: Repair Kbuild make clean breakage.
Amit Shah [Wed, 20 Oct 2010 03:15:43 +0000 (13:45 +1030)]
virtio: console: Don't block entire guest if host doesn't read data
If the host is slow in reading data or doesn't read data at all,
blocking write calls not only blocked the program that called write()
but the entire guest itself.
To overcome this, let's not block till the host signals it has given
back the virtio ring element we passed it. Instead, send the buffer to
the host and return to userspace. This operation then becomes similar
to how non-blocking writes work, so let's use the existing code for this
path as well.
This code change also ensures blocking write calls do get blocked if
there's not enough room in the virtio ring as well as they don't return
-EAGAIN to userspace.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
CC: stable@kernel.org
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Wed, 20 Oct 2010 20:13:09 +0000 (13:13 -0700)]
Merge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] bsg: fix incorrect device_status value
[SCSI] Fix VPD inquiry page wrapper
projects / firefly-linux-kernel-4.4.55.git / log