fix to wake device w/ N key
-changes taken from .32
Revert "PVR: use TI Android SGX 1.8 SDK (from Rowboat)"

This reverts commit 02d0882e6ed4219ff521e2046a82d73be08548b9.
Revert "Revert "OMAP3: PVR: DDK version updated to 1.8@785978""

This reverts commit a7bc3ec58d58ec40b1e50198f9e8548d58d10a29.
Update encore_defconfig

* Enable CONFIG_DSSCOMP
Fix dsscomp build with DSSCOMP_DEBUG_LOG=n
encore: hack kernel's saved cmdline to include device serial number

Android expects the bootloader to pass the device serial number as a
parameter on the kernel command line, but encore's bootloader doesn't do
this.  Since the kernel already knows the serial number, let's
just add the appropriate parameter to the command line we present to
userspace (in /proc/cmdline).
Revert "fix to wake device w/ N key" (take patch from merge w/keyodi instead)

This reverts commit 555dba338cb339e0d6b41cfa236d451d13b0d27f.
Merge branch 'for-keyodi' into for-nookiedevs
Remove spurious file from arch/arm/boot/compressed
BFQ v5 enabled. After we installed the BFQ patches we should be enabling BFQ.

Change-Id: Id17e6ca1e1f2bbcbc44211465f8be3a7ad943c7a

Signed-off-by: Brandon Bennett <bennetb@gmail.com>
Enable zRAM support

Change-Id: Ief9e7919905dad1481f2300aee62585b3c896bdd
scripts/Kbuild.include: Fix portability problem of "echo -e"

"echo -e" is a GNU extension. When cross-compiling the kernel on a
BSD-like operating system (Mac OS X in my case), this doesn't work.

One could install a GNU version of echo, put that in the $PATH before
the system echo and use "/usr/bin/env echo", but the solution with
printf is simpler.

Since it is no disadvantage on Linux, I hope that gets accepted even if
cross-compiling the Linux kernel on another Unix operating system is
quite a rare use case.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Andreas Bießmann <andreas@biessmann.de>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Merge pull request #2 from nemith/echo_fix

scripts/Kbuild.include: Fix portability problem of "echo -e"
Revert "twl-core: fix omap_i2c omap_i2c.1: controller timed out"

This reverts commit 26e7765e37a335d0076950618e335a430debbdcb.
Revert N key wake fix in order to fix SOD
Merge pull request #1 from nemith/performance

Performance Improvements
defconfig: Remove TWL4030_PWRBUTTON
-may be the cause of the double tap issue
Fix for white flash when screen is turned on
ARM: OMAP3xxx: clockdomain: fix software supervised wakeup/sleep

Commit 4da71ae6 ("OMAP: clockdomain: Arch specific funcs for
clkdm_clk_enable/disable") called the OMAP2xxx-specific functions for
clockdomain wakeup and sleep.  This would probably have broken
software-supervised clockdomain wakeup and sleep on OMAP3.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Cc: Jon Hunter <jon-hunter@ti.com>
Acked-by: Rajendra Nayak <rnayak@ti.com>
[steven@steven676.net: make apply to p-android-omap3-3.0]
ARM: OMAP2+: clockdomain/hwmod: add workaround for EMU clockdomain idle problems

The idle status of the IP blocks and clocks inside the EMU clockdomain
isn't taken into account by the PRCM hardware when deciding whether
the clockdomain is idle.  Add a workaround flag in the clockdomain
code, CLKDM_MISSING_IDLE_REPORTING, to deal with this problem, and add
the code necessary to support it.

If CLKDM_MISSING_IDLE_REPORTING is set on a clockdomain, the
clockdomain will be forced active whenever an IP block inside that
clockdomain is in use, even if the clockdomain supports
hardware-supervised idle.  When the kernel indicates that the last
active IP block inside the clockdomain is no longer used, the
clockdomain will be forced idle, or, if that mode is not supported in
the hardware, it will be placed into hardware-supervised idle.

This patch is an equal collaboration with Jon Hunter
<jon-hunter@ti.com>.  Ming Lei <ming.lei@canonical.com>, Will Deacon
<will.deacon@arm.com>, Madhav Vij <mvij@ti.com>, Kevin Hilman
<khilman@ti.com>, Benoît Cousson <b-cousson@ti.com>, and Santosh
Shilimkar <santosh.shilimkar@ti.com> all made essential contributions
to the understanding of EMU clockdomain power management on OMAP.

[steven@steven676.net: squash in cf956d9 ("ARM: OMAP3: fix workaround
for EMU clockdomain")]

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jon Hunter <jon-hunter@ti.com>
Cc: Ming Lei <ming.lei@canonical.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Madhav Vij <mvij@ti.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Benoît Cousson <b-cousson@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Jon Hunter <jon-hunter@ti.com>
[steven@steven676.net: backport to p-android-omap3-3.0]