OSDN Git Service
Linux Build Service Account [Mon, 31 Oct 2016 20:04:10 +0000 (13:04 -0700)]
Merge "Bluetooth:Add ioctl to power control connectivity chip"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:09 +0000 (13:04 -0700)]
Merge "ARM: qcom: add board entries for msmtriton"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:08 +0000 (13:04 -0700)]
Merge "msm: crypto: Fix integer over flow check in qce driver"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:04 +0000 (13:04 -0700)]
Merge "leds: qpnp-wled: add support for configuring ILIM in pmicobalt"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:03 +0000 (13:04 -0700)]
Merge "leds: qpnp-wled: Update AMOLED_VOUT programming"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:02 +0000 (13:04 -0700)]
Merge "clk: msm: Add COMMON_CLK branch memory flags"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:01 +0000 (13:04 -0700)]
Merge "ARM: dts: msm: fix WLED sink configuration for msmcobalt QRD platform"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:01 +0000 (13:04 -0700)]
Merge "msm: kgsl: Clear the interrupt immediately"
Linux Build Service Account [Mon, 31 Oct 2016 20:04:00 +0000 (13:04 -0700)]
Merge "ARM: dts: msm: add support for etm and cpu-cti on msmfalcon"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:16 +0000 (06:59 -0700)]
Merge "icnss: Shutdown Adrastea before remapping MSA0"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:15 +0000 (06:59 -0700)]
Merge "sched/hmp: Disable interrupts when resetting all task stats"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:14 +0000 (06:59 -0700)]
Merge "msm: ADSPRPC: Do not pass offset for secure buffers"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:14 +0000 (06:59 -0700)]
Merge "dt-bindings: power: reset: add document for reboot-mode driver"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:13 +0000 (06:59 -0700)]
Merge "power: reset: add reboot mode driver"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:12 +0000 (06:59 -0700)]
Merge "usb: xhci-plat: Enable wakeup for the root hubs"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:11 +0000 (06:59 -0700)]
Merge "usb: pd: Observe PSHardResetTimer for source hard reset"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:10 +0000 (06:59 -0700)]
Merge "msm: ipa3: Support IPA-USB suspend sequence without remote wake-up"
Linux Build Service Account [Mon, 31 Oct 2016 13:59:09 +0000 (06:59 -0700)]
Merge "arm64: Implement optimised IP checksum helpers"
Linux Build Service Account [Mon, 31 Oct 2016 02:50:59 +0000 (19:50 -0700)]
Merge "ARM: dts: msm: Add initial support for msmcobalt v2 QRD VR1 board"
Linux Build Service Account [Sun, 30 Oct 2016 07:07:04 +0000 (00:07 -0700)]
Merge "icnss: Enable PMM_TCXO_CLK before switch to cxo"
Sameer Thalappil [Fri, 28 Oct 2016 20:55:28 +0000 (13:55 -0700)]
icnss: Shutdown Adrastea before remapping MSA0
MSA0 is remapped to HLOS during SSR/PDR for ramdump purposes.
Remap this memory region only after Adrastea is being shutdown, otherwise
Adrastea could still try to access this region resulting in SMMU fault.
CRs-Fixed:
1082630
Change-Id: I490b5679de4cb4837f5ed5d4e40d339e12c8ecc9
Signed-off-by: Sameer Thalappil <sameert@codeaurora.org>
Syed Rameez Mustafa [Fri, 28 Oct 2016 19:12:41 +0000 (12:12 -0700)]
sched/hmp: Disable interrupts when resetting all task stats
Taking the pi_lock without disabling interrupts in reset_all_task_stats()
is problematic. In that an interrupt can end up waking a task which in
turn needs the pi_lock again causing a deadlock. Disable interrupts along
with taking the lock to avoid this problem.
Change-Id: If27cb2bb3fcaafa5c8435f3c2e0e4be9b8f1e987
Signed-off-by: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
Sathish Ambley [Fri, 28 Oct 2016 16:50:42 +0000 (09:50 -0700)]
msm: ADSPRPC: Do not pass offset for secure buffers
The secure buffers does not allow passing offset into the buffer
and hence skip calculation of offset for secure buffers.
Change-Id: I2cd3b87aca032d4c5868cc9db35987213349a337
Signed-off-by: Sathish Ambley <sathishambley@codeaurora.org>
Andy Yan [Wed, 6 Jul 2016 13:22:45 +0000 (21:22 +0800)]
dt-bindings: power: reset: add document for reboot-mode driver
Add device tree bindings document for reboot-mode driver.
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Git-commit:
376e27e485cbe9f903369a002d07d5a01225d1d3
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/
Change-Id: Ic0f2a51b5af661fd23576ae5135c920b92f0cdfd
Signed-off-by: Xiaogang Cui <xiaogang@codeaurora.org>
Andy Yan [Wed, 6 Jul 2016 13:27:26 +0000 (21:27 +0800)]
power: reset: add reboot mode driver
This driver parses the reboot commands like "reboot bootloader"
and "reboot recovery" to get a boot mode described in the
device tree , then call the write interfae to store the boot
mode in some place like special register or sram, which can
be read by the bootloader after system reboot, then the bootloader
can take different action according to the mode stored.
This is commonly used on Android based devices, in order to
reboot the device into fastboot or recovery mode.
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
Reviewed-by: Moritz Fischer <moritz.fischer@ettus.com>
Tested-by: John Stultz <john.stultz@linaro.org>
Acked-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Git-commit:
4fcd504edbf7c793325511c2df8dcd083958e28a
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/
Change-Id: Id65f6b9186e7a5209542a380bae31a1d8933b931
Signed-off-by: Wufeng.jiang <wufeng.jiang@codeaurora.org>
Signed-off-by: Xiaogang Cui <xiaogang@codeaurora.org>
Linux Build Service Account [Thu, 27 Oct 2016 22:49:28 +0000 (15:49 -0700)]
Merge "ASoC: msm: Add routes for all TDM modes"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:27 +0000 (15:49 -0700)]
Merge "ASoC: msmcobalt: Add support for all TDM modes"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:26 +0000 (15:49 -0700)]
Merge "ARM: dts: msm: fix sd card detection for msmcobalt QRD SKUK board"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:25 +0000 (15:49 -0700)]
Merge "ASoC: msm: Enable Media Format converter for all resampling usecases"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:22 +0000 (15:49 -0700)]
Merge "msm: mdss: Fix memleak in framebuffer register and remove"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:22 +0000 (15:49 -0700)]
Merge "msm: mdss: Correct settings when on/off happens in dest-scaler"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:21 +0000 (15:49 -0700)]
Merge "msm: mdss: Avoid adaptive variable refresh during dynaminc FPS"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:19 +0000 (15:49 -0700)]
Merge "msm: mdss: dp: remove programming of maud/naud for audio"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:18 +0000 (15:49 -0700)]
Merge "ARM: dts: msm: enable esd for jdi qhd cmd mode panel in msmcobalt"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:17 +0000 (15:49 -0700)]
Merge "qcom-charger: set optimal buck switching frequency"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:16 +0000 (15:49 -0700)]
Merge "ARM: dts: msm: add SLPI fw name property for msmcobalt"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:15 +0000 (15:49 -0700)]
Merge "sensors: ssc: add support to read SLPI fw name"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:14 +0000 (15:49 -0700)]
Merge "msm: ipa: Fix the memory leak in error cases"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:14 +0000 (15:49 -0700)]
Merge "qseecom: check buffer size when loading firmware images"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:12 +0000 (15:49 -0700)]
Merge "leds: qpnp-flash-v2: fix safety timer configuration"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:11 +0000 (15:49 -0700)]
Merge "msm: ipa: fix ioctl input param validation"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:10 +0000 (15:49 -0700)]
Merge "defconfig: Enable CONFIG_ICNSS_DEBUG for 32-bit msmfalcon"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:09 +0000 (15:49 -0700)]
Merge "defconfig: Enable CONFIG_ICNSS_DEBUG for 32-bit msmcortex"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:09 +0000 (15:49 -0700)]
Merge "ASoC: msmcobalt: Fix MCLK routing on msmcobalt for WCD9340"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:08 +0000 (15:49 -0700)]
Merge "ARM: dts: msm: Add dmic clock rate on ECPP path for msmcobalt"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:07 +0000 (15:49 -0700)]
Merge "soc: qcom: add support for fingerprint sensor driver"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:06 +0000 (15:49 -0700)]
Merge "ASoC: wcd-dsp-mgr: fix restart logic when codec comes back online"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:05 +0000 (15:49 -0700)]
Merge "ASoC: wcd934x-dsp-cntl: fix memory enable/disable sequence"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:04 +0000 (15:49 -0700)]
Merge "USB: dwc3-msm: Disable pipe clock requirement for HS/FS only mode"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:03 +0000 (15:49 -0700)]
Merge "clk: qcom: Change clock index for mmssnoc_axi clock for MSMfalcon"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:02 +0000 (15:49 -0700)]
Merge "msm: sde: Fix SDE rotator clock disable sequence"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:02 +0000 (15:49 -0700)]
Merge "input: misc: hbtp_input: Add support for multiple AFE"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:01 +0000 (15:49 -0700)]
Merge "msm: mdss: edid: fix dtd parsing"
Linux Build Service Account [Thu, 27 Oct 2016 22:49:00 +0000 (15:49 -0700)]
Merge "clk: msm: clock: Remove controlling some graphics clocks in Linux"
Linux Build Service Account [Thu, 27 Oct 2016 22:48:59 +0000 (15:48 -0700)]
Merge "sched: Fix compilation issue with reset_hmp_stats"
Linux Build Service Account [Thu, 27 Oct 2016 22:48:57 +0000 (15:48 -0700)]
Merge "ASoC: wcd934x: Trigger codec DSP subsystem restart"
Linux Build Service Account [Thu, 27 Oct 2016 22:48:56 +0000 (15:48 -0700)]
Merge "usb: dwc3: gadget: Remove dev_WARN_ONCE in dwc3_gadget_ep_disable"
Linux Build Service Account [Thu, 27 Oct 2016 22:48:55 +0000 (15:48 -0700)]
Merge "ARM: dts: msm: Add support for Modem PIL on msmfalcon"
Linux Build Service Account [Thu, 27 Oct 2016 22:48:54 +0000 (15:48 -0700)]
Merge "ARM: dts: msm: Add support for Modem PIL on msmtriton"
Linux Build Service Account [Thu, 27 Oct 2016 22:48:52 +0000 (15:48 -0700)]
Merge "leds: qpnp-wled: Fix configuration of AVDD TRIM and OVP registers"
Linux Build Service Account [Thu, 27 Oct 2016 22:48:51 +0000 (15:48 -0700)]
Merge "cfg80211: Add support to configure a beacon data rate"
Linux Build Service Account [Thu, 27 Oct 2016 22:48:50 +0000 (15:48 -0700)]
Merge "icnss: Do not parse VBATT DT entry if VBATT feature is disabled"
Linux Build Service Account [Thu, 27 Oct 2016 22:48:49 +0000 (15:48 -0700)]
Merge "ARM: dts: msm: add PCIe PHY sequence for msmcobalt v2"
Linux Build Service Account [Thu, 27 Oct 2016 22:48:48 +0000 (15:48 -0700)]
Merge "input: touchscreen: fix compilation errors for Goodix driver"
Linux Build Service Account [Thu, 27 Oct 2016 22:48:47 +0000 (15:48 -0700)]
Merge "ASoC: qdsp6v2: fix potential bug of infinite loop"
Satish kumar sugasi [Mon, 17 Oct 2016 22:12:11 +0000 (15:12 -0700)]
Bluetooth:Add ioctl to power control connectivity chip
Added new ioctl command to perform power on/off operations
on connectivity chipset from userspace process.
CRs-Fixed:
1049512
Change-Id: Id254a12ba8fc2d57951d158c8fce80168375586d
Signed-off-by: Satish kumar sugasi <ssugas@codeaurora.org>
Signed-off-by: Bhakthavatsala Raghavendra <braghave@codeaurora.org>
Yuanyuan Liu [Tue, 25 Oct 2016 18:46:38 +0000 (11:46 -0700)]
icnss: Enable PMM_TCXO_CLK before switch to cxo
Enable PMM_TCXO_CLK before swith to cxo. Also, add
debug logs of reading WCSS_SR_PMM_SR_MSB register
multiple times to check whether ref clock is shut off
or not when xo disable command failed.
CRs-Fixed:
1082643
Change-Id: I1aae776d5e6cc8f1cc2af9278c0e3d6ac37804a9
Signed-off-by: Yuanyuan Liu <yuanliu@codeaurora.org>
Zhen Kong [Mon, 24 Oct 2016 20:52:04 +0000 (13:52 -0700)]
msm: crypto: Fix integer over flow check in qce driver
Integer overflow check is invalid when ULONG_MAX is used,
as ULONG_MAX has typeof 'unsigned long', while areq->assoclen,
q_req->crytlen, and qreq.ivsize are 'unsigned int'. Make change
to use UINT_MAX instead of ULONG_MAX.
Change-Id: If2bb1900c07af1ea162da362c913d4880b0bc755
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Neeraj Upadhyay [Mon, 17 Oct 2016 04:51:52 +0000 (10:21 +0530)]
ARM: qcom: add board entries for msmtriton
Add board entries to support msmtriton 32-bit boot.
Change-Id: Idfc139ff63f6268f836694e0680c1e44582dfbb3
Signed-off-by: Neeraj Upadhyay <neeraju@codeaurora.org>
Xiaogang Cui [Thu, 27 Oct 2016 05:37:52 +0000 (13:37 +0800)]
ARM: dts: msm: Add initial support for msmcobalt v2 QRD VR1 board
Add initial device trees for msmcobalt v2 QRD VR1 board.
Move audio device tree entry to common file as well.
Change-Id: Iabc11506074511ee71463e9d287f6e460dca451e
Signed-off-by: Xiaogang Cui <xiaogang@codeaurora.org>
Ghanim Fodi [Wed, 5 Oct 2016 08:59:18 +0000 (11:59 +0300)]
msm: ipa3: Support IPA-USB suspend sequence without remote wake-up
Today IPA-USB uses disconnect sequence when USB initiates
suspend without remote wake-up, and uses suspend sequence
when USB initiates suspend with remote wake-up.
In accordance with USB-GSI driver, changing this behavior
to use suspend sequence in both of the cases. This is to
overcome some USB H/W malfunction when using disconnect
sequence in case of suspend scenario.
Change-Id: Iba43e192905ab37d196aea4b5d00861b9cb7c347
CRs-Fixed:
1068949
Signed-off-by: Ghanim Fodi <gfodi@codeaurora.org>
Jack Pham [Thu, 27 Oct 2016 02:36:55 +0000 (19:36 -0700)]
usb: xhci-plat: Enable wakeup for the root hubs
During system suspend, usb_suspend() will get called for
both root hub instances and in the choose_wakeup() routine
it will find that device_may_wakeup() returns false. If
the busses were previously runtime suspended then
udev->do_remote_wakeup would be set, but since it conflicts
with the wakeup setting being false, the routine has to
first runtime resume the devices in order to change the
remote wakeup setting. This causes unnecessary delay
as it interrupts the system suspend sequence.
Since the host already does support remote wakeup, enable the
per-device wakeup settings for both the hcd root hub instances
in order to avoid the mismatch during choose_wakeup() which
will allow usb_suspend() to proceed without any unnecessary
resume.
Change-Id: I619272c5d0439427061541f5658cfd305a4ebd46
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Subbaraman Narayanamurthy [Fri, 21 Oct 2016 19:49:51 +0000 (12:49 -0700)]
leds: qpnp-wled: add support for configuring ILIM in pmicobalt
Currently, current limit (ILIM) for WLED is configured only for
pmi8994. ILIM levels differs in pmicobalt. Also, the step size
assumed before cannot go well with the different levels.
Default ILIM value differs for LCD and AMOLED mode. Taking this
all into account, add a separate function to configure ILIM for
different PMIC subtypes.
Change-Id: Ibc69706ae1dc878de5cbdaf283f0d71aff8000a1
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Subbaraman Narayanamurthy [Wed, 24 Aug 2016 21:09:08 +0000 (14:09 -0700)]
leds: qpnp-wled: Update AMOLED_VOUT programming
For newer PMICs like pmicobalt, AMOLED_VOUT can be programmed via
independent registers. Also the option to configure AVDD voltage
through SWIRE and SPMI mode is present. Add support to program
the AVDD voltage and mode through these registers. AVDD TRIM
adjustment is needed only for pmi8952 and pmi8994. It is not
needed for pmicobalt. Support it.
CRs-Fixed:
1051250
Change-Id: Ia5cc4a6bbf6b6d0d86e13cec7da167f8a49b859d
Signed-off-by: Devesh Jhunjhunwala <deveshj@codeaurora.org>
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Sunil Paidimarri [Tue, 18 Oct 2016 01:33:13 +0000 (18:33 -0700)]
msm: ipa: Fix the memory leak in error cases
Free the skb if packet is not sent to ipa hw
successfully other than TX_BUSY error cases to avoid
memory leak.
Change-Id: I012484aa92e8f25ed0ad4f6709a54f40409ab8d2
CRs-Fixed:
1077525
Signed-off-by: Sunil Paidimarri <hisunil@codeaurora.org>
Zhen Kong [Fri, 21 Oct 2016 00:34:20 +0000 (17:34 -0700)]
qseecom: check buffer size when loading firmware images
Make change in __qseecom_load_fw() and qseecom_load_commonlib_image()
to check buffer size before copying img to buffer.
CRs-fixed:
1080290
Change-Id: I0f48666ac948a9571e249598ae7cc19df9036b1d
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
Subbaraman Narayanamurthy [Wed, 26 Oct 2016 22:07:38 +0000 (15:07 -0700)]
ARM: dts: msm: fix WLED sink configuration for msmcobalt QRD platform
MSM8998 QRD platform uses WLED sinks 2 and 3 instead of 1 and 2.
Fix the WLED sink configuration for the proper operation.
CRs-Fixed:
1082598
Change-Id: I2a49535786ac61c4da0bebe300aff33a556e485d
Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org>
Harry Yang [Wed, 5 Oct 2016 00:03:56 +0000 (17:03 -0700)]
qcom-charger: set optimal buck switching frequency
Reduce the power dissipation impact by choosing the optimal
switching frequency per input voltage.
The optimal switching frequences are chosen as follow,
5V only = 600kHz
6-8V QC3 = 800kHz
9V QC2 or vanilla PD = 1.0MHz
12V QC2 or PD adapter = 1.2MHz
CRs-Fixed:
1048242
Change-Id: I2ef9f3e122b39682a743334668fcd0aeb085e147
Signed-off-by: Harry Yang <harryy@codeaurora.org>
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Linux Build Service Account [Wed, 26 Oct 2016 20:13:25 +0000 (13:13 -0700)]
Merge "Merge remote-tracking branch 'msm-4.4/tmp-
510d0a3f' into msm-4.4"
Linux Build Service Account [Wed, 26 Oct 2016 20:13:24 +0000 (13:13 -0700)]
Merge "clk: osm: msm: allow WDOG status register to be enabled via debugfs"
Linux Build Service Account [Wed, 26 Oct 2016 20:13:22 +0000 (13:13 -0700)]
Merge "msm: mdss: fix crash when wrong params are passed on the esd config"
Linux Build Service Account [Wed, 26 Oct 2016 20:13:21 +0000 (13:13 -0700)]
Merge "icnss: Do top level reset when timeout to pull register state"
Skylar Chang [Wed, 19 Oct 2016 20:30:44 +0000 (13:30 -0700)]
msm: ipa: fix ioctl input param validation
Fix input parameter validation in order to avoid
device crash because of incorrect parameter in IPA driver.
Change-Id: Icbdb05aeb9211665420a872d3453dbbd24fd347b
CRs-Fixed:
1069060
Acked-by: Ady Abraham <adya@qti.qualcomm.com>
Signed-off-by: Skylar Chang <chiaweic@codeaurora.org>
Robin Murphy [Tue, 31 May 2016 17:04:40 +0000 (18:04 +0100)]
arm64: Implement optimised IP checksum helpers
AArch64 is capable of 128-bit memory accesses without alignment
restrictions, which makes it both possible and highly practical to slurp
up a typical 20-byte IP header in just 2 loads. Implement our own
version of ip_fast_checksum() to take advantage of that, resulting in
considerably fewer instructions and memory accesses than the generic
version. We can also get more optimal code generation for csum_fold() by
defining it a slightly different way round from the generic version, so
throw that into the mix too.
CRs-Fixed:
1082349
Change-Id: I0d8e9bdc15d052458e366cef13a6d2d8c7420ff2
Suggested-by: Luke Starrett <luke.starrett@broadcom.com>
Acked-by: Luke Starrett <luke.starrett@broadcom.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Git-commit:
0e455d8e80aa22d7ed42c9f5e4e3a75c558aa543
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Jack Pham [Wed, 26 Oct 2016 02:24:19 +0000 (19:24 -0700)]
usb: pd: Observe PSHardResetTimer for source hard reset
Ensure the PSHardResetTimer is observed in the source case
when receiving a hard reset. Currently it is handled only
when sending a hard reset. This is achieved by moving
PE_SRC_TRANSITION_TO_DEFAULT from usbpd_set_state to usbpd_sm.
Change-Id: Iea0a8cd64fcce14a99b828cadb0f07664ce858f0
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Jack Pham [Wed, 26 Oct 2016 02:13:37 +0000 (19:13 -0700)]
usb: pd: Fix sink hard reset looping bug
commit
f2449fb61a25 ("usb: pd: Clear PD_IN_HARD_RESET in
PE_SNK_TRANSITION_TO_DEFAULT") introduced a subtle bug by
moving the clearing of the pd->hard_reset flag in sink mode
to the PE_SNK_TRANSITION_TO_DEFAULT state. This caused a
regression in which the state machine acts as if it had
received a hard reset signal and infinitely loops back there.
The cycle could only be broken if a physical disconnect happens.
Fix this by renaming the flag to hard_reset_recvd and only using
it when receiving, and not sending a hard reset.
Change-Id: I04008d0bfc9a874e08b45f78a937004e9f37527d
Signed-off-by: Jack Pham <jackp@codeaurora.org>
Sudheer Papothi [Wed, 26 Oct 2016 13:56:00 +0000 (19:26 +0530)]
ASoC: msmcobalt: Fix MCLK routing on msmcobalt for WCD9340
MCLK TX widget has been added for WCD9335 for recording usecases,
but this results in failure of audio recording usecases on
WCD9340 as msmcobalt supports dynamic detection of codecs. Add
corresponding MCLK widgets based on codec selection for audio
recording usecases to work properly on both codecs.
CRs-Fixed:
1022917
Change-Id: I772e05990a796c99c3b6b6f50323d87b5894231b
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
Sudheer Papothi [Fri, 21 Oct 2016 23:10:47 +0000 (04:40 +0530)]
ARM: dts: msm: Add dmic clock rate on ECPP path for msmcobalt
DMIC clock on ECPP(Echo cancellation Ping-Pong) path can
run at 1.2MHz. Change configures DMIC clock rate for ECPP
path in codec device node.
CRs-Fixed:
1022917
Change-Id: Ib846318dc3d359672314485d386a23fd8621bfda
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
Ananda Kishore [Wed, 19 Oct 2016 14:45:10 +0000 (20:15 +0530)]
ARM: dts: msm: add SLPI fw name property for msmcobalt
Add SLPI fw name property to support dynamic loading of SLPI
fw images based on the version info.
Change-Id: I69981b603526575758376695d7a5e9affd389dbe
Signed-off-by: Ananda Kishore <kananda@codeaurora.org>
Ananda Kishore [Wed, 19 Oct 2016 14:44:22 +0000 (20:14 +0530)]
sensors: ssc: add support to read SLPI fw name
Read SLPI fw name from device node to dynamically load the SLPI
fw image.
Change-Id: I9ecc0cc1b5de5e0bd47c658747463a4498123655
Signed-off-by: Ananda Kishore <kananda@codeaurora.org>
Sarada Prasanna Garnayak [Wed, 26 Oct 2016 07:37:28 +0000 (13:07 +0530)]
defconfig: Enable CONFIG_ICNSS_DEBUG for 32-bit msmfalcon
Enable CONFIG_ICNSS_DEBUG to enable driver debugging.
CRs-fixed:
1082440
Change-Id: I287761ce5b13dc139f59270dceac67cc9ae45cff
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Sarada Prasanna Garnayak [Wed, 26 Oct 2016 07:46:57 +0000 (13:16 +0530)]
defconfig: Enable CONFIG_ICNSS_DEBUG for 32-bit msmcortex
Enable CONFIG_ICNSS_DEBUG to enable driver debugging.
CRs-fixed:
1082440
Change-Id: I6028d4a01ddfd8f8589a1de5322c2780d256d5bc
Signed-off-by: Sarada Prasanna Garnayak <sgarna@codeaurora.org>
Linux Build Service Account [Wed, 26 Oct 2016 08:10:43 +0000 (01:10 -0700)]
Merge "mdss: display-port: add support for hdcp 2.2"
Linux Build Service Account [Wed, 26 Oct 2016 08:10:40 +0000 (01:10 -0700)]
Merge "icnss: Stay awake during recovery"
Linux Build Service Account [Wed, 26 Oct 2016 08:10:39 +0000 (01:10 -0700)]
Merge "ASoC: wcd934X: Update TX gain correctly after decimator enable"
Linux Build Service Account [Wed, 26 Oct 2016 08:10:39 +0000 (01:10 -0700)]
Merge "ASoC: wcd9335: Update TX gain correctly after decimator enable"
Linux Build Service Account [Wed, 26 Oct 2016 08:10:36 +0000 (01:10 -0700)]
Merge "ARM: dts: msm: configure the WLED sink correctly for msmcobalt platforms"
Linux Build Service Account [Wed, 26 Oct 2016 08:10:35 +0000 (01:10 -0700)]
Merge "clk: qcom: Remove non-op BRANCH_HALT_NO_CHECK_ON_DISABLE flag"
Linux Build Service Account [Wed, 26 Oct 2016 08:10:34 +0000 (01:10 -0700)]
Merge "lpm-levels: Change _WARN_printf to pr_err when residency < 0"
Linux Build Service Account [Wed, 26 Oct 2016 08:10:33 +0000 (01:10 -0700)]
Merge "clk: Check for failure at clk_change_rate"