Commit Graph

264866 Commits

Author SHA1 Message Date
Larry Bassel
b8d6102e02 arm: Add support for CONFIG_ENABLE_DMM
Add a new config ENABLE_DMM that will turn on/off the DMM feature.
DMM stands for "dynamic memory management" (the ability to power
off some memory when the system is idle) and the reason this
is needed is that many customers do not want this functionality
and we want to provide a consistent and simple way of turning
this off, rather than the ad-hoc methods some have been using.

DMM currently is enabled by default on 8960.

The following configs are currently used only by DMM
and will be disabled if ENABLE_DMM is not true.

CONFIG_MEMORY_HOTPLUG
CONFIG_HOTREMOVE
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG
CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE
CONFIG_MIGRATION
CONFIG_ARCH_MEMORY_PROBE
CONFIG_ARCH_MEMORY_REMOVE

CRs-Fixed: 344176
Change-Id: I1f1fa8a8882136a38f0abd01b0f5cb59c9a25152
Signed-off-by: Jack Cheung <jackc@codeaurora.org>
Signed-off-by: Larry Bassel <lbassel@codeaurora.org>
2012-03-18 07:36:12 -07:00
Linux Build Service Account
8063cee2a4 Merge "msm: xo: Add debugfs support to turn on and off buffers" into msm-3.0 2012-03-18 06:55:55 -07:00
Linux Build Service Account
95b47b5184 Merge "mmc: bus: print bus speed mode of UHS-I card" into msm-3.0 2012-03-18 06:55:55 -07:00
Linux Build Service Account
d30615510a Merge "net/wireless: Check for number of sub bands" into msm-3.0 2012-03-18 06:55:55 -07:00
Linux Build Service Account
22a5fd9a02 Merge "msm_fb: display: Change perf level for VGA video" into msm-3.0 2012-03-18 04:46:42 -07:00
Linux Build Service Account
a27c58c0ef Merge "usb: gadget: Add HSIC Power Management" into msm-3.0 2012-03-18 04:46:42 -07:00
Linux Build Service Account
8d25e543a3 Merge "Revert "msm: 8625: Remove static mapping for second core"" into msm-3.0 2012-03-18 04:46:42 -07:00
Linux Build Service Account
14856b8232 Merge changes I8de39ea5,I27f63577,Iaa30778a into msm-3.0
* changes:
  mmc: sd: fix the issue with paranoid SD card init retry
  mmc: msm_sdcc: reset wait_for_auto_prog_done flag in case of an error
  mmc: msm_sdcc: add support for eMMC 4.5 HS200 mode
2012-03-17 05:05:07 -07:00
Linux Build Service Account
1c0fc0c9ec Merge "msm: socinfo: Prepend target name to dummy socinfo" into msm-3.0 2012-03-17 05:05:07 -07:00
Linux Build Service Account
6ac1a9bcb0 Merge "fmem: interact properly with DMM" into msm-3.0 2012-03-17 05:05:07 -07:00
Linux Build Service Account
529b1c3156 Merge "video: msm: wfd: Add support for in-band sps/pps" into msm-3.0 2012-03-17 05:05:07 -07:00
Linux Build Service Account
bc14b64432 Merge "msm8930: Update TSENS to use APQ8064 configuration" into msm-3.0 2012-03-17 05:05:07 -07:00
Linux Build Service Account
3af3958cd8 Merge "msm: board-8930: Remove always_on=1 for PMIC PM8038 SMPS 1 and LDO 24" into msm-3.0 2012-03-17 05:05:07 -07:00
Linux Build Service Account
d0edc85b62 Merge "setlocalversion: Prevent tags from overflowing version string" into msm-3.0 2012-03-17 05:05:07 -07:00
Linux Build Service Account
3cba30462b Merge changes I9751454d,I4b962ef3 into msm-3.0
* changes:
  Bluetooth: Fix l2cap conn failures for ssp devices
  Bluetooth: Fix L2CAP connection establishment
2012-03-17 05:05:07 -07:00
Linux Build Service Account
b7029072ef Merge "Bluetooth: Set security level based on remote device features." into msm-3.0 2012-03-17 05:05:07 -07:00
Neema Shetty
3c9d286936 ASoC: msm: Add support for voice over Bluetooth
Add support for Slimbus channels between external modem and APQ.
These channels transfer voice packets to/from the modem to the
BT stack on APQ.

Change-Id: I48bd5248104719574fbc6cf52edfb92cff79bff9
Signed-off-by: Neema Shetty <nshetty@codeaurora.org>
2012-03-17 02:04:01 -07:00
Shalabh Jain
fbf3bdc54f diag: Fix incorrect parsing of log codes
DIAG maintains mask info in a buffer. This buffer is parsed
using a structure. Recently this structure was modified to add
another member. Now, the parsing code has to change to account
for this new member, otherwise, the parsing is incorrect and
misses certain log codes.

Also updated log codes with the latest on modem.

Change-Id: Iaaf86e4f3342fd73898eb11124b4893ec79aa564
Signed-off-by: Shalabh Jain <shalabhj@codeaurora.org>
2012-03-16 21:12:39 -07:00
Dixon Peterson
ee6fb2b08c diag: Remove memory leak
Remove memory leak on early return due to a memory allocation
failure.

Change-Id: I53822afbc145fbd018c6d84120e3aee8ecd082aa
Signed-off-by: Dixon Peterson <dixonp@codeaurora.org>
2012-03-16 20:29:58 -07:00
Nishant Pandit
ad5584d31b msm: camera: Fix the stretch issue in Camera Preview
In non zsl camera preview mode, two vfe outputs are configured as
preview and video outputs. Greater of the two is output from main
scaler and the lower one from the secondary scaler. In Camera preview mode,
application matches preview dimensions aspect ratio to snapshot
dimensions and in camcordermode it is matched to video.

In Current design, We have below scenarios for Non ZSL Camera Preview

Case1: Main Scaler is preview and secondary scalar is video
  In this scenario no error is observed
Case2: Main scalar is video and secondary scalar is preview
  In this scenario since preview output in derived from video but the
aspect ratio may not match in camera mode, so we see stretch in camera
preview.

  This issue is fixed by configuring only single VFE output as per
display dimensions in Camera Preview  since the second video output
is never used

CRs-Fixed: 343884
Change-Id: I25a82b417a3ed1b28ea243c6ce988c23d5fed4a7
Signed-off-by: Nishant Pandit <npandit@codeaurora.org>
2012-03-17 08:58:42 +05:30
Linux Build Service Account
16bca47b11 Merge changes I5ef279a4,I61b1bac5 into msm-3.0
* changes:
  msm: bam_dmux: remove delay to msm9615 bam initialization
  msm: bam_dmux: fix downlink data race condition
2012-03-16 17:03:47 -07:00
Peter Hurley
a5e5b0823a Bluetooth: Fix l2cap conn failures for ssp devices
Commit 330605423c fixed l2cap conn establishment for non-ssp remote
devices by not setting HCI_CONN_ENCRYPT_PEND every time conn security
is tested (which was always returning failure on any subsequent
security checks).

However, this broke l2cap conn establishment for ssp remote devices
when an ACL link was already established at SDP-level security. This
fix ensures that encryption must be pending whenever authentication
is also pending.

Change-Id: I9751454d450345b648d34445324b04ebfceae4b4
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Tested-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
CRs-fixed: 343392
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
2012-03-16 15:45:18 -07:00
Ilia Kolomisnky
edc44dd505 Bluetooth: Fix L2CAP connection establishment
In hci_conn_security ( which is used during L2CAP connection
establishment ) test for HCI_CONN_ENCRYPT_PEND state also
sets this state, which is bogus and leads to connection time-out
on L2CAP sockets in certain situations (especially when
using non-ssp devices )

Change-Id: I4b962ef332c03485912f9e8e7b501d86b375daca
Signed-off-by: Ilia Kolomisnky <iliak@ti.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
[mathewm@codeaurora.org: Resolved conflict]
CRs-fixed: 343392
Signed-off-by: Mat Martineau <mathewm@codeaurora.org>
2012-03-16 15:45:18 -07:00
Sathish Ambley
3e265ce1b3 msm: socinfo: Prepend target name to dummy socinfo
The build_id field of socinfo holds the target name information
that is used by some tests to detect the target and run
appropriate tests. In the absence of a boot loader, dummy values
are populated in the socinfo and absence of target name in the
build_id field results in incorrect test results.

Prepend copper target name in build_id field of dummy socinfo
to allow for the tests to detect the target in the absence of
boot loader.

Change-Id: I69d04012340e61c0f7428ec04487a01b5c60bc87
Signed-off-by: Sathish Ambley <sambley@codeaurora.org>
2012-03-16 15:02:43 -07:00
Deva Ramasubramanian
c84975cbfb video: msm: wfd: Add support for in-band sps/pps
This adds support for sps/pps to be prepended to all I-frames provided
by the core. This support needs to be provided by the core as in HDCP
use case, userspace can no longer prepend the sps/pps to I-frames, as
required by WFD spec.

Change-Id: If13437c6eae4088f913a9a7016a477a4342e8c35
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
2012-03-16 14:44:07 -07:00
Sunil Dutt Undekari
ae86f14f2d net/wireless: Check for number of sub bands
WiFi Drivers can advertize the number of bands dynamically.
A check has been added to see if the band information is
present and only then the values are extracted.
Without this check, a kernel crash shall occur as we would
extract the band information though the driver does not
advertize.

Change-Id: Ia726a692a3c2dcef2fcff0a59363053524c5f806
Signed-off-by: Sunil Dutt Undekari<duttus@codeaurora.org>
2012-03-16 22:44:30 +05:30
Kevin Chan
0c6c29f630 defconfig: msm7627a: Enable media controller config
Enable compilation for media controller
and v4l2 subdev api. This will enable v4l2 support
for media device. The device will be use to
query information about video devices and
v4l2 subdevs.

Change-Id: I0f8bb3a5217be4199896f75f3b2943eba26a7b2b
Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
2012-03-16 10:40:24 -06:00
Kevin Chan
210061ffd9 msm: camera: Add media device node
Add media device node for each camera sensor
Sensor and video node info will be used
for device discovery from userspace

Change-Id: Id8c2f3e952c83259bb6b273cb6b3f04ed93d0ef3
Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
2012-03-16 10:34:41 -06:00
Deva Ramasubramanian
a7046bbcfd [media] v4l: Add new mode for in-band video header in all I-frames
V4L clients should be able to specify the video header to be present
in all I-frame (as it is common in many broadcasting scenarios).  By
specifying this mode, V4L clients will receive sps/pps information
prepended to all I-frames.

Change-Id: Ia93b1d0a59b8d1abf13d1bdb8de494f13ebe1c95
Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
2012-03-16 10:26:51 -06:00
David Collins
49177a7f57 msm: rpm-regulator: Add support for MSM8930 voltage corner regulator
Specify the low level configuration values for the new VDD_dig
voltage corner RPM regulator resource on MSM8930.

Change-Id: I4de707b012971f212bef724483bb6a9f7b98fe30
Signed-off-by: David Collins <collinsd@codeaurora.org>
2012-03-16 08:26:13 -07:00
David Collins
0ac31fee65 msm: rpm-regulator: Add support for new voltage corner RPM regulator type
Add support in the rpm-regulator driver for the new voltage corner
RPM regulator resource type.  Resources of this type allow for
consumers to request a voltage corner in low, nominal, and high
range instead of using a discrete voltage value.  This is useful
for rails whose voltage can be tuned based on the speed inherent
in the silicon of the specific chip that is being run on.

Also rename vreg_enable and vreg_disable functions to avoid check
patch warnings.

Change-Id: I32f5d13565ca777f9a49adbcfde297dfe3b11197
Signed-off-by: David Collins <collinsd@codeaurora.org>
2012-03-16 08:26:00 -07:00
Linux Build Service Account
54a38e96ac Merge "defconfig: msm8960: Enable media controller config" into msm-3.0 2012-03-16 07:00:44 -07:00
Linux Build Service Account
6fd5b9fe38 Merge "msm: camera: Change mount angle for IMX074 sensor" into msm-3.0 2012-03-16 07:00:44 -07:00
Linux Build Service Account
3c921e913f Merge changes I722994d3,If36fd891,I59ceec62,I306cfe9d,Iefce6f37 into msm-3.0
* changes:
  msm: iommu: Don't register the JPEGD IOMMU on 8930
  msm: iommu: Clean up IOMMU initialization code
  msm: iommu: Clean up IOMMU platform data
  board: 8930: Remove extraneous GPIOMUX entries
  msm: irqs: Removed unused IRQs on 8930
2012-03-16 07:00:44 -07:00
Linux Build Service Account
0a6392f7fa Merge "USB: gadget: u_ether: Fix data stall issue in RNDIS tethering mode" into msm-3.0 2012-03-16 07:00:44 -07:00
Ofir Cohen
dca06cbc6f usb: gadget: Add HSIC Power Management
Add HSIC power management to support HSIC core Low Power Mode and
integrate it with System PM and Runtime PM mechanisms.

Change-Id: Id87d5740e7f229e599f8f6bb17a70ac1d8078bf4
Signed-off-by: Ofir Cohen <ofirc@codeaurora.org>
2012-03-16 14:44:30 +02:00
Mona Hossain
7cdbfaff1f qseecom: Load and unload app on open/close
This fix is intended when using QSEOS_VERSION_13.
Targets that have not moved to latest QSEE, will run into
a failure when the qseecom daemon is run.   qseecom daemon
opens the qseecom device and registers the listeners.

In the old QSEE version 13, the app itself responds to these
request for registering the listeners.  So the app needs to have
loaded prior to issuing the register listeners request.

Change-Id: Ic1756aac2b8d8cc22b9b630053e77ba7f7a49c91
Signed-off-by: Mona Hossain <mhossain@codeaurora.org>
2012-03-16 05:32:52 -07:00
Mayank Chopra
56daa2d886 msm_fb: display: Change perf level for VGA video
Change perf level to 3 from 4 for VGA and less
resolution video usecases. This avoids underruns
seen with camera/camcorder usecases on 8660 and older
platforms.

CRs-fixed: 338044
Change-Id: I12fa81f10dc6d02caed44c5b7e6f5732a57bb095
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
2012-03-16 15:54:56 +05:30
Stepan Moskovchenko
0951b8c9d0 msm: iommu: Don't register the JPEGD IOMMU on 8930
The MSM8930 SoC does not have a JPEGD IOMMU, so avoid
registering it on that target.

Change-Id: I722994d39e09c528f311ed6409ba3a3441bc8d4e
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2012-03-15 22:23:00 -07:00
Stepan Moskovchenko
6ca487f111 msm: iommu: Clean up IOMMU initialization code
Now that platform data is statically added to IOMMU
platform devices, clean up the initialization code to use
platform_add_devices directly.

Change-Id: If36fd89127c7183f118ea00339989e263a07c39f
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2012-03-15 22:23:00 -07:00
Stepan Moskovchenko
8eea941023 msm: iommu: Clean up IOMMU platform data
Statically assign the IOMMU platform data to the IOMMU
platform devices rather than adding it at probe time, to
make the code easier to maintain.

Change-Id: I59ceec62d5b07acf97f021934f38ce00e79baeb4
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2012-03-15 22:23:00 -07:00
Stepan Moskovchenko
fa4586d96a board: 8930: Remove extraneous GPIOMUX entries
Remove GPIOMUX entries corresponding to GPIO pins that are
no longer present on the device.

Change-Id: I306cfe9dd69778cc6775ccbff9bd037a5cd98a21
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2012-03-15 22:22:59 -07:00
Stepan Moskovchenko
be0725eca6 msm: irqs: Removed unused IRQs on 8930
Update the 8930 IRQ map to remove extraneous entries
corresponding to interrupts which are no longer present on
the device.

Change-Id: Iefce6f37406ad8d4142d44492c7ea8a9be8ac17e
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
2012-03-15 22:22:59 -07:00
Subhash Jadavani
4dd5c44e48 mmc: sd: fix the issue with paranoid SD card init retry
mmc_resume_host() is called during resume (runtime or system) which calls
	1. mmc_power_up
	2. mmc_select_voltage
	3. host->bus_ops->resume() (mmc_sd_resume())

mmc_sd_resume() ultimately calls mmc_sd_init_card() to initialize the
SD card. But let's say if mmc_sd_init_card() fails during the
execute_tuning(). At this point, host controller timing is changed
to SDR104/SDR50 mode and host clock will also be > 100 MHz.

If there is an error returned by mmc_sd_init_card() and
if CONFIG_MMC_PARANOID_SD_INIT defined, it retries by calling
mmc_sd_init_card() without making sure that host controller timing
and clock be initialized again. This may cause the further
mmc_sd_init_card() also to fail.

To fix this, mmc_sd_resume() should call mmc_power_up()
and mmc_select_voltage() before retrying.

Change-Id: I8de39ea547fa0d5eca478719a4cf9255b6652503
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2012-03-16 09:45:18 +05:30
Subhash Jadavani
ed6b0e409c mmc: msm_sdcc: reset wait_for_auto_prog_done flag in case of an error
"wait_for_auto_prog_done" flag is set when CMD53, single block write
(CMD24) or pre-defined (prefixed with CMD23) multi block write
(CMD25) need to be sent to card. This flag tells the
msmsdcc_start_data() to set the AUTO_PROG_DONE bit in MCI_DATA_CTL
register. If AUTO_PROG_DONE bit is set, SDCC controller will raise
the PROG_DONE at the end of above mentioned write transfers
(command + data) and "wait_for_auto_prog_done" gets cleared at
the end of transfer.

But if we get the error during the command transfer phase itself,
there is a chance that "wait_for_auto_prog_done" remains set which
means it remains sticky during next SDCC transfer request as well.
And if next data transfer is data read operation, having this
"wait_for_auto_prog_done" flag set will not allow the transfer to
end which may cause SDCC driver to raise request timeout.

Following is one such error condition:
<6>[  667.001892] mmc1: CMD6: Request timeout
<6>[  667.004700] mmc1: SDCC PWR is ON
<6>[  667.007904] mmc1: SDCC clks are ON, MCLK rate=400000
<6>[  667.012848] mmc1: SDCC irq is enabled
<6>[  667.067633] mmc1: SPS mode: busy=0
<6>[  667.071020] mmc1: xfer_size=64, data_xfered=64, xfer_remain=0
<6>[  667.076758] mmc1: got_dataend=1, prog_enable=0,
			wait_for_auto_prog_done=1, got_auto_prog_done=0

This patch ensures that "wait_for_auto_prog_done" gets cleared even when
error is seen during command transfer phase itself.

CRs-fixed: 342901
Change-Id: I27f635775ca488826fb46995784b544772fd8e16
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2012-03-16 09:45:02 +05:30
Subhash Jadavani
56e0eaaf20 mmc: msm_sdcc: add support for eMMC 4.5 HS200 mode
The following changes are required in host driver to
enable/configure the controller in HS200 mode -

1. Define new eMMC host capabilities as supported by the
host. These capabilities allows the MMC core driver to
enable HS200 timing in device.

2. After the device is set to HS200 mode, the host driver
must send tuning command CMD21 to find the optimal sampling
point for data lines.

3. Depending on the voltage range and HS200 modes supported
by the host and device, host driver must change the voltage
range of VccQ whenever the MMC core driver requests it.

4. Change the controller timing mode and MCLK frequency to
maximum frequency supported by host.

Change-Id: Iaa30778a509eb800b0193f32f85ce494610e94c3
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
2012-03-16 09:44:51 +05:30
Taniya Das
fe04d4fe03 Revert "msm: 8625: Remove static mapping for second core"
Second core booting is not always successful, so reverting it for now.

This reverts commit 0c29caec8e.

Change-Id: Ia017e12488e11f0700f76d6df06d41f7dea717c3
Signed-off-by: Taniya Das <tdas@codeaurora.org>
2012-03-16 09:39:58 +05:30
Kevin Chan
558260115d defconfig: msm8960: Enable media controller config
Enable compilation for media controller
and v4l2 subdev api. This will enable v4l2 support
for media device. The device will be use to
query information about video devices and
v4l2 subdevs.

Change-Id: I03fe3e11bb39c69d6ea10be4f2f7c13680263928
Signed-off-by: Kevin Chan <ktchan@codeaurora.org>
2012-03-15 20:49:16 -06:00
Mahesh Sivasubramanian
9e52ce4fae msm: rpm-8930: Update RPM enum to support RB-CPR corner voltage
Update RPM enumeration for 8930 target to include Rapid Bridge
Core Power Reduction enums. Rapid Bridge CPR helps identify
process differences in SoCs and apply better corner voltages
for power benefit.
This patch facilitates kernel CPR modules to communicate with
RPM driver using these enumeration.

Change-Id: I78609a4eb88e38f1ba082368b03d40de070d60f7
Signed-off-by: Mahesh Sivasubramanian <msivasub@codeaurora.org>
2012-03-15 20:18:49 -06:00
Sreesudhan Ramakrish Ramkumar
3f06a1bc4a msm: camera: Change mount angle for IMX074 sensor
IMX074 preview is shifted 90 degree on 8064 CDP and liquid.
mount angle for IMX074 on CDP and Liquid is changed to fix it.

Change-Id: I22987a0109d367bc52f9c937d51c24b3c9b6e490
Signed-off-by: Sreesudhan Ramakrish Ramkumar <srramku@codeaurora.org>
2012-03-15 18:46:48 -07:00