gpu: msm: Fix braces around nested scalar

 * Fixes compilation errors in kgsl_drm

Change-Id: Ie4fc7cf92a793443a4e4a7eda725c764a0f8c226
Fix some warnings.

Allows the kernel to build with Werror and aosp gcc 4.7

Change-Id: Ifa9f19dae860610721f7f860e06c594d50484bb3
Signed-off-by: Evan McClain <aeroevan@gmail.com>
ARM: proc: Add Krait proc info

Add processor info for the Qualcomm, Inc. Krait family of
processors, to use the generic ARMv7 initialisation
procedure but explicitly enable the IDIV hardware
capability flag.

Change-Id: I080f60189fada2e4f87c79c6b8ef522cdc070759
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
M2: (FIXUP): msm: pm: Update spm retention sequence to support per core retention

On krait revision < 3, power driver is not using full spm sequence and
calling into trustzone as a part of executing krait retention.
Also krait retention is not supported on secondary cores.

krait pass3 is upgraded to use full spm sequence, hence add support
for per core retention and avoid calling into trustzone
while executing retention.

*detule: sync to 8960 board file.  Previous version of this patch that I
brought from msm-3.4 didn't have the full spm register update.  The
jb_2.5 version of the patch did.

CRs-fixed: 437281
Change-Id: I6a2b3d7c4d0fd5b9a340957b16b940b7a09bbd91
Signed-off-by: Anji Jonnala <anjir@codeaurora.org>
Signed-off-by: Venkat Devarasetty <vdevaras@codeaurora.org>
d2: Set the correct bus scaling values for camera

 * Fixes the VFE overflow issue.

Change-Id: I06d61fc64e5f876eb5ebbac5f3a0a14fab499de0
video: msm: Enable the MDP footswitch for 8960

Change-Id: I79d6b8d8125bc9b9bce051c3d812972b65ca1923
msm_sdcc: Re-add bus bandwidth vote for BCM4334

 * Fixes scan failures and kernel panics in cfg80211.

Change-Id: Ifec15a7843c26132d027156100354670cae98a69
Enable RTC write

Change-Id: I462458c9147ec663115b807fa4df979977796b2d
M2: otg: fix runaway wakelock

When booting with wall-charger plugged-in state machine transitions to
STATE_B_PERIPHERAL (B_SESS_VLD bit is set in msm_otg_init_sm).

Aftr uplugging, bit is not cleared, and state machine never transitions
to IDLE, consequently msm_otg wakelock is never unlocked.
CHROMIUM: UPSTREAM: staging: zsmalloc: remove x86 dependency

This patch replaces the page table assisted object mapping
method, which has x86 dependencies, with a arch-independent
method that does a simple copy into a temporary per-cpu
buffer.

While a copy seems like it would be worse than mapping the pages,
tests demonstrate the copying is always faster and, in the case of
running inside a KVM guest, roughly 4x faster.

Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

BUG=chromium-os:36829
TEST=extensive manual testing

Change-Id: I8b41c92eb146c5cf0af40682802ba443f7810a0b
Signed-off-by: Luigi Semenzato <semenzato@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/38999
Reviewed-by: Olof Johansson <olofj@chromium.org>
CHROMIUM: UPSTREAM: staging: zram/zcache: swtich Kconfig dependency from X86 to ZSMALLOC

upstream: commit 6e2361720b9da9ec830d407da058ca1827e62b12

This patch switches zcache and zram dependency to ZSMALLOC
rather than X86.  There is no net change since ZSMALLOC
depends on X86, however, this prevent further changes to
these files as zsmalloc dependencies change.

Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

BUG=chromium-os:36829
TEST=compile, verify that zram module is updated and /boot/config is correct

Change-Id: I91f6ed46549fe62a9fe3035063d98beb2f5d966a
Signed-off-by: Luigi Semenzato <semenzato@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/39289
Tested-by: Luigi Semenzato <semenzato@google.com>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Commit-Ready: Luigi Semenzato <semenzato@google.com>
d2: Update defconfigs

 * Enable ZCACHE and ZRAM now that ZSMALLOC works on ARM again.

Change-Id: I40f5c6ceef700020313b4d23432c638d1ec1c237
video: msm: Don't force BLT mode on Samsung HD panel

Change-Id: I08489f0342cf09607afcae6c48643c911c34f835
video: msm: re-enable framebuffer splash screen

Also fix the big scary warning it gives (thanks detule!)

Change-Id: Ide4f92f209bccb4eb8b252ffe75a948f008687b5
d2: Fix and consolidate persistent_ram code

 * Move persistent_ram back to the end of lowmem. For some reason it is
   getting clobbered randomly at it's current location.
 * Also consolidate the code into devices-8960 where it can be shared.

Change-Id: Ie81670df15591b4c7505b0b356d04fca63bcac9e
bcmdhd: squash updated bcmdhd stack from google

net: wireless: bcmdhd: Fix SUPPORT_PM2_ONLY option for p2p
Change-Id: I1db584aa5284adc8ab156e4690891bba3a1c3b91
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

net: wireless: bcmdhd: Update to Version 1.28-27
- Disable SDIO in-band interrupt explicitly to avoid problems
  with SDIO Host when generating SDIO Interrupt on DAT1 created
  unwanted CRC error
- Fix handling when bcmsdh_probe() called twice
- Fix handling the packet list properly in the corner cases
- Remove unnecessary delay during P2P connection process
- Fix issue finding peer with VSDB
- Get AP beacon and DTIM to set proper DTIM skipping

Change-Id: I7ee923727d0c3ad34c83b5ec1dda8e2aa5ea5834
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

net: wireless: bcmdhd: Update to Version 1.28-24
- P2P: Improve provision discovery probing
- Add optional dhd_dpcpoll to improve performance
- Return proper err in wl_cfg80211_attach

Change-Id: I877fc2ff4de2e43b33fdd688cd7309924f7c3722
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

net: wireless: bcmdhd: Fix PEAP with dynamic WEP
Change-Id: I62dffdb3b759ea5ccdf9f7ea0f0e67f928ace92b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

net: wireless: bcmdhd: Update to Version 1.28-23
- Add locale support via NL80211_CMD_REQ_SET_REG
- Fix P2P and VSDB
- Move setting for KEEP_ALIVE and PNO_LOCK into Makefile as
  CUSTOM_PNO_EVENT_LOCK_xTIME and CUSTOM_KEEP_ALIVE_SETTING

Change-Id: I4d2e7c1c72f1109cc9ca3c79b07ad76aea1fd513
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

net: wireless: bcmdhd: Postpone taking wd_wake lock
Change-Id: I3926d7a1a357d173144f408996f35f0929db711e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

net: wireless: bcmdhd: Increase PNO wakelock to 7 sec
Change-Id: Ib4d51cb3ee1c117c645dda663e08a1ee5954c81c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

net: wireless: bcmdhd: Fix dhd_txcomplete() dead lock
For TX packet dhd_prot_hdrpull does nothing other than pull the prot
header from the skb. Use a NULL ifdix pointer to indicate a handling
of tx packet and skip most of the header parsing routine - we don't
need it for TX packet and we can skip extra unnecessary PROP_TXSTATUS
parsing. It will resloved dead lock case because we just exit
dhd_prot_hdrpull for TX path.

Change-Id: Ic41e1c549036baeb0fabfb0be4b8331a4bf60682
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

net: wireless: bcmdhd: Avoid suspend on watchdog
Change-Id: Ic41a8f369a2ee8b2a0084e6a1cbf6b454ff53353
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

net: wireless: bcmdhd: Fix WD wakelock behavior
Change-Id: I7ebae2be248cbb4bc98e2b448641f65b77a320f4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
M2: msm: simplify ifdefs (no functional change)

I made these before we had a unified "MACH_M2" (thanks invisiblek).
Looks better now.

Change-Id: Ibfd7e22267acb13eea7fc1778994affccbec196d
cpufreq: interactive: Fix uninitialized spinlock

Change-Id: I9959669e0f643ccd2bd1072fae440d8c20f1c9cc
msm: Add support for debuglevel

Change-Id: I3c2c62012e4a463c10631c4ed6f267a744b56341
d2: clean up logspam

Change-Id: Id19ca8fc1c51f975da91a57b2c14809a69b5294e