Commit Graph

62866 Commits

Author SHA1 Message Date
Linux Build Service Account
4187aa4b94 Merge changes If6a9ccd6,I71d2785e,Idf5d5351 into msm-3.0
* changes:
  msm: pm2: Use PER CPU variable to log the idle stats
  msm: pm2: Change the initialization sequence of "msm_pm_init_done"
  msm: pm2: Use a different kernel API to get the sleep length
2012-04-02 10:10:06 -07:00
Linux Build Service Account
297fa0246f Merge "msm: pm-boot: Use different memory API to allocate block of memory" into msm-3.0 2012-04-02 10:10:06 -07:00
Linux Build Service Account
153477a2d5 Merge "msm: camera: Fix for camera crash" into msm-3.0 2012-04-02 08:27:56 -07:00
Murali Nalajala
b86f370f41 msm: pm2: Use PER CPU variable to log the idle stats
Replace local static varaible with per cpu static varaible
to log the individual cores idle statistics information
correctly.

Change-Id: If6a9ccd66c2a9ff6bb748134814fb6b7bdb4d257
Signed-off-by: Murali Nalajala <mnalajal@codeaurora.org>
2012-04-02 17:55:20 +05:30
Murali Nalajala
558c0ceff9 msm: pm2: Change the initialization sequence of "msm_pm_init_done"
Set the "msm_pm_init_done" variable after populating the idle
statistics data for both the cores. Setting this varaible before
initializing the idle stats causes the kernel exception (division
by zero). This is happening because one core is doing the driver
init and another core finds idle time and execute the arch_idle
to do a low power mode and also is trying to log the idle stats
information where another core is not prepared yet.

Change-Id: I71d2785eb47f638019817b3f5659711592243063
Signed-off-by: Murali Nalajala <mnalajal@codeaurora.org>
2012-04-02 17:54:15 +05:30
Murali Nalajala
8fda449983 msm: pm2: Use a different kernel API to get the sleep length
Currently pm2 driver calls the "msm_timer_enter_idle" &
msm_timer_exit_idle" API's for all the power modes (i.e.
SWFI, GDFS/StandalonePC) to get next timer expiration &
time sync with modem respectively. Use these API's only
when the system decide to enter into a modem assisted PC
otherwise use a differnt API to get the sleep length.

Change-Id: Idf5d53518f75551bab432b3532c0eae1f61cdff1
Signed-off-by: Murali Nalajala <mnalajal@codeaurora.org>
2012-04-02 17:52:43 +05:30
Murali Nalajala
feedeaee54 msm: pm-boot: Use different memory API to allocate block of memory
Currently PM driver uses the memory given by the "memblock_alloc"
api. These initial memory bytes are programmed with warm boot entry
sequences to come out of the low power modes. Currently this API is
causing the system instability with 1GB DDR parts and HIGH MEM is
enabled. To resolve this issue use a different API to allocate the
memory i.e memblock_remove.

Change-Id: I1016d63f1154e7b4d4d4b702202878d6f93cecf0
Signed-off-by: Murali Nalajala <mnalajal@codeaurora.org>
2012-04-02 17:43:55 +05:30
Mayank Chopra
c22ace3be1 board-msm8x60: display: Fix writeback memory size
The default writeback size (6MB) is as per primary interface. For
mixer1 writeback to be enabled, writeback size should be more than
the maximum resolution supported by mixer1 which is 1080P.
Increase writeback memory size for mixer1 writeback to 12MB.

CRs-fixed: 329630
Change-Id: Icee8370dfc78d316eed3e78a4a7e82e3e64bfa63
Signed-off-by: Mayank Chopra <makchopra@codeaurora.org>
2012-04-02 15:22:46 +05:30
Linux Build Service Account
7d61e0bd8b Merge "platform-drivers: msm: sps: add new features on NDP-BAM/BAM-Lite" into msm-3.0 2012-04-02 00:41:26 -07:00
Linux Build Service Account
87e311dab0 Merge "msm: 7x27a: audio: Reduce LPA buffer size." into msm-3.0 2012-04-02 00:41:26 -07:00
Linux Build Service Account
ef4200ae3f Merge "msm: pm2: fix the bug in standalone idle statistics" into msm-3.0 2012-04-02 00:41:26 -07:00
Raju P.L.S.S.S.N
3f4b302e99 msm: camera: Fix for camera crash
1. update get_sensor_info function to send sensor type
   to the upper layers
2. update table ack pending flag in case of table ack
   received
3. add ov5647 sensor power down function

Change-Id: I92c8e25d377d2fee09276b72119eb95adfcc79f8
Signed-off-by: Raju P.L.S.S.S.N <rplsssn@codeaurora.org>
2012-04-02 11:41:36 +05:30
Linux Build Service Account
2c7fb4d0ed Merge "defconfig: 9615: Enable CONFIG_THERMAL_PM8XXX for PMIC thermal alarm" into msm-3.0 2012-04-01 22:48:31 -07:00
Linux Build Service Account
1b6aa998e1 Merge "msm: idle-v7: do not clean and invalidate after warm boot" into msm-3.0 2012-04-01 22:48:31 -07:00
Anji jonnala
c681622014 msm: pm2: fix the bug in standalone idle statistics
msm_pm_standalone_power_collapse function is always returning
success irrespective of actual gdfs status. There could be possiblilty
that wfi can fail which needs to be consider while measuring the
standalone power collapse statistics.

Change-Id: I643bc4344cf1299cd8de5e6d7d88579e5e9a704d
Signed-off-by: Anji jonnala <anjir@codeaurora.org>
2012-04-02 09:05:46 +05:30
David Collins
cbf3efe95b defconfig: 9615: Enable CONFIG_THERMAL_PM8XXX for PMIC thermal alarm
Enable the pm8xxx thermal alarm driver so that userspace can
monitor the PMIC die temperature on 9615 devices.

Change-Id: Id5e7bf029b94fb13fb76126bc64815e6db0e3634
Signed-off-by: David Collins <collinsd@codeaurora.org>
2012-04-01 18:06:18 -07:00
Linux Build Service Account
e703743cb4 Merge "msm: Add watchdog support in fsm9xxx targets" into msm-3.0 2012-04-01 17:48:34 -07:00
Linux Build Service Account
1ad337a488 Merge "msm: msm_common: Add timeouts for boot and ramdump" into msm-3.0 2012-04-01 17:48:34 -07:00
Linux Build Service Account
ffe78946e9 Merge "msm: mdm: do not reset the external modem on second power up" into msm-3.0 2012-04-01 16:15:24 -07:00
Rohit Vaswani
e897f84ce6 msm: Add watchdog support in fsm9xxx targets
FSM9xxx targets are compatible with existing msm_watchdog
driver. This change defines and initializes the platform_device
for msm_watchdog in FSM9xxx targets.

Change-Id: I8872debda9e79cb943c125ba333e754fe1637d2c
Acked-by: Kaushik Sikdar <ksikdar@qualcomm.com>
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
2012-04-01 15:27:51 -06:00
Linux Build Service Account
05d19f1462 Merge "msm: pil: Break off DSPS support into separate driver" into msm-3.0 2012-04-01 13:42:38 -07:00
Joel King
52d7fa6725 msm: msm_common: Add timeouts for boot and ramdump
Use wait_for_completion_timeout() instead of wait_for_completion()
in the mdm SSR powerup and ramdumps callback functions to guard
against an indefinite hang should the userspace program become
unresponsive.

Change-Id: Ie8126891e7135777098dfbe2755160e17e8c79a6
Signed-off-by: Joel King <joelking@codeaurora.org>
2012-04-01 13:14:48 -07:00
Joel King
3da02a9289 msm: mdm: do not reset the external modem on second power up
It is not necessary to reset the external modem the second time
it is being powered up because it has already been powered up for
early initialization.

Change-Id: I9837aa3b26d442f1521b5919d8f2c0f2080297a5
Signed-off-by: Joel King <joelking@codeaurora.org>
2012-04-01 12:42:40 -07:00
Linux Build Service Account
b9e9cb4243 Merge changes Idb7a73f2,I7645b929,I12000613,I13322b5b into msm-3.0
* changes:
  msm: pil-gss: Move to common proxy voting
  msm: pil-q6v4: Move to common proxy voting
  msm: pil-riva: Move to common proxy voting
  msm: pil: Consolidate proxy voting into core
2012-04-01 03:45:57 -07:00
Linux Build Service Account
2e72498742 Merge "msm: copper: Add support for SLIMBUS controller" into msm-3.0 2012-04-01 01:20:23 -07:00
Linux Build Service Account
88f4185204 Merge "msm: clock-8960: Add device names for 8064 VPE clocks" into msm-3.0 2012-04-01 01:20:23 -07:00
Stephen Boyd
25c4a0bf95 msm: pil: Break off DSPS support into separate driver
Implement the DSPS boot and shutdown support as a platform driver
by consolidating the two implementations of DSPS boot code which
were in peripheral-reset*.c.

Change-Id: If27ecfe9f508acc3508f3deba416dd196be37090
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2012-04-01 00:46:19 -07:00
Linux Build Service Account
96627ee816 Merge changes I13b9b1ce,I3b910c48 into msm-3.0
* changes:
  defconfig: apq8064: Enable EPM driver
  msm: Add EPM board changes for APQ8064
2012-03-31 23:47:51 -07:00
Linux Build Service Account
cc09f5ebeb Merge "gpu: ion: Map a range into the IOMMU" into msm-3.0 2012-03-31 23:47:51 -07:00
Sagar Dharia
a316a964d6 msm: copper: Add support for SLIMBUS controller
SLIMBUS controller is used by audio. SLIMBUS controller device is
added to Device Tree for copper.

Change-Id: I03f133b1e219896cb4135d1a770938e416d8e511
Signed-off-by: Sagar Dharia <sdharia@codeaurora.org>
2012-03-31 23:19:40 -06:00
Ujwal Patel
d041f986bc msm: clock-8960: Add device names for 8064 VPE clocks
Device names must be specified in the clk_lookup table
so that clk_get() will find the clocks.

Change-Id: Icc14ca81d76f6f75072a858a49af348309d52bfd
Signed-off-by: Ujwal Patel <ujwalp@codeaurora.org>
2012-03-31 21:15:28 -06:00
Siddartha Mohanadoss
ff2d15d16b defconfig: apq8064: Enable EPM driver
External Power Monitor(EPM) driver is used by clients
to monitor the voltage and current for supported
power rails.

Change-Id: I13b9b1ce93c7be296b20675ce06fe8cdd6ca08c0
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2012-03-31 17:57:08 -07:00
Siddartha Mohanadoss
b9df494dbb msm: Add EPM board changes for APQ8064
Add platform data for the EPM which includes the
scaling factor and resistance for each of the channel
to calculate the power, sx1509 GPIO expander properties.

Change-Id: I3b910c4827d12a41f6c9ebe5caf60e7dcd525a99
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
2012-03-31 17:57:08 -07:00
Stephen Boyd
30ad10bf5b Revert "usb: msm_otg: Migrate to clock apis for XO voting"
This reverts commit 7dd2266ae3.

It was a mistake to move the usb driver to the clock apis for XO
buffer voting. Due to an RPM design CXO and D0 are the same but
we would like to hide that from the users of the buffers.
Therefore the msm_xo driver itself remaps the D0 buffer request
to the cxo clock until the RPM is fixed.

Change-Id: I230de55d30a49fa5bcf0d07f40453f1e09c4a9b1
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2012-03-31 12:42:29 -07:00
Linux Build Service Account
d4a9394f02 Merge "msm: board-msm7627a-bt: Add support to enable BT on QRD7" into msm-3.0 2012-03-31 07:57:41 -07:00
Linux Build Service Account
f5cf55f10e Merge "msm: pm2: Program the top csr to put core1 into GDFS." into msm-3.0 2012-03-31 07:57:41 -07:00
Linux Build Service Account
c546b3178e Merge "msm: v4l2: use new IOMMU mapping API." into msm-3.0 2012-03-31 04:33:15 -07:00
Linux Build Service Account
0ea31216ca Merge "msm: board 8960 and 8064: Increase ion heap size for audio." into msm-3.0 2012-03-31 04:33:15 -07:00
Linux Build Service Account
9193e5fcb0 Merge "ARM: 7068/1: process: change from __backtrace to dump_stack in show_regs" into msm-3.0 2012-03-31 04:33:15 -07:00
Anji jonnala
1f2377cef4 msm: pm2: Program the top csr to put core1 into GDFS.
Upon wakeup source detection, modem bring's the core0 out of
reset. The recomendation for core0 in 8x25 is to put the core1
into GDFS till hotplug sw brings it online.

Since core1 is not yet enabled, program the top CSR from core0
context and drive the SPM1 to put the core1 in to GDFS. Once
core1 is put into GDFS disable the top csr and enable the SPM1
control for core1.

Enable the scu as well while coming out of power collapse which
facilitates the coherency between shared data across the cores.

change-Id: Iee35908d55c9a630da6bf2509a66a3c7f870fece
Signed-off-by: Anji jonnala <anjir@codeaurora.org>
2012-03-31 14:50:00 +05:30
Linux Build Service Account
2f34523e1d Merge "msm: clock-8960: program PLL15 on 8930" into msm-3.0 2012-03-31 01:14:46 -07:00
Linux Build Service Account
7d9a224aaf Merge changes Id383aff8,I4b1d1dc2 into msm-3.0
* changes:
  msm: board-dt: ARM generic timer DT support
  ARM: architected timers: add DT support
2012-03-31 01:14:46 -07:00
Linux Build Service Account
198945a659 Merge "msm: 9615: Have same platform data for AUX PCM RX & TX devices" into msm-3.0 2012-03-31 01:14:46 -07:00
Linux Build Service Account
fcda1ca507 Merge changes I124a4ba1,Idf7c4e53,I09411d46,I4f270a41,Icd7e6002,I56a14e86,Id91ac5e6,Ia1abd831 into msm-3.0
* changes:
  regulator: map consumer regulator based on device tree
  regulator: pass additional of_node to regulator_register()
  regulator: adapt fixed regulator driver to dt
  regulator: helper routine to extract regulator_init_data
  regulator: Constify constraints name
  regulator: Properly register dummy regulator driver
  dt: add empty dt helpers for non-dt build
  copper: regulator-stub: Add devices for Krait Power Control
2012-03-31 01:14:46 -07:00
Ravishangar Kalyanam
5f0c64158d msm: display: Set max MDP bandwidths for larger primary resolutions
To avoid underruns for larger primary display resolutions,
set max MDP clock/bandwidths for dynamic boot parameter
cases with HDMI as primary and WUXGA panels

Change-Id: I1e020de0cbd4082edd26d4b03ebee4d4b976c26a
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>
2012-03-30 17:44:19 -07:00
Yan He
f879bb0f09 platform-drivers: msm: sps: add new features on NDP-BAM/BAM-Lite
Commmand Descriptor, Pipe Lock, Notify-When-Done(NWD) and Immediate
Commmand Descriptor are enabled in NDP-BAM and BAM-Lite. Add the
support in SPS driver for these new features.

Change-Id: I0ec9efe0bd801345aa416270739a52d7d6c5e01c
Signed-off-by: Yan He <yanhe@codeaurora.org>
2012-03-30 13:25:50 -07:00
Bharath Ramachandramurthy
2fd017a301 msm: board 8960 and 8064: Increase ion heap size for audio.
After migration from pmem to ion, we need to
reduce EBI1 memory for audio usecase and make a
corresponding increase the ION heap size.

Change-Id: I0f72549e26b643453b969a6e56e44c7cf6d61548
Signed-off-by: Bharath Ramachandramurthy <bramacha@codeaurora.org>
2012-03-30 13:21:28 -07:00
Linux Build Service Account
26417da627 Merge "msm: clock: Hook into clock tracepoints" into msm-3.0 2012-03-30 11:29:44 -07:00
Ankit Premrajka
459429648e msm: v4l2: use new IOMMU mapping API.
The ion_phys API is being deprecated. Instead there
is a new set of API that does the same thing as ion_phys
if the system has no IOMMU enabled. Otherwise, it
returns an IOMMU device virtual address.

Change-Id: I1f01d33cbc6d236d28c9193a90e48377b9fb35cc
Signed-off-by: Ankit Premrajka <ankitp@codeaurora.org>
2012-03-30 08:25:55 -07:00
Laura Abbott
0a80147e1c ARM: 7068/1: process: change from __backtrace to dump_stack in show_regs
Currently, show_regs calls __backtrace which does
nothing if CONFIG_FRAME_POINTER is not set. Switch to
dump_stack which handles both CONFIG_FRAME_POINTER and
CONFIG_ARM_UNWIND correctly.

__backtrace is now superseded by dump_stack in general
and show_regs was the last caller so remove __backtrace
as well.

Change-Id: I396677df8bc22bf28e4486f2bfb155c516a3d452
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
2012-03-30 08:14:36 -07:00