Commit Graph

414934 Commits

Author SHA1 Message Date
Yuanhan Liu 343fb116e1 kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS cleanly
Remove CONFIG_USE_GENERIC_SMP_HELPERS left by commit 0a06ff068f12
("kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS").

Change-Id: Ia175f191b675b9bc6b1568233bb2712abc889eee
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Git-commit: 044c8d4b15743f6e0a4cb6f2aeb32745a116ebff
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
[lkuch@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Liron Kuch <lkuch@codeaurora.org>
2014-07-09 13:21:25 +03:00
Linux Build Service Account 95b6c25e76 Merge "ARM: dts: msm: add i2c controller device for zirc" 2014-07-08 16:08:19 -07:00
Linux Build Service Account b1c9709057 Merge "msm: mdss: modify userspace src format during MSMFB_SET on rotator" 2014-07-08 16:08:16 -07:00
Linux Build Service Account 55cc96eb5d Merge "msm: mdss: Enable mdp clocks before accessing panic control registers" 2014-07-08 16:08:14 -07:00
Linux Build Service Account c40ba00e53 Merge "Revert "usb: dwc3-msm: Resume SS_PHY after enabling clocks"" 2014-07-08 16:08:04 -07:00
Linux Build Service Account dca99c820d Merge "usb: phy-msm-ssusb: Add USB3 core clock" 2014-07-08 16:08:02 -07:00
Linux Build Service Account 728c54a992 Merge "power: qpnp-smbcharger: add workaround for OTG inrush OCP" 2014-07-08 16:07:44 -07:00
Linux Build Service Account 8c3d016169 Merge "power: qpnp-smbcharger: add otg-usb-id notifications" 2014-07-08 16:07:42 -07:00
Linux Build Service Account a0c1a429b9 Merge "dwc3: gadget: Handle usb2 phy autosuspend functionality with gadget event" 2014-07-08 16:07:40 -07:00
Linux Build Service Account 65e8ee2d00 Merge "spi_qsd: Initialize wait queue" 2014-07-08 11:56:34 -07:00
Linux Build Service Account 1631319bae Merge "defconfig: msm8994: Enable LiQUID dock driver" 2014-07-08 11:56:30 -07:00
Jack Pham 301da258eb Revert "usb: dwc3-msm: Resume SS_PHY after enabling clocks"
This reverts commit dbc6a7199e.

By moving the SS_PHY resume to before enabling clocks, this has
the added benefit of improving the QMP SS PHY LFPS handshake
response by about 1.5-2.0ms and thus decreases overall resume time.
However, for QSCRATCH-based PHYs care must be taken to ensure
that the USB3 controller master clock is turned on or else its
usb_phy_set_suspend() routine will encounter unclocked register access.

Two previous changes, commit e6572b0 "clock: msm: Add
gcc_usb30_master_clk to USB HS/SS PHY devices", and commit c7852f6c
"usb: phy-msm-ssusb: Add USB3 core clock" allow the QSCRATCH SS PHY
driver to now properly handle set_suspend() being called even when
the USB3 hasn't yet enabled its clocks.  Thus we can now move the
usb_phy_set_suspend() back to its previous spot.

Change-Id: I12323c6b8304d4ed35adf7e5ecb40c50116be704
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2014-07-08 09:52:55 -07:00
Jack Pham c7852f6cf6 usb: phy-msm-ssusb: Add USB3 core clock
This PHY uses QSCRATCH registers which technically belong
in the USB3 controller IO space, therefore reads/writes to
them require the USB 3 master clock to be turned on. Since
the init() and set_suspend() routines could be executed while
the controller is in low power mode, explicity turn on the
clocks in order to guarantee clocked register access.

Change-Id: I4f61ab0afb70c991b29d69df93cfd49b9fb83aa8
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2014-07-08 09:52:54 -07:00
Mayank Rana 78ba525b73 dwc3: gadget: Handle usb2 phy autosuspend functionality with gadget event
Current code put usb2 phy into autosuspend mode and poll for IN_L2
pwr_event to be set while putting device into LPM on receiving SUSPEND
event. There is a possible race that arises when gadget events are
processed before the resume routine has disabled the USB2 PHY autosuspend.
Some of the gadget events issue endpoint commands which may time out since
the PHY is still autosuspended. Fix this issue by using available check
where it calls dwc3_gadget_usb2_phy_suspend() API to disable usb2 phy
autosuspend, and ignore hsphy_auto_suspend_disable platform specific
variable.

Also add error messages where this failure case is checked.

CRs-Fixed: 680990
Change-Id: Iebc48e10ea5bc9f90e17ad21f0fec620f5c57211
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
2014-07-08 09:52:07 -07:00
Linux Build Service Account b2493d0531 Merge "phy: extend APIs of the generic phy framework" 2014-07-08 09:28:02 -07:00
Ankit Gupta 74072eff70 ARM: dts: msm: add i2c controller device for zirc
configure an i2c controller on BLSP1 QUP2 for zirc

Change-Id: Ic433b60f1d777a14799e192a4b7333759bd0c79c
Signed-off-by: Ankit Gupta <ankgupta@codeaurora.org>
2014-07-08 09:47:15 -06:00
Jack Pham d0e5ef3aa4 defconfig: msm8994: Enable LiQUID dock driver
Enable the driver that supports the MSM8994 LiQUID docking
station. This will allow the USB Hub and Ethernet ports
found on the dock to be when the tablet is inserted.

Change-Id: I5181f2ad3ba7cec5dd4035a29248f71d3481d974
Signed-off-by: Jack Pham <jackp@codeaurora.org>
2014-07-08 08:12:20 -07:00
Linux Build Service Account d40fd88e6e Merge "ARM: dts: msm: Fix ISPIF clock rates" 2014-07-08 06:55:44 -07:00
Linux Build Service Account edcc7789a8 Merge "soc: qcom: pil-mss: free the allocated area during ramdump" 2014-07-08 06:55:42 -07:00
Linux Build Service Account 5bbc9bf6e3 Merge "ASoC: msm8x16-wcd: make default spkr_ocp hold enable" 2014-07-08 06:55:40 -07:00
Linux Build Service Account 281f24e4d1 Merge "net: ppp: ppp_async: Fix data stall issue over low latency tty port." 2014-07-08 06:55:37 -07:00
Linux Build Service Account f97c6bc00b Merge "ARM: dts: msm: Add BIMC bwmon support for CPU port in 8939" 2014-07-08 06:55:34 -07:00
Linux Build Service Account ff28082696 Merge "ARM: dts: msm: Enable BIMC BW scaling support for MSM8939" 2014-07-08 06:55:33 -07:00
Linux Build Service Account deba1aa970 Merge "usb: tty: Add more buffer space and make the buffer use direct" 2014-07-08 06:55:28 -07:00
Linux Build Service Account 8328437988 Merge "ARM: dts: msm: Add UICC mass storage luns for msm8974" 2014-07-08 06:55:27 -07:00
Linux Build Service Account 8f9cf4cd74 Merge "ASoC: q6asm: Fix the memory leak during the SSR" 2014-07-08 06:55:22 -07:00
Linux Build Service Account 3d602005e3 Merge "ARM: dts: msm: Increase MDSS BW Limit for 8939" 2014-07-08 03:48:38 -07:00
Linux Build Service Account 8c849a8363 Merge "ARM: dts: msm: Move usb_otg node from dtsi files to dts files" 2014-07-08 03:48:36 -07:00
Linux Build Service Account a81d5b3fee Merge "msm: vidc: Add instance to instance list prior to CORE_INIT" 2014-07-08 03:48:34 -07:00
Linux Build Service Account 00b0d0fb5c Merge "soc: qcom: bam_dmux: Cache callback information" 2014-07-08 03:48:32 -07:00
Linux Build Service Account 3782e67b74 Merge "msm: vidc: avoid setting smoothstreaming for Q6" 2014-07-08 03:48:24 -07:00
Linux Build Service Account 9973458cbf Merge "ARM: dts: msm: remove round-robin entry on msm8916" 2014-07-08 03:48:18 -07:00
Yaniv Gardi 63566d8d49 phy: extend APIs of the generic phy framework
This change adds a few more APIs to the phy_ops structure:
advertise_quirks - an API for setting the phy quirks
suspend - an API for the implementation of
          phy suspend sequence
resume - an API for implementation of phy resume sequence

Change-Id: Idc76e7aef7fa1029f4d9d8baedae869346992da8
Signed-off-by: Yaniv Gardi <ygardi@codeaurora.org>
2014-07-08 03:08:31 -07:00
Taniya Das 8c176b9e0d ARM: dts: msm: Add BIMC bwmon support for CPU port in 8939
This would allow using BIMC bwmon hardware with the bw_hwmon devfreq
governor to scale the CPU BW vote.

Change-Id: Ie4f0c51e143c3736ed30519c39fffdcfc2b69eec
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2014-07-08 14:29:16 +05:30
Taniya Das a475d5b3c8 ARM: dts: msm: Enable BIMC BW scaling support for MSM8939
Enable the static DDR BW voting for the corresponding cpufreq for msm
8936 and 8939.

Change-Id: Icabf9ea1b79274ea1fd005074397b056760e482d
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2014-07-08 14:29:11 +05:30
Vishnuvardhan Prodduturi bd40201de7 msm: mdss: Enable mdp clocks before accessing panic control registers
Crashes are observed during bootup due to unclocked access of Panic
control registers. Take care of the same by enabling appropriate clocks.

Change-Id: Ic8df1f9c3c3928b9a3e9b21d63a5d9bba4f2152c
Signed-off-by: Vishnuvardhan Prodduturi <vproddut@codeaurora.org>
2014-07-08 14:24:09 +05:30
Linux Build Service Account b853134f27 Merge "msm: mdss: update the PHY settings for DSI1 for 8939" 2014-07-08 01:05:40 -07:00
Linux Build Service Account 547c16203e Merge "ARM: dts: msm: Add coresight support for msm8939" 2014-07-08 01:05:38 -07:00
Linux Build Service Account 7f05ce8586 Merge "ARM: 8036/1: Enable IRQs before attempting to read user space in __und_usr" 2014-07-08 01:05:36 -07:00
Linux Build Service Account 379b290626 Merge "coresight: free sg table in case of memory alloc failure" 2014-07-08 01:05:32 -07:00
Linux Build Service Account 9756424863 Merge "ARM: dts: msm: Add the SMD_PKT entry for msmferrum" 2014-07-08 01:05:30 -07:00
Linux Build Service Account a8e20d9520 Merge "ARM: dts: msm: Bus width adjustment for 8936 BIMC" 2014-07-08 01:05:28 -07:00
Taniya Das eb25040dad soc: qcom: pil-mss: free the allocated area during ramdump
During ramdump collection, the modem subsystem needs the MBA to be
loaded again. The allocation of memory done during that time is not
currently being freed and as a result, the common CMA area is getting
filled up.
Explicitly free the allocation area before bringing down the subsystem.

CRs-Fixed: 686515
Change-Id: I28b0ed381c2ad5ee1fcfacea4913184167af9815
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2014-07-08 00:14:36 -07:00
Laxminath Kasam 62b48b39a3 ASoC: msm8x16-wcd: make default spkr_ocp hold enable
Currently, OCP hold is set to zero by default which is
preventing the PA from holding the shutdown state.
Set this bit to enable OCP hold by default. Once hold is set
PA would shut down immediately during overcurrent and hold
that state unless SPKR_PA_EN bit is toggled.

Change-Id: Ib37edddea5a4a34f5f6d046d3bf3baa835598d89
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
2014-07-08 11:58:47 +05:30
Vijayavardhan Vennapusa 4862f73256 ARM: dts: msm: Add UICC mass storage luns for msm8974
USB UICC cards are supported on MSM8974. Add 1 lun to expose the user
partition in mass storage function.

Change-Id: Iebe50e6eb0d0f934e7e4e10b024ebe5c3cfb6721
Signed-off-by: Vijayavardhan Vennapusa <vvreddy@codeaurora.org>
2014-07-08 11:06:18 +05:30
Jeff Hugo a38fd8aef3 soc: qcom: bam_dmux: Cache callback information
Callback notifications lock the channel status to prevent clients from
unregistering their callback function and other information while it is
in use during a notification.  However, in some scenarios, clients use
the notification context to call back into bam_dmux which can result in
lock recursion.

Avoid the issue by caching the callback information, and then unlocking
the channel state before invoking the client's callback.

CRs-Fixed: 690328
Change-Id: I764b1c21c2254c9c72ee329dc671f9a1afb648a2
Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org>
Signed-off-by: Arun Kumar Neelakantam <aneela@codeaurora.org>
2014-07-08 10:47:47 +05:30
Linux Build Service Account c77ae18c97 Merge "ARM: dts: msm: add perf-events support for msm8994" 2014-07-07 21:55:30 -07:00
Linux Build Service Account 34987d4156 Merge "dt-bindings: add ARMv8 PMU binding" 2014-07-07 21:55:29 -07:00
Linux Build Service Account 8b57dbb94c Merge "misc: Rename apq8084_dock to liquid_dock" 2014-07-07 21:55:25 -07:00
Xiaogang Cui 07a29cb279 ARM: dts: msm: remove round-robin entry on msm8916
Remove round-robin entry from ETMv4 dt nodes since these
are not applicable for ETMv4

Change-Id: Ia6b69387f547c12b3020cf6657b3de4f4423b090
Signed-off-by: Xiaogang Cui <xiaogang@codeaurora.org>
2014-07-08 11:30:26 +08:00