msm: socinfo: Include init.h for __init definition

socinfo.h requires the __init definition:

arch/arm/mach-msm/include/mach/socinfo.h:60: error: expected '=',
',', ';', 'asm' or '__attribute__' before 'socinfo_init'

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
(cherry picked from commit 49e9a385aa3cc463bb4d192d433dd41a261589da)

Change-Id: Ib4be2ef1d0650231fe557ddb61060790772ed78c

Signed-off-by: Sunil Joseph <sunilj@codeaurora.org>
msm: board-8x60: Modify virtual key mappings for fluid

Modify coordinate ranges for virtual keys to be
in line with fluid's screen labels.

Signed-off-by: Mohan Pallaka <mpallaka@codeaurora.org>
(cherry picked from commit 28b8fe7b96dcceeeef9eb7bf42d21478f0fcd1e6)

Change-Id: I1c0382fd58b06170dda08808ef825dc2734d4c1a
Signed-off-by: Sunil Joseph <sunilj@codeaurora.org>
mfd: pmic8058: add charger sub devices separately

There are hardware configurations where the charger module
of the pmic chip may not be used. Separate adding the charger sub
device so the board file can choose to not add it.

Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
(cherry picked from commit e2ddeaeb632a79f42f390caa9ca5c879865251dc)

Change-Id: I4dd160e01e3e39b847925020f6c7467e23709627
Signed-off-by: Sunil Joseph <sunilj@codeaurora.org>
msm: clock-7x30: Remove 0Hz row from MFC clock table

Grounding the MFC clock source selection MUX when the clock
is disabled causes stability issue.  Select the LPXO input
instead.

Change-Id: Ief873c3bc942d42009d146b0cd0cefb618320dc4
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
msm_fb: display: Fix incorrect fail in tvenc_probe

feature pm_qos usage correctly with CONFIG_MSM_BUS_SCALING to
avoid incorrect fail in probe call.

(cherry picked from commit e908e0c469fb2fa7dc7ecb659158d91d082b5d08)

Change-Id: I8c9ec33c71abbea0c051f28f8369ddd6fbd91bc4
Signed-off-by: Rajesh Sastrula <vrajesh@codeaurora.org>
msm: audio: qdsp6v2: Make start procedure compliant for alsa.

- Support for providing start procedure without waiting for
  ack from DSP. This is required to make the interface alsa
  compliant.

(cherry picked from commit 2dedb00a402f8d5a122e60c90195f7320e507263)

Change-Id: Ia98047f20a46a5265fc0717a4282c3ffbd25c34f
Signed-off-by: Bharath Ramachandramurthy <bramacha@codeaurora.org>
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
ASoC: msm8x60: Add Pause/Resume support

Many opensource packages expect the underying ALSA to support
pause/resume. In order to ensure ALSA sink/source are always available
they keep the session in suspend state. Add pause/resume to support
this feature.

(cherry picked from commit 881990a21437e31a4da615fc7a8c6043b503271d)

Change-Id: I63241513c090b368eefff394b4c4d042462138a9
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
msm: audio: qdsp6v2: Add support for contiguous memory allocation

The ALSA subsystem requires contiguous memory to support zero copy
playback/capture support.

(cherry picked from commit 8f78be0f7a1d5e39b165352b434c202a25278937)

Change-Id: I5e5640d9ef8902d90f1a709a8b087f27c51f6d42
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
ASoC: msm8x60: Add MMAP support for playback/capture

The MMAP support helps in reducing the latency involved with copy
to and from user space buffer by reducing copy count.

(cherry picked from commit bff413541a8ee9ac9387475936fc6023b4c25431)

Conflicts:

	sound/soc/msm/msm8x60-pcm.c

Change-Id: Ie3c27654293ca21745aea60d2722dd0d3995761a
Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
Signed-off-by: Jessica Gonzalez <jgaona@codeaurora.org>
Merge "msm: board-8x60: Modify virtual key mappings for fluid" into gingerbread_rel
msm: Optimise power drain when camera closed on 7x30 and 8x60

Clear the calibration PAD bit on CSI controller when camera is
closed, to reduce power consumed on 7x30 and 8x60.

CRs-Fixed: 277047,275742
(cherry picked from commit 92bf7470bb9633ccd6abddcd359050d5bc9e50bf)

Change-Id: Ia77430a576bf35285919cbcca12e6a4d34aa76e3
Signed-off-by: Nishant Pandit <npandit@codeaurora.org>
msm: timer: Always sync on idle power collapse on scorpionmp

Currently the driver always syncs on idle power collapse when
CONFIG_ARCH_MSM_SCORPION is true. Do this as well when
CONFIG_ARCH_MSM_SCORPIONMP is true.

(cherry picked from commit d1f1d5d934a898c1804d4de8ddd08a36ccbcfbd2)

Change-Id: I5b1d4caf7e2b3ff2f5fb83e753393d748575a4fd
CRs-Fixed: 277952
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
msm_fb: display: check mipi panel mode before enable vsync

Checnk mipi dsi panle mode first. Only enable hardware vsync mechanism
if it was command mode panel. This patch also remove the unio declaration
of lcd_panel_info and lcdc_panel_info of msm_panel_info struct to fix vsync
configuration over written panel's porch configuration.

(cherry picked from commit 252d99d19002242dfb78b4b1c1ac604787c3d83c)

Conflicts:

	drivers/video/msm/mipi_dsi.c

Change-Id: I4b7db7ebdcc50bd6bb65d7c0a54a3d0ad55bae70
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
Signed-off-by: Jessica Gonzalez <jgaona@codeaurora.org>
msm: board-8660: do not add pmic charger device for fluid

The fluid board doesn't use the pmic for charging. Prevent the pmic
charger device from being registered.

(cherry picked from commit bce981ea0dd0318c6ab0cfaf55c7f3eab80397a6)

Change-Id: Ic2131bab5b7bcb71badfba3a41f823b7757efae2
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
msm_fb: display: Enable secure IO access and fix DSI clock settings.

Read back register value is not updated properly for MIPI DSI clocks.
Revert back to the older method of configuring the dsi core and dsi
pclk settings. Modify clock control block access to enable read/writes
using secure IO.

Change-Id: Ic9023946e73bc2a94c8b4b49da5f096588e0a231
CRs-Fixed: 278206
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
Signed-off-by: Sunil Joseph <sunilj@codeaurora.org>
Merge "msm: socinfo: Include init.h for __init definition" into gingerbread_rel
Merge "mfd: pmic8058: add charger sub devices separately" into gingerbread_rel
Merge "msm_fb: display: Enable secure IO access and fix DSI clock settings." into gingerbread_rel
msm: Display: Fix voltage value for 8058_l0 regulator

8058_l0 regulator is currently set to a voltage
greater than the maximum allowed value of 1.2 volts.
For MIPI DSI display panel, change the voltage value
from 3.3 volts to 1.2 volts.

CRs-Fixed: 278206
Signed-off-by: Chandan Uddaraju <chandanu@codeaurora.org>
(cherry picked from commit 0c4fd1b0ca6b4b73ce49ee87bfa7b35e968faaca)

Change-Id: I5ddd68eb7f13cfd9d7796ebc56c78de73aec8f24
Signed-off-by: Sunil Joseph <sunilj@codeaurora.org>
msm_fb: display:  add dsi clocks control

Add runtime dsi clock control to turn dsi related clocks off
after screen update and turn clocks on before screen update.
This patch also provide clcok off debounce mechanism by
using kernel timer.

CRs-fixed: 276211
Change-Id: Ib88337ecf83c0d454bbda71a5ec3a35a31cda060
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>