Merge Upstream's stable 3.0.21 branch into msm-3.0
This consists 814 commits and some merge conflicts.
The merge conflicts are because of some local changes to
msm-3.0 as well as some conflicts between google's tree and
the upstream tree.
Conflicts:
arch/arm/kernel/head.S
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
drivers/mmc/core/core.c
drivers/tty/serial/serial_core.c
drivers/usb/host/ehci-hub.c
drivers/usb/serial/qcserial.c
fs/namespace.c
fs/proc/base.c
Change-Id: I62e2edbe213f84915e27f8cd6e4f6ce23db22a21
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
The code for HDCP authenticaton has a bug where a mutex is not
freed when the code follows an error path. This change fixes this
issue by correctly handling the mutex.
Change-Id: I4b141a313830cc09e11a5db4b8e464fa4439efd6
CRs-Fixed: 341922
Signed-off-by: Aravind Venkateswaran <aravindh@codeaurora.org>
This reverts commit 06e8935feb.
With the optimization, the sdio_irq_thread() sends a spurious
interrupt notification to the registered function handler during
ksdioirq thread start up. The function handler may or may not
handle this interrupt gracefully. The correct way to inform
about interrupt is to check CCCR_INTx register for pending
interrupts before calling function driver's irq handler
which is broken with this optimization, hence the revert.
CRs-Fixed: 345547
Change-Id: Ia1525ef439c8d0d36b796f393066065648356635
Signed-off-by: Sujit Reddy Thumma <sthumma@codeaurora.org>
After coming out of power collapse, QGIC gets reset and there
is no way to restore core1's previous SGI/PPI configuration
before it actually lost the power.
Linux hotplug software uses SGI to wakeup the core1 irrespective of
normal hotplug or power collapse. Since SGI's wont't
work after coming out of power collapse use SPI instead of SGI.
The kernel hotplug software differentiates between waking up the
core1 in normal hotplug vs the power collapse.
Define variable to represent the apps power collapse status sothat
hotplug software can rely on this to send SPI/SGI.
Clear this power collapse variable, once hotplug sw wakes up the core1.
Change-Id: Iba308356fc4a75ee7f9de773b7a87cd0bc40f291
Signed-off-by: Anji jonnala <anjir@codeaurora.org>
On certain devices SPM hardware block doesn't retain its state through
certain low power modes. This commit allows for reinitialization of
control and sequence entry registers on resume.
Change-Id: Ib70ab1e090dc69fa2901d183b9a25416ad433ba0
Signed-off-by: Maheshkumar Sivasubramanian <msivasub@codeaurora.org>
During unset call, mixer0 staging is cleared using stage down
logic which makes the staging update to happen in next vsync
for 8660 platforms. Clearing of mixer0 stage now is done on a
single vsync for 8660 as well.
Change-Id: Ib6b11728944be89ee6ba5b5d58c470c05cb9f41b
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
Increase the pull up strength (current source pulls) from
1.5uA to 30uA for devices (MTP and XPM) which do not have
external pull-ups.
Also, fix the pmic gpio number for HOME key (pm gpio 27)
which was earlier being configured to 37.
Change-Id: Iedf734efd6fac107cae590ff0bdd5e79017e73e8
Signed-off-by: Anirudh Ghayal <aghayal@codeaurora.org>
Notify local SMSM callback clients without using a wakelock since SMSM
signaling is used by power management during power-down/-up sequencing
on DEM-based targets. Grabbing a wakelock in this case will abort
power-down sequencing.
Change-Id: I08de41480a9713f8ac52b563c7df8213d465466d
Signed-off-by: Eric Holmberg <eholmber@codeaurora.org>
* changes:
msm_fb: display: Add IOMMU support to MDP and rotator driver
msm_fb: display: Wait for external vsync before turning off DTV
msm_fb: display: Enable timing generator during first update
Instead of mapping 1 4K page at a time into the IOMMU create a
scatterlist and map everything at once. This will be more efficient.
Change-Id: I8e83066869dd6f7a479bad22a66e4c70cc5973b5
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
Clean up some error paths and simplify the code by
moving to devm_regulator_get().
Change-Id: I782569d2d5aec077ea18516db7eba92897698bce
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
Bootloader does not configure PLL15 since PLL15 is only
enabled/disabled by linux kernel code. Therefore, configure
PLL15 during clock init.
Change-Id: I536325362a9ab9f054b6f65390052a3b8c720e08
Signed-off-by: Tianyi Gou <tgou@codeaurora.org>
Tracepoints already exist for clk_enable(), clk_disable(), and
clk_set_rate(). Add callbacks for these tracepoints so that we
can easily trace clock operations in the kernel.
For example:
# pwd
/sys/kernel/debug/tracing
# echo 1 > events/power/clock_enable/enable
# cat trace
<lots of clock enables>
Change-Id: I3b845653be427ff4b33bb31b5b82f73c4695d230
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Add IOMMU support to MDP and rotator driver for operating with
virtual addresses instead of physical addresses
Change-Id: Ia5afcf33220e0e75e92948649c2bd4d7ef32917d
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
Wait for external vsync interrupt before turning off the timing generator
for DTV display
CRs-Fixed: 341400
Change-Id: Ibd380f8e20a7ebb250669fcabf4233e9e526d22f
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
During first display update through pan_display or overlay_play,
enable the timing generator for pull modes like LCDC, DSI Video
and DTV interfaces
Change-Id: Icec5b28f0df04a1223119222a1aad5129111f676
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
SMEM_LOG SMEM entries are allocated by modem and consumed by APPs.
In modem-less SoCs, SMEM logs can be used between APPs and other
subsystems. Hence allow APPs SMEM log driver to allocate and initialize
the SMEM_LOG SMEM entries once APPs SMSM is initialized.
CRs-Fixed: 338264
Change-Id: Idf3aff7df0dba910a7cf1351ac6d8f57c0b29144
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
This enables drivers to register for and receive any SMSM driver state
change notifications, including the initialization of SMSM driver.
CRs-Fixed: 338264
Change-Id: I090d19140f3bc46205566cd0431ed90edf440c02
Signed-off-by: Karthikeyan Ramasubramanian <kramasub@codeaurora.org>
Locating the unstable zone and placing the movable zone need
to be coupled together to get correct system behavior. The
placing of the movable zone was missing on 8064. Place the
movable after locating the unstable zone to ensure consistency
of the system.
Change-Id: I3fdbd5fc6d5bf996d6187d6b64cf8d50eefd3ff4
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Currently writing 0x0 into AHBMODE register which means both data
transactions and QH and TD descriptors are non-posted writes to
system memory. As per HW team recommendation, should write 0x08 value
to set AHB HPROT mode into the AHBMODE register which allows posted
data writes to system memory and will improve the throughput numbers.
Change-Id: Ib44a8cfe11c6ff96ff712643227532e24548e706
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
commit d092f2d(usb: gadget: allow android gadget to bind/unbind
several times) moves android composite driver registration to
platform driver probe function. Hence add android USB platform
device to get USB working on copper.
Change-Id: I7a21e86bc1c06701502bd5f7379afa0cf282398e
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
Initialize workqueue for MIPI command mode panels for s/w refresher
mechanism to work in x-window type architectures.
Change-Id: Id67c54452aa0b02a39f480709fc4bcd6c7bde2eb
Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>
While entering the Idle power collapse state, we should go ahead and
disable all the interrupts, but this needs to be done after we have saved
the gic state.
Change-Id: Iddd6733e26e7ac2cb705cf0cd6177c04d684d9cc
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Enable backlight control on 8x25 EVB for WVGA panel.
Change-Id: Ib293440829c39e2230cc5a288037e2d5d7806dc3
Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
Enable the basic PM feature like simple SWFI on both the cores
This reverts commit ced4728f31.
Change-Id: Iffd004ca202bbe47522758640e96a039cae765bd
Signed-off-by: Murali Nalajala <mnalajal@codeaurora.org>
Remove the architecture specific define macros and convert
them to 'cpu_is_xxx()' calls to find out the target at runtime.
Change-Id: Idc0042eea619b8f8f22e914370aaaf8132d54da1
Signed-off-by: Murali Nalajala <mnalajal@codeaurora.org>
Add IOCTL to initialize the I2C expander and SPI
initialization for ADS ADC. Clients issue a request
to initialize and enable the device before issuing
requests to perform an ADC read.
The file interface is necessary since it takes
considerable amount of time to initialize the
I2C expander and the ADS ADC device for every
ADC read transaction.
Change-Id: I9e830232592288cbc41554070c70882f05c842ce
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
The buffers are memset only if its a non secure
session.
Change-Id: Idf74a6b54f39012bbe69fb5b5d27f2764d0017af
Signed-off-by: Deepak Kotur <dkotur@codeaurora.org>
