android-sdk/kernel-video.git
7 years agoMerge branch 'p-ti-android-3.8.y-video' master
Sundar Raman [Fri, 26 Jul 2013 21:32:39 +0000 (16:32 -0500)]
Merge branch 'p-ti-android-3.8.y-video'

7 years agoMerge branch 'ion' into p-ti-android-3.8.y-video
Sundar Raman [Fri, 26 Jul 2013 21:31:54 +0000 (16:31 -0500)]
Merge branch 'ion' into p-ti-android-3.8.y-video

This contains the ION cleanup series and caching changes

* ion:
  gpu: ion: add support for more cache operations
  gpu: ion: DRA7: ensure TILER 2d mappings are shared device
  ARM: dts: DRA7/OMAP5: reserve carveout buffers & fix carveout size
  gpu: ion: fix omap_ion_share_fd_to_buffers api
  gpu: ion: omap: add checks for carveout addresses and sizes
  gpu: ion: omap: Fix TILER secure heap base address
  gpu: ion: omap: re-populate flags parameters into buffer

Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agoMerge branch 'p-ti-android-3.8.y-video'
Sundar Raman [Fri, 26 Jul 2013 21:05:51 +0000 (16:05 -0500)]
Merge branch 'p-ti-android-3.8.y-video'

7 years agogpu: ion: add support for more cache operations
Sundar Raman [Tue, 23 Apr 2013 22:39:34 +0000 (17:39 -0500)]
gpu: ion: add support for more cache operations

Enhance ion_sync_for_device to take in cache direction

Change-Id: I78bef9c2b5cc461b5f49c6019d031a15ce1a36de
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agogpu: ion: DRA7: ensure TILER 2d mappings are shared device
Sundar Raman [Thu, 25 Jul 2013 13:43:29 +0000 (08:43 -0500)]
gpu: ion: DRA7: ensure TILER 2d mappings are shared device

Write combined mappings are not supported for TILER 2D on DRA7
similar  to OMAP5 due to h/w issue. So, shared mappings should
be used. Added the check which was missing for DRA7.

Change-Id: I8ba9bd676f2942dd6a8bd5737bab8e25c8f1cbd3
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agoARM: dts: DRA7/OMAP5: reserve carveout buffers & fix carveout size
Sundar Raman [Mon, 3 Jun 2013 18:32:53 +0000 (13:32 -0500)]
ARM: dts: DRA7/OMAP5: reserve carveout buffers & fix carveout size

Carveout buffers were initialized but not reserved for
DRA7. This patch adds the missing memreserves without
which there could be data corruption in highmem region.

In addition, the carveout size for TILER secure heap was programmed
wrongly to 96MB whereas it should have been 81 MB. This patch
fixes this and re-adjusts the carveout base addresses.

Change-Id: I151bd37f089aa7fbf590035ea4f612f1da12f53a
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agogpu: ion: fix omap_ion_share_fd_to_buffers api
Sundar Raman [Fri, 26 Jul 2013 14:34:26 +0000 (09:34 -0500)]
gpu: ion: fix omap_ion_share_fd_to_buffers api

the output value from ion_share_dma_buf is a dma buf fd
buffers array was filled mistakenly as the code was ported
from k3.4 where the equivalent function ion_share used to
return pointer to ion_buffer. updated the code to upref
using ion_share_dma_buf() and get the handle to buffer using
ion_handle_buffer().

Change-Id: I3bb39f918a9dde8ee78ffa3adcab447589295fdf
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agogpu: ion: omap: add checks for carveout addresses and sizes
Sundar Raman [Mon, 3 Jun 2013 18:19:31 +0000 (13:19 -0500)]
gpu: ion: omap: add checks for carveout addresses and sizes

This patch adds sanity checks on the carveout and size parameters
read from the device tree file and returns error. It also checks
if the device tree is populated and returns error accordingly.

Change-Id: Ic1f4e9d7c5f7e9361d9fe922544f9dbc105d99c3
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agogpu: ion: omap: Fix TILER secure heap base address
Sundar Raman [Fri, 26 Jul 2013 14:50:05 +0000 (09:50 -0500)]
gpu: ion: omap: Fix TILER secure heap base address

Access to ION TILER buffers were resulting in data aborts
because of incorrect heap base address initialization.
The omap_ion_heap_tiler_base variable was not being
initialized. With this patch the ION tests pass.

Change-Id: Ic072767a5b70b1eab37caf0a7fadb96f1da97b34
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agogpu: ion: omap: re-populate flags parameters into buffer
Sundar Raman [Tue, 23 Apr 2013 20:13:33 +0000 (15:13 -0500)]
gpu: ion: omap: re-populate flags parameters into buffer

Since the flags function param of omap_tiler_heap_allocate
is used to pass the omap_tiler_info struct, pass the
actual flags param from the client inside omap_tiler_info
struct and re-populate it into the buffer struct.

Change-Id: I06f3b6125c2760f7b4bcc7f174458139d80ec000
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agoMerge branch 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video...
Praneeth Bajjuri [Fri, 26 Jul 2013 02:02:54 +0000 (21:02 -0500)]
Merge branch 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video into p-ti-android-3.8.y

* 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video:
  ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags
  gc320: gcx: [WA] Allocate MMU page tables as non cached
  gc320: Added  missing programming of MTLB base second time
  gc320: Increase VRAM buffers to 4
  gc320: adding gcxxx support in Makefiles
  gc320: Adapt GC320 driver for K3.8
  devices: Initialize GC320 as part of devices init
  platform_data: Added platform data for GC320
  gc320: OMAP4: Adding cache-2dmanager

Change-Id: I7b240582c78cb9ba0c5d77e56ab0cf06d29a64a4
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoMerge remote-tracking branch 'origin/omaplfb' into p-ti-android-3.8.y-video
Praneeth Bajjuri [Fri, 26 Jul 2013 01:52:18 +0000 (20:52 -0500)]
Merge remote-tracking branch 'origin/omaplfb' into p-ti-android-3.8.y-video

This contains GC320 series

* origin/omaplfb:
  ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags
  gc320: gcx: [WA] Allocate MMU page tables as non cached
  gc320: Added  missing programming of MTLB base second time
  gc320: Increase VRAM buffers to 4
  gc320: adding gcxxx support in Makefiles
  gc320: Adapt GC320 driver for K3.8
  devices: Initialize GC320 as part of devices init
  platform_data: Added platform data for GC320
  gc320: OMAP4: Adding cache-2dmanager

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags
Sundar Raman [Thu, 18 Jul 2013 22:42:14 +0000 (17:42 -0500)]
ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags

This is required so that the omap_hwmod_get_mpu_rt_va()
api returns a virtual register base address for the IP.

Change-Id: I29aff07f34653c552b3eac3a1ac3f10e36b7efbb
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agoMerge branch 'p-ti-android-3.8.y-video'
Sundar Raman [Thu, 25 Jul 2013 20:05:42 +0000 (15:05 -0500)]
Merge branch 'p-ti-android-3.8.y-video'

7 years agoMerge branch 'p-ti-linux-3.8.y-video'
Sundar Raman [Thu, 25 Jul 2013 20:05:38 +0000 (15:05 -0500)]
Merge branch 'p-ti-linux-3.8.y-video'

7 years agoMerge branch 'omaplfb' into p-ti-android-3.8.y-video
Sundar Raman [Thu, 25 Jul 2013 19:40:56 +0000 (14:40 -0500)]
Merge branch 'omaplfb' into p-ti-android-3.8.y-video

Enabled GC320 as of this commit on J6 EVM and validated via HWC
Need to cherrypick http://review.omapzoom.org/#/c/33221/7
in addition.

7 years agogc320: gcx: [WA] Allocate MMU page tables as non cached
Sundar Raman [Mon, 22 Jul 2013 14:25:56 +0000 (09:25 -0500)]
gc320: gcx: [WA] Allocate MMU page tables as non cached

In K3.8, the cache flushing APIs for the MMU page tables are not
working correctly. Changed the allocations to non cached to
workaround the problem until the correct root cause is found.

Change-Id: Id87497b86d3d93941926f4fc417a4f8d81a5d570
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agogc320: Added missing programming of MTLB base second time
Alexei Shlychkov [Mon, 22 Jul 2013 14:29:06 +0000 (09:29 -0500)]
gc320: Added  missing programming of MTLB base second time

This patch fixes a crash when running the bvtest test case
second time around. The MTLB base address was not programmed
second time around leading to a bad MMU state. This patch
ensures that the MTLB base is programmed correctly.

Change-Id: Iab33425bc61c1e1618c78bdb17f64cbb9d7b4309
Signed-off-by: Alexei Shlychkov <shlychkov@gmail.com>
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agogc320: Increase VRAM buffers to 4
Sundar Raman [Thu, 18 Jul 2013 22:49:53 +0000 (17:49 -0500)]
gc320: Increase VRAM buffers to 4

With GC320 driver integrated and LCD/HDMI output using VRAM buffers
for SGX composition, it is necessary to increase the number of VRAM
buffers to 4 inorder to allow GC320 to use 2 buffers for composition
output.

Change-Id: I2a481ab9c5c16cd26ac5635b543f41e8c5929fdf
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agogc320: adding gcxxx support in Makefiles
David Sin [Mon, 28 Jan 2013 16:50:54 +0000 (18:50 +0200)]
gc320: adding gcxxx support in Makefiles

Ported from k3.0, commit Id 6c14dfc5c011ce3
[ David Sin <davidsin@ti.com> ]

Change-Id: Ie3b211ff273c9257b596560b6260058466152b35
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
7 years agogc320: Adapt GC320 driver for K3.8
Sundar Raman [Thu, 18 Jul 2013 22:40:57 +0000 (17:40 -0500)]
gc320: Adapt GC320 driver for K3.8

Modified SOC checks and a few other minor changes.

Change-Id: I426c2f017bea0384c7602dd50c0b558329d79b1a
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agodevices: Initialize GC320 as part of devices init
Sundar Raman [Thu, 18 Jul 2013 22:37:40 +0000 (17:37 -0500)]
devices: Initialize GC320 as part of devices init

With K3.8, devices.c is used to initialize platform
devices. Added GC320 initialization here so that it is
done as part of bootup.

Change-Id: I45d3e3b18fb4b419f7a5aabfa7cea54460ffe46a
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agoplatform_data: Added platform data for GC320
Sundar Raman [Thu, 18 Jul 2013 22:36:29 +0000 (17:36 -0500)]
platform_data: Added platform data for GC320

The omap_gcx.h file which contains platform specific
structures for gc320 IP is being added as part of this
patch

Change-Id: I4889333139bb8cd3724ec99ad3e108952e585ed1
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agogc320: OMAP4: Adding cache-2dmanager
Jack Yen [Mon, 24 Dec 2012 12:59:51 +0000 (14:59 +0200)]
gc320: OMAP4: Adding cache-2dmanager

Based on k3.0 commit:
p-android-omap-3.0: 43eb373199a [Jack Yen <jyen@ti.com>]

Change-Id: I7e43de75a20a1cead49e902a7fedad9d4f568855
Signed-off-by: Jack Yen <jyen@ti.com>
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
7 years agoOMAP: cdm data: Use sw sleep/wkup instead of hw_auto for dss
Sundar Raman [Thu, 18 Jul 2013 22:44:08 +0000 (17:44 -0500)]
OMAP: cdm data: Use sw sleep/wkup instead of hw_auto for dss

With hw_auto we are getting unpredictable lock ups with BB2D
enabled.

Change-Id: I391d4e12d9472239b1843670c684c2e7b15a6569
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agoARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags
Sundar Raman [Thu, 18 Jul 2013 22:42:14 +0000 (17:42 -0500)]
ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags

This is required so that the omap_hwmod_get_mpu_rt_va()
api returns a virtual register base address for the IP.

Change-Id: I29aff07f34653c552b3eac3a1ac3f10e36b7efbb
Signed-off-by: Sundar Raman <a0393242@ti.com>
7 years agoMerge remote-tracking branch 'omapzoom/p-ti-android-3.8.y' into p-ti-android-3.8...
Sundar Raman [Thu, 25 Jul 2013 13:54:52 +0000 (08:54 -0500)]
Merge remote-tracking branch 'omapzoom/p-ti-android-3.8.y' into p-ti-android-3.8.y-video

7 years agodefconfig: android: Enable dra7-evm sound support
Misael Lopez Cruz [Mon, 22 Jul 2013 23:41:23 +0000 (18:41 -0500)]
defconfig: android: Enable dra7-evm sound support

Enable ALSA and dra7-evm sound support as built-in features.

Change-Id: Ia3576d802f9445870e2b4cb257fa2862df47e0a7
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Tue, 23 Jul 2013 00:03:16 +0000 (19:03 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  ARM: OMAP: omap2plus_defconfig: disable USB debug flags
  ARM: omap2plus_defconfig: Enable dra7-evm sound support

Change-Id: I45384b836e98f8b8a5ef44fd215ee664e84303bf
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoARM: OMAP: omap2plus_defconfig: disable USB debug flags
Vishal Mahaveer [Mon, 22 Jul 2013 23:36:58 +0000 (18:36 -0500)]
ARM: OMAP: omap2plus_defconfig: disable USB debug flags

Disable USB debug flags from omap2plus_defconfig

Change-Id: Icfa01952faae6992d5bfc97ce8ae27f79f977e3c
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
7 years agoARM: omap2plus_defconfig: Enable dra7-evm sound support
Misael Lopez Cruz [Sun, 7 Jul 2013 05:18:47 +0000 (00:18 -0500)]
ARM: omap2plus_defconfig: Enable dra7-evm sound support

Enable ALSA and dra7-evm sound support as built-in features.

Change-Id: I3d00f20e7aeeee3a6d298183969de21e32d264b8
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agodefconfig: android: disable USB debug flag
Vishal Mahaveer [Mon, 22 Jul 2013 18:15:27 +0000 (13:15 -0500)]
defconfig: android: disable USB debug flag

Disabling USB debug flag from android defconfig

Change-Id: I4e869c4aa44ae11815808991c05a7fe3295aa8aa
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
7 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Mon, 22 Jul 2013 23:07:25 +0000 (18:07 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y: (30 commits)
  ARM: dts: dra7-evm: Add HDMI sound node
  OMAPDSS: HDMI: Fix GPA Channel Setting and Channel Allocation for 6-Channels
  OMAPDSS: OMAP5: HDMI: Audio InfoFrame DB1 field offsets
  ASoC: omap-hdmi-card: Remove redundant print
  ARM: DRA7: hwmod: Fix HDMI irq number
  ARM: DRA7: clocks: Fix HDMI sys_clk mux register
  ASoC: DRA7: dra7-evm: HACK: Set McASP DMA reqs in sDMA crossbar
  ARM: dts: dra7-evm: Add sound card node
  ARM: dts: dra7: Add ATL node
  ARM: dts: dra7: Add McASP nodes
  ARM: dts: dra7-evm: Add audio pinctrl
  ASoC: DRA7: dra7-evm: Add initial support for DRA7 EVM
  ASoC: DRA7: atl: Add initial support for Audio Tracking Logic
  ARM: DRA7: clocks: Append _ck to atl_clkin* and ref_clkin*
  ARM: DRA7: clock: Fix the wrong ABE PLL lock frequency
  ARM: DRA7: hwmod: Disable smart-idle for McASP
  ASoC: davinci-mcasp: Add hw_rule for buffer_size when using AFIFO
  ASoC: davinci-mcasp: Add support for using McASP DATA port
  ASoC: davinci-mcasp: HACK: Add MCASP_VERSION_4 support
  ASoC: davinci-mcasp: Add support for 1-channel
  ...

Conflicts:
arch/arm/boot/dts/dra7-evm.dts

Change-Id: I6134724d21801c94afeae8fb369f171bae901db6
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoARM: dts: dra7-evm: Add HDMI sound node
Misael Lopez Cruz [Mon, 1 Jul 2013 23:33:50 +0000 (18:33 -0500)]
ARM: dts: dra7-evm: Add HDMI sound node

Add HDMI audio node.

Change-Id: I220e56b5a45716a7f7d6bd0b32df102f16746d16
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoOMAPDSS: HDMI: Fix GPA Channel Setting and Channel Allocation for 6-Channels
Angela Stegmaier [Wed, 3 Jul 2013 15:47:30 +0000 (10:47 -0500)]
OMAPDSS: HDMI: Fix GPA Channel Setting and Channel Allocation for 6-Channels

Enable channels 0 to 5 in GPA configuration (GP_CONF1) for the
6 channels case. This fixes an issue where the Audio Sample Packet
was carrying 8 channels instead of 6 channels.

The new GPA configuration sets the sample_present.sp3 bit to 0, then
0x13 is not a valid channel allocation. So, the channel allocation is
set to a valid value (0xb), when the number of channels is 6.

Also a typo is fixed in the comments for the eight channel case.

Change-Id: I3c987a4efdaf9f9594c99dc1fca1470b53a59355
Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
7 years agoOMAPDSS: OMAP5: HDMI: Audio InfoFrame DB1 field offsets
Misael Lopez Cruz [Sun, 2 Jun 2013 23:01:51 +0000 (18:01 -0500)]
OMAPDSS: OMAP5: HDMI: Audio InfoFrame DB1 field offsets

CHNL_COUNT is in bits 6:4 and CODING_TYPE in bits 3:0 of HDMI_CORE_FC_AUDICONF0
register, while in the CEA-861 definition DB1CC is in bits 2:0 and DB1CT in
bits 7:4.

Change-Id: Ifd6ca2c91209b7fcf31dfdc921707c0ad5c9378a
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: omap-hdmi-card: Remove redundant print
Misael Lopez Cruz [Sun, 16 Jun 2013 07:25:04 +0000 (02:25 -0500)]
ASoC: omap-hdmi-card: Remove redundant print

HDMI card name is already printed when card is registered in ALSA,
no need to print it again.

Change-Id: I4bbe1acc45ab647a6a28824f3cb86a14163ba054
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoARM: DRA7: hwmod: Fix HDMI irq number
Misael Lopez Cruz [Sun, 2 Jun 2013 22:57:44 +0000 (17:57 -0500)]
ARM: DRA7: hwmod: Fix HDMI irq number

HDMI_IRQ is connected to IRQ_CROSSBAR_96 in DRA7, previous IRQ number
was for OMAP5.

Change-Id: Iedff41b2e2dc253be7f6aa8a18c0c0d23a7f989d
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoARM: DRA7: clocks: Fix HDMI sys_clk mux register
Misael Lopez Cruz [Sun, 2 Jun 2013 22:55:36 +0000 (17:55 -0500)]
ARM: DRA7: clocks: Fix HDMI sys_clk mux register

HDMI sys_clk mux uses CM_CLKSEL_HDMI_PLL_SYS register for source
selection.

Change-Id: I3c762b2ff4e845978b69482ec3422dcbc736e49c
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: DRA7: dra7-evm: HACK: Set McASP DMA reqs in sDMA crossbar
Misael Lopez Cruz [Sun, 16 Jun 2013 22:15:09 +0000 (17:15 -0500)]
ASoC: DRA7: dra7-evm: HACK: Set McASP DMA reqs in sDMA crossbar

McASP3 and McASP6 don't have default DMA reqs assigned in sDMA
crossbar. In the meantime, McASP3 TX/RX DMA reqs are reassigned
to sDMA_78 and 79, and McASP6 TX/RX to sDMA_62 and 63.

Change-Id: I079e181cfeccd12a121ea3f864bd8905609d09ad
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoARM: dts: dra7-evm: Add sound card node
Misael Lopez Cruz [Mon, 17 Jun 2013 16:37:05 +0000 (11:37 -0500)]
ARM: dts: dra7-evm: Add sound card node

Add node for McASP-based sound card which consists of the media
DAI link that connects McASP3 and tlv320aic3106. This DAI link
in I2S mode with a bit clock of 5.6448 MHz that allows 44.1kHz,
16-bits/sample.

Change-Id: I46aaa94a68c6b3c89069b9030edf96d57d2476ef
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoARM: dts: dra7: Add ATL node
Misael Lopez Cruz [Mon, 17 Jun 2013 16:34:55 +0000 (11:34 -0500)]
ARM: dts: dra7: Add ATL node

ATL1 and ATL2 are the only instances enabled. ATL1 is used to supply
the audio clock for the 16-slots TDM DAI link, so it requires an output
freq of 11.2896 MHz. ATL2 is used for the I2S DAI link and is configured
to 5.6448 MHz.

Change-Id: I4cf5ed86e75aa517e1ab3dbb3de8e9227013311b
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoARM: dts: dra7: Add McASP nodes
Misael Lopez Cruz [Mon, 17 Jun 2013 16:33:34 +0000 (11:33 -0500)]
ARM: dts: dra7: Add McASP nodes

McASP3 is configured in I2S mode with AXR0 as TX and AXR1 as RX.

McASP6 is configured in TDM mode (uses same op-mode property value
than I2S) with 8-slots, AXR0 is used for TX and AXR1 for RX.

Interrupt property in both nodes is using McASP1's in the meantime
since McASP3 and McASP6 don't have default interrupt lines and have
to be assigned through IRQ crossbar.

Change-Id: I766dcbea9190083c6fe0e01501104226d480a22f
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoARM: dts: dra7-evm: Add audio pinctrl
Misael Lopez Cruz [Mon, 22 Jul 2013 19:46:04 +0000 (14:46 -0500)]
ARM: dts: dra7-evm: Add audio pinctrl

Add pinctrl entries for McASP3, McASP6 and ATL. McASP pins are
configured so that McASPs are masters in their corresponding
audio links.

Change-Id: I507ad5941cf679a4afab98fcca7cbeba5fe5cad8
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: DRA7: dra7-evm: Add initial support for DRA7 EVM
Misael Lopez Cruz [Sun, 7 Jul 2013 05:07:38 +0000 (00:07 -0500)]
ASoC: DRA7: dra7-evm: Add initial support for DRA7 EVM

Add initial support for DRA7 EVM, it includes the media DAI link that
connects McASP3 and tlv320aic3106 in I2S mode.

DRA7xx is a high-performance, infotainment application device, based on
enhanced OMAP architecture integrated on a 28-nm technology.

Change-Id: I3be3e94e2f9c5736f236e965297d3cb9d646c7fc
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: DRA7: atl: Add initial support for Audio Tracking Logic
Misael Lopez Cruz [Sun, 16 Jun 2013 23:33:50 +0000 (18:33 -0500)]
ASoC: DRA7: atl: Add initial support for Audio Tracking Logic

Add initial version of Audio Tracking Logic (ATL) driver. ATL is
used to synchronize the digital audio output to the baseband clock.
ATL produces a timing signal at the top of the audio clock tree.

Change-Id: I123ff440b8e478c12e28ff4db42d1196f0ae4f6b
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoARM: DRA7: clocks: Append _ck to atl_clkin* and ref_clkin*
Misael Lopez Cruz [Fri, 7 Jun 2013 20:59:46 +0000 (15:59 -0500)]
ARM: DRA7: clocks: Append _ck to atl_clkin* and ref_clkin*

Suffix 'ck' is missing for 'atl_clkin*' and 'ref_clkin*' clocks in
mcasp and timer parent clock names list.

Fix also a missing "_" in 'atl_clkin3_ck'.

Change-Id: I0d1ced5c61b08c63577872a38b16390f506c9cba
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoARM: DRA7: clock: Fix the wrong ABE PLL lock frequency
Rajendra Nayak [Mon, 17 Jun 2013 13:29:44 +0000 (18:59 +0530)]
ARM: DRA7: clock: Fix the wrong ABE PLL lock frequency

The ABE PLL (used by ATL) was wrongly locked at twice the frequency.
Fix it and also set the dpll_abe_m2x2_ck rate explicitely so that we
have m2 set to 1.

Change-Id: I5efc593c46ee7b31f06326b361a85f27dd3310ec
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
7 years agoARM: DRA7: hwmod: Disable smart-idle for McASP
Misael Lopez Cruz [Sun, 16 Jun 2013 22:13:17 +0000 (17:13 -0500)]
ARM: DRA7: hwmod: Disable smart-idle for McASP

As per TRM, wakeup schema is not supported by McASP, so it's recommended to
use no-idle after McASP is enabled, and smart-idle after it's disabled.

Change-Id: Ia20eff9238b996dbcac4b534b4645ec93fd8bafb
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: davinci-mcasp: Add hw_rule for buffer_size when using AFIFO
Angela Stegmaier [Fri, 12 Jul 2013 20:17:34 +0000 (15:17 -0500)]
ASoC: davinci-mcasp: Add hw_rule for buffer_size when using AFIFO

The AFIFO threshold imposes a limiation on the buffer size.
When the AFIFO is used, the buffer size (in samples) needs to be
an integer multiple of the AFIFO threshold value (wnumevt, rnumevt).

This patch adds a hw_rule to the McASP driver for version 4
of the McASP to account for the limitation on the buffer size.

Change-Id: I3bd320130b10a55d3d84defd99572526ad6469fb
Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
7 years agoASoC: davinci-mcasp: Add support for using McASP DATA port
Angela Stegmaier [Thu, 4 Jul 2013 07:03:03 +0000 (02:03 -0500)]
ASoC: davinci-mcasp: Add support for using McASP DATA port

By default the CFG port is used for data transfer. It
is desireable to use the DATA port so that the AFIFO
can be used on DRA7XX.

To enable DATA port usage, during the probe a check for
an IORESOURCE_MEM named "dat" is done. If the
resource is found, the data port will be used. If it is
not found, the driver will fall back to using the cfg
port.

Change-Id: I42c3cc04621354ef1fd7546f9feff003cf6b38ce
Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
7 years agoASoC: davinci-mcasp: HACK: Add MCASP_VERSION_4 support
Misael Lopez Cruz [Tue, 23 Apr 2013 05:28:07 +0000 (00:28 -0500)]
ASoC: davinci-mcasp: HACK: Add MCASP_VERSION_4 support

McASP IP found in DRA7xx devices is similar to the one described by
VERSION_3 (TI81xx, AM33xx), except that a different DMA mechanism
is used. A new version is introduced to use DMA4 instead (OMAP's).

Long term plan is to keep McASP driver totally agnostic of the DMA
module (sDMA or eDMA).

Change-Id: I47a2fd117b3647a5ed6562cbaa00211cb95dea3a
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: davinci-mcasp: Add support for 1-channel
Misael Lopez Cruz [Thu, 18 Jul 2013 19:08:52 +0000 (14:08 -0500)]
ASoC: davinci-mcasp: Add support for 1-channel

McASP doesn't support 1-slot TDM mode needed for mono, however mono
can still be achieved by using 2-slots (or more) and transferring data
only in one slot.

Change-Id: Ic8420cf2d6cc1ee9b9c163ab592cfa347a679340
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: davinci-mcasp: Pass pin inactive state via DT
Misael Lopez Cruz [Thu, 18 Jul 2013 19:01:57 +0000 (14:01 -0500)]
ASoC: davinci-mcasp: Pass pin inactive state via DT

The state of transmit/receive pins during inactive slots can be controlled through
DISMOD. Previously, the default state (Hi-Z) was used all the time, but that might
not fit well for all applications. So, the inactive state is passed via DT:
"tx-inactive-state" and "rx-inactive-state".

The inactive states can actually be set per serializer, but for the sake of simplicity
we only differentiate them by stream direction.

Additionally, the DISMOD macro is also fixed as the argument part was incorrect.

Change-Id: I0e099c29fde94dd59175c1017c098554c43d18fe
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: davinci-mcasp: Wait until TX AFIFO is not empty
Misael Lopez Cruz [Fri, 5 Jul 2013 22:10:38 +0000 (17:10 -0500)]
ASoC: davinci-mcasp: Wait until TX AFIFO is not empty

Wait until TX AFIFO has at least one audio sample before TXBUF starts
consuming data, otherwise XRUN can be hit immediately at the start of
the stream.

Change-Id: Ie94dcd16f7a00046eb043aec1ceee21ce6009fbc
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: davinci-mcasp: Fix receive right-rotation value
Misael Lopez Cruz [Fri, 28 Jun 2013 06:31:19 +0000 (01:31 -0500)]
ASoC: davinci-mcasp: Fix receive right-rotation value

Receive right-rotation (RROT) for I2S/TDM falls in the MSB-first,
left-aligned streams whose suggested rotation value is slot size -
word size.

Change-Id: I53ac6a0a9c02cf78cc4a2f37c34b6dbc4f9a0bcc
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: davinci-mcasp: Keep TX and RX format symmetric
Misael Lopez Cruz [Fri, 19 Jul 2013 17:02:56 +0000 (12:02 -0500)]
ASoC: davinci-mcasp: Keep TX and RX format symmetric

[TR]XFMT and [TR]XFMTCTL registers are set symmetrically in most
part of the driver, no need to keep it stream direction dependent
only in one place.

Change-Id: I8bacf75c8e5147d086ea67ab8ea5400a6affba99
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: davinci-mcasp: Enable TX FSG for master mode
Misael Lopez Cruz [Wed, 26 Jun 2013 07:42:04 +0000 (02:42 -0500)]
ASoC: davinci-mcasp: Enable TX FSG for master mode

McASP is configured by default in synchronous mode so the TX frame sync
is also used for RX. If McASP is also in master mode (for FSYNC), the
transmit FSG needs to be running to provide the frame sync needed for RX.

In some cases, AFSR/ACLKR pins are not even used so AFSX/ACLKX pins have
to be active for RX too, this requires TX clock dividers to be released
from reset.

Change-Id: Iff0b7b93ed2665b7da8219e435fece512c4551e8
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: davinci-mcasp: Remove unnecesary runtime PM calls
Misael Lopez Cruz [Fri, 21 Jun 2013 08:44:19 +0000 (03:44 -0500)]
ASoC: davinci-mcasp: Remove unnecesary runtime PM calls

Runtime PM calls in trigger() are not symmetric, this causes that
usage counter always keeps increasing. Similarly, runtime PM calls
in driver probe() and remove() are not needed since ASoC already
takes care of calling the appropriate runtime PM calls as required
during stream lifecycle.

Change-Id: I29ef47d9dce3b21db47b54c50d1c64b2fe82d804
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: davinci-mcasp: Apply symmetry on sample bits
Misael Lopez Cruz [Thu, 4 Jul 2013 06:54:57 +0000 (01:54 -0500)]
ASoC: davinci-mcasp: Apply symmetry on sample bits

McASP instances with unified clock/sync domain share the same BCLK
and FSYNC for playback and capture, hence the slot size has to be
symmetric.

Change-Id: Ia0bc75f39aeeda05196ed73a393518f88f21a568
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: davinci-mcasp: Active slots depend on active serializers
Misael Lopez Cruz [Fri, 19 Jul 2013 16:55:37 +0000 (11:55 -0500)]
ASoC: davinci-mcasp: Active slots depend on active serializers

Active slots count depends on the number of channels in the stream
and the number of active serializers. Each serializer will handle
at most the number of channels specified via 'tdm-slots' parameter
in DT.

There are two possible scenarios:

- Single serializer: channel count fits in the max slots supported by
  McASP serializers, active slots is same as channel count

- Multiple serializers: channel count is bigger than max slots supported
  by a serializer. Channel count determines how many serializers are
  needed at their max slot count configuration

Change-Id: I690a8518a807b70cebdbeb131979d68bfb86e4fe
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: davinci-mcasp: Simplify channels retrieval
Misael Lopez Cruz [Sun, 9 Jun 2013 07:00:36 +0000 (02:00 -0500)]
ASoC: davinci-mcasp: Simplify channels retrieval

Channels can be extracted using params_channels() macro.

Change-Id: Ia48497cbb6d3b49d6e1ced9f3241d3e0dd4011ea
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agoASoC: omap-pcm: Initialize DMA slave config
Misael Lopez Cruz [Thu, 27 Jun 2013 19:21:33 +0000 (14:21 -0500)]
ASoC: omap-pcm: Initialize DMA slave config

OMAP DMA engine driver does parameter checking on src_addr_width and
dst_addr_width which can contain an invalid value if the DMA slave
config struct is not initialized.

Change-Id: I9ce81a7f069be08485d8c105d5430ddd2e398fd5
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
7 years agodefconfig: android: enable user space wake lock support
Vishal Mahaveer [Fri, 19 Jul 2013 22:58:27 +0000 (17:58 -0500)]
defconfig: android: enable user space wake lock support

Enable CONFIG_PM_WAKELOCKS in defconfig for user space wakelock
operations using sysfs entries.

Change-Id: I737fb2d258991087cd8bea445fabdb04027ff0e5
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
7 years agoMerge remote-tracking branch 'remotes/gitomapzoom/p-ti-android-3.8.y' into p-ti-andro...
Sundar Raman [Fri, 19 Jul 2013 18:36:50 +0000 (13:36 -0500)]
Merge remote-tracking branch 'remotes/gitomapzoom/p-ti-android-3.8.y' into p-ti-android-3.8.y-video

7 years agoandroid: defconfig: enable android usb flags
Ruchika Kharwar [Thu, 11 Jul 2013 15:53:44 +0000 (10:53 -0500)]
android: defconfig: enable android usb flags

Enabling android usb specific flags

Change-Id: I50dee0fa992a7704bad152658194b3f8de2fc69f
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
[Enable the android flags correctly in defconfig]
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoHACK: DRA7xx: usb: dwc3: set mailbox in gadget pullup.
Ruchika Kharwar [Sat, 11 May 2013 16:14:43 +0000 (18:14 +0200)]
HACK: DRA7xx: usb: dwc3: set mailbox in gadget pullup.

On DRA7xx EVM, there is no vbus sensing. Hence the mailbox is required to
be set when the android gagdet pullup is called.
When the IO expander driver is available and senses vbus, it should write to
the dwc3 mailbox.

Change-Id: I78850c8ab243d4acc94b6327996849d13704802d
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agoandroid: usb: dwc3: Ensure the OUT request sizes are valid
Ruchika Kharwar [Mon, 29 Apr 2013 21:46:06 +0000 (16:46 -0500)]
android: usb: dwc3: Ensure the OUT request sizes are valid

Backport fix from K3.4.
Refer commit:6170c26e89640f5c38dfc7b3a214f83cb98b9047
usb: gadget: android: fix adb to work with Synopsys UDC

The DWC3 USB device controller requires all OUT transfer request
lengths to be a multiple of max packet size

Refer: commit: 98346f7db
Align with above patch to have bulk-OUT transfer size be
divisible by maxpacket size.

Change-Id: I552d65d58fc5f414be2ddb33ffa37c5f6819373a
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Signed-off-by: Moiz Sonasath <m-sonasath@ti.com>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agoandroid: hack: usb: gadget: android: remove audio function
Ruchika Kharwar [Mon, 29 Apr 2013 16:02:21 +0000 (11:02 -0500)]
android: hack: usb: gadget: android: remove audio function

Remove audio function to avoid compilation break.

Change-Id: Iaf4684d8e1b3e8e7b5427f313906940e727aa8cd
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agoandroid: usb: gadget: Allow kernel boot with android gadget.
Ruchika Kharwar [Mon, 29 Apr 2013 16:37:10 +0000 (11:37 -0500)]
android: usb: gadget: Allow kernel boot with android gadget.

This patch allows a kernel with android gadget enabled to boot.
Issues fixed:
- Allows the android gadget probe to get deferred if a udc gadget is
  unavailable.
- Check added for udc gadget availability first before "any" android
  initialization.

Change-Id: If6c46d32a32994367d95a57af1e231beafa7bb8a
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agoandroid: usb: gadget: udc_core: Check for android compile flag.
Ruchika Kharwar [Mon, 29 Apr 2013 15:48:23 +0000 (10:48 -0500)]
android: usb: gadget: udc_core: Check for android compile flag.

It is incorrect to comment out usb_gadget_connect() if the android gadget is
not compiled in.

Change-Id: If7f4a7e4f79a0a93aa976605184e3c82e7a71c4e
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Fri, 19 Jul 2013 18:22:16 +0000 (13:22 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  dra7x: dts: pinctrl: Adding drv1/2_vbus pinctrl config to dra7x DT
  usb: dra7x: Enable init rate for dpll usb
  dra7xx: usb: dwc: device tree entrees for 2 usb_otg_ss
  HACK: usb: dwc3: dwc3 wrapper update for multiple usb subsystems
  usb: dwc3-omap: wrapper dwc3_omap_mailbox updated ret val
  usb: phy: omap_control_usb: addition of a dummy control register
  usb: omap_control_usb: addition of a phy variation.
  usb: phy: omap_control_usb: removal of globals
  usb: phy: enable phy drivers to use the device node for optional clock names.
  usb: dwc3: update the maxpacket based on the maximum_speed

Change-Id: I61c584e5062101924c42e9ee9f01f4cccbfe1381
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agodra7x: dts: pinctrl: Adding drv1/2_vbus pinctrl config to dra7x DT
Ravi Babu [Fri, 28 Jun 2013 09:52:12 +0000 (04:52 -0500)]
dra7x: dts: pinctrl: Adding drv1/2_vbus pinctrl config to dra7x DT

Add drv1_vbus pincontrol configuration to dra7-evm dts.
select muxmode 0, and enable drv1_vbus slewctrl and pulldown

Add drvr2_vbus pincontrol configuration to dra7-evm dts.
select muxmode 0, and enable drv1_vbus slewctrl and pulldown

Change-Id: I49135549c92e7860b832a4fcdae15853f1475695
Signed-off-by: Ravi Babu <ravibabu@ti.com>
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: Somnath Mukherjee <somnath@ti.com>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agousb: dra7x: Enable init rate for dpll usb
Nikhil Devshatwar [Fri, 28 Jun 2013 09:52:11 +0000 (04:52 -0500)]
usb: dra7x: Enable init rate for dpll usb

Add init rate fout=960Mhz to configure USB dpll
USB dpll is not locked correctly through the pm runtime

Change-Id: I51feacb546052120eb62be17f4119a7bb46d1c90
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: Somnath Mukherjee <somnath@ti.com>
7 years agodra7xx: usb: dwc: device tree entrees for 2 usb_otg_ss
Ruchika Kharwar [Wed, 10 Jul 2013 19:18:15 +0000 (14:18 -0500)]
dra7xx: usb: dwc: device tree entrees for 2 usb_otg_ss

This introduces 2 usb otg subsystems to the dra7xx device tree.

Change-Id: I32df149d262fb527802faf528d7aa506fb883cef
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agoHACK: usb: dwc3: dwc3 wrapper update for multiple usb subsystems
Ruchika Kharwar [Thu, 11 Jul 2013 20:57:00 +0000 (15:57 -0500)]
HACK: usb: dwc3: dwc3 wrapper update for multiple usb subsystems

Allow a separate dma mask per usb_otg_ss instance.
REVISIT: This is based on the name of the node in the device tree and ugly.
Temporary to get DRA7xx going and hardly scalable.

"_omap" global still exists and the only reason his works is because dra7xx
does not use the palmas driver.

Change-Id: Iff9d09e837c1556516c28c42f7a3f41a2315befc
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agousb: dwc3-omap: wrapper dwc3_omap_mailbox updated ret val
Ruchika Kharwar [Sat, 11 May 2013 16:04:20 +0000 (18:04 +0200)]
usb: dwc3-omap: wrapper dwc3_omap_mailbox updated ret val

Instead of returning IRQ_NONE, it returns a 0 on success.
This allows it to be called if needed from a non irq function routine
nicely.

Change-Id: Ic7db386a91bd6661f686c519d04d57a3c1e0407b
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agousb: phy: omap_control_usb: addition of a dummy control register
Ruchika Kharwar [Wed, 22 May 2013 04:31:50 +0000 (23:31 -0500)]
usb: phy: omap_control_usb: addition of a dummy control register

This patch introduces a "dummy control register" to turn on addition
clocks for phy tpe 3.

Change-Id: I7ed4400e496a92940944637684bb5586f93da713
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agousb: omap_control_usb: addition of a phy variation.
Ruchika Kharwar [Sat, 11 May 2013 15:34:58 +0000 (17:34 +0200)]
usb: omap_control_usb: addition of a phy variation.

Another phy type on dra7xx inspired the addition of a OMAP_CTRL_DEV_TYPE3
type of omap_control_usb system.
This phy is different in 2 ways
 - usb2 only
 - the power on is in different register with bit definitions dissimilar to
   dev_conf.

Change-Id: I39969ea675ff9916aa746b5168784ba99119a54f
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agousb: phy: omap_control_usb: removal of globals
Ruchika Kharwar [Mon, 13 May 2013 21:35:10 +0000 (16:35 -0500)]
usb: phy: omap_control_usb: removal of globals

This patch removes the use of a global omap_control_usb.
This allows
- Multiple instances of the omap_control_usb when required such as in DRA7xx.
- The device node is looked up using the phandle.

Change-Id: Ib5bf866b00f945430c055344d6344d4edfc38882
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agousb: phy: enable phy drivers to use the device node for optional clock names.
Ruchika Kharwar [Tue, 7 May 2013 15:12:26 +0000 (17:12 +0200)]
usb: phy: enable phy drivers to use the device node for optional clock names.

Allow the device drivers to use the required optional clock names
from the DT node data.This allows scalability when multiple usb_otg_ss
instances are in use.

Change-Id: Id4a941855d6011a195d5cc796d6b1861624f8f56
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agousb: dwc3: update the maxpacket based on the maximum_speed
Ruchika Kharwar [Mon, 8 Jul 2013 15:49:44 +0000 (10:49 -0500)]
usb: dwc3: update the maxpacket based on the maximum_speed

During initialization of endpoints, the maximum_speed is used
to determine the maxpacket size of the control endpoint.
For non control endpoints it appears alright to set the maxpacketsize to
be 1024 for the controller, but the function dwc3_gadget_get_maxpacket() is
introduced merely for consistency.

Change-Id: Iececaa685f1dd1901d254bbdf8d83c517bab8c72
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agoandroid: defconfig: unified defconfig for all omap platforms
Praneeth Bajjuri [Fri, 19 Jul 2013 16:28:31 +0000 (11:28 -0500)]
android: defconfig: unified defconfig for all omap platforms

for now, lets keep a unified defconfig for both omap5 evm and
dra7 evm platforms.

REVISIT: We will diverge later based on program needs to have seperate
memory footprint to make the configurable option compile or runtime.
{ Based on customer requirements }.

Change-Id: I9877c8678dedbc22b6d47a72c1fc7b28b3e8a647
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Fri, 19 Jul 2013 02:00:05 +0000 (21:00 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  arm: dts: dra7xx: Add voltage-tolerance to avs_mpu and avs_gpu

Change-Id: I919d3a7089a8ef8f158f338853dd21b65a863cd9
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoarm: dts: dra7xx: Add voltage-tolerance to avs_mpu and avs_gpu
Hemant Hariyani [Thu, 18 Jul 2013 03:14:26 +0000 (03:14 +0000)]
arm: dts: dra7xx: Add voltage-tolerance to avs_mpu and avs_gpu

Without voltage tolerance, regulator code tries to set exact voltage
and this results in a falilure if this value differs even slightly
from what pmic expects. Adding a voltage-tolerance of 1% handles the
case where these voltage values differ slightly.

Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
7 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Fri, 19 Jul 2013 00:10:18 +0000 (19:10 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  clk: omap5: Add CLK_SET_RATE_PARENT flag to gpu clocks
  clk: dra7xx: Add CLK_SET_RATE_PARENT flag to gpu clocks

Change-Id: Ie676c6535e575f87a7ce6f978dd574898de2ace8
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoclk: omap5: Add CLK_SET_RATE_PARENT flag to gpu clocks
Hemant Hariyani [Thu, 18 Jul 2013 03:00:11 +0000 (03:00 +0000)]
clk: omap5: Add CLK_SET_RATE_PARENT flag to gpu clocks

clk_set_rate finds the topmost clock that needs to be changed
in order to set the desired clock to a particular frequency.

This is done only if CLK_SET_RATE_PARENT flag is set for a clock.
gpu_core_gclk_mux and gpu_hyd_gclk_mux need to have this flag
enabled in order for clk_set_rate to propagate to to their parent.

Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
7 years agoclk: dra7xx: Add CLK_SET_RATE_PARENT flag to gpu clocks
Hemant Hariyani [Thu, 18 Jul 2013 03:00:10 +0000 (03:00 +0000)]
clk: dra7xx: Add CLK_SET_RATE_PARENT flag to gpu clocks

clk_set_rate finds the topmost clock that needs to be changed
in order to set the desired clock to a particular frequency.

This is done only if CLK_SET_RATE_PARENT flag is set for a clock.
gpu_core_gclk_mux and gpu_hyd_gclk_mux need to have this flag
enabled in order for clk_set_rate to propagate to to their parent.

Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
7 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Thu, 18 Jul 2013 22:57:55 +0000 (17:57 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  ARM: OMAP5: board-generic: Modify the machine name

Change-Id: Ic6f400e3bded71a2b2dcc44c7c5ad467558dc478
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoARM: OMAP5: board-generic: Modify the machine name
Praneeth Bajjuri [Wed, 17 Jul 2013 20:30:42 +0000 (15:30 -0500)]
ARM: OMAP5: board-generic: Modify the machine name

Changing the machine name to "OMAP5 panda board".

This is needed to populate the correct device name to sdk.

Revisit: Will change the name to official omap5 platform
name "OMAP5432 EVM board" later.

For now, lets keep it in a way so that userspace understands
and populates accordingly.

Change-Id: I857d53e732220fe7bd2324ce3620ef511a39bebd
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Thu, 18 Jul 2013 22:47:16 +0000 (17:47 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  regulator: core: Make set_voltage_tol() try for mid-range first

Change-Id: Ifa9a0ed287cbd0cdb9cd217e5b9952c8154b36eb
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoOMAPDSS: DSSCOMP: Avoid DSSCOMP compilation by default.
Dandawate Saket [Wed, 17 Jul 2013 23:10:29 +0000 (16:10 -0700)]
OMAPDSS: DSSCOMP: Avoid DSSCOMP compilation by default.

Compile DSSCOMP only when TILER and ION both components are
included in def config.

Change-Id: I221264a80f2426cc52d45902a83fcd6e9a001fce
Signed-off-by: Dandawate Saket <dsaket@ti.com>
7 years agoregulator: core: Make set_voltage_tol() try for mid-range first
Mark Brown [Thu, 4 Jul 2013 16:27:14 +0000 (17:27 +0100)]
regulator: core: Make set_voltage_tol() try for mid-range first

The expected semantic for something expressed as a tolerance is that it
should deliver the specified value with some deviation allowed but this
is not what set_voltage_tol() currently does. Instead it just passes
the maximum possible range to set_voltage() which will typically result
in a voltage aimed at lower than the target voltage.

Instead first try to set a voltage between the target voltage and the
upper limit, then fall back on the full range. This will be much more
robust against physical variation in systems and makes the API behave
more like users would expect.

Signed-off-by: Mark Brown <broonie@linaro.org>
[cherry-pick from
https://git.kernel.org/cgit/linux/kernel/git/broonie/regulator.git/commit/?h=topic/core&id=dc9ceed6a12aff627c81e01ada191e8a23fcbe3e
]
Change-Id: I52e88a886e4277e5f7d9f97192931290b9775eab
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoOMAPDSS: OMAPFB: Fix OMAPFB compilation break
Dandawate Saket [Wed, 17 Jul 2013 23:08:50 +0000 (16:08 -0700)]
OMAPDSS: OMAPFB: Fix OMAPFB compilation break

Fix OMAPFB compilation break because the Fb support
functions were not compiled.

Change-Id: If73ed83af6b7dc94859ef0ca8aead46bc06ea424
Signed-off-by: Dandawate Saket <dsaket@ti.com>
7 years agoandroid: defconfig: OMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for...
Praneeth Bajjuri [Thu, 18 Jul 2013 00:05:39 +0000 (19:05 -0500)]
android: defconfig: OMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for multidisplay feature

Enabling dual FB configuration for multidisplay feature

updating CMDLINE for omapfb accordingly

Change-Id: I1d503cd8dfd955a3eb60871ca03eec2dc1a52560
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoandroid: defconfig: usb: Enable all usb drivers as built in.
Ruchika Kharwar [Wed, 10 Jul 2013 04:01:01 +0000 (23:01 -0500)]
android: defconfig: usb: Enable all usb drivers as built in.

DWC3, XHCI, PHY and OMAP_CONTROL are all set to be built-in vs modules.

Change-Id: I5e2c3dd4a10f7bda0a981eb44465c594d2bc2002
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Wed, 17 Jul 2013 22:54:50 +0000 (17:54 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  omap5: device tree: usb: Specify optional clock names in dt
  usb: phy: protect against NULL phy pointers
  usb: dwc3: core: make USB3 PHY optional
  usb: dwc3: adapt to use dr_mode device tree helper
  usb: dwc3: make maximum-speed a per-instance attribute
  usb: common: introduce of_usb_get_maximum_speed()
  usb: add devicetree helpers for determining dr_mode and phy_type
  dra7xx : usb3_phy: Updated dpll M,N values.
  ARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption

Change-Id: I94360aac84a025cf25ef7220c16110e146918029
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
7 years agoomap5: device tree: usb: Specify optional clock names in dt
Ruchika Kharwar [Wed, 10 Jul 2013 04:01:01 +0000 (23:01 -0500)]
omap5: device tree: usb: Specify optional clock names in dt

Specify the optional clock names in the device tree.
This is required for scalablity.

Change-Id: Id80d0c0c92d1bb676f1fc713a20f668e3b0ee161
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
7 years agousb: phy: protect against NULL phy pointers
Felipe Balbi [Sat, 6 Jul 2013 13:01:17 +0000 (08:01 -0500)]
usb: phy: protect against NULL phy pointers

In order to decrease the amount of work done
by PHY users, allow NULL phy pointers to be
passed.
[Backport from 3.10 patch http://www.spinics.net/lists/linux-usb/msg88622.html
- Ignored what could not be applied for 3.8
]
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
Change-Id: Ic921172d92214a4d0f8c840b6869beb7d320ff4a

7 years agousb: dwc3: core: make USB3 PHY optional
Felipe Balbi [Wed, 10 Jul 2013 19:00:34 +0000 (14:00 -0500)]
usb: dwc3: core: make USB3 PHY optional

If we want a port to work at any speed lower than Superspeed, it makes no
sense to even initialize/power up the USB3 transceiver, provided it won't
be used. We can use the oportunity to save some power and leave the
superspeed transceiver powered off. There is at least one such case which
is Texas Instruments' AM437x which has one of its USB3 ports without a matching
USB3 PHY (that port is hardwired to work on USB2 only).

http://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/
?h=testing&id=d7e39d414310e098540605be2051d5187797be34

Change-Id: I61639c4d58aac671a5aade67814981dc6d20f2e6
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>