]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/log
android-sdk/kernel-video.git
10 years agodefconfig: Enable atmel_mxt_ts touch driver for dra7-evm android-3.8-6AJ.1.1-RC0
Sundar Raman [Wed, 7 Aug 2013 19:25:24 +0000 (14:25 -0500)]
defconfig: Enable atmel_mxt_ts touch driver for dra7-evm

Enable Atmel MXT244 touch screen driver for dra7-evm

Change-Id: I8f6d4a99dcb1e45647a5324af17e223275a1cee7
Signed-off-by: Sundar Raman <a0393242@ti.com>
10 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Fri, 9 Aug 2013 22:10:25 +0000 (17:10 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  HACK: ARM: DRA7XX: ETH: Use n_latch in pcf8575 to drive P10 for ETH0
  arm/dts: dra7xx: Enable CPSW and MDIO for dra7xx EVM
  arm/dts: dra7xx: Add CPSW and MDIO module nodes for dra7xx
  arm: dra7xx: Add hwmod data for MDIO and CPSW
  drivers: net: cpsw: Add support for new CPSW IP version
  ARM: dts: dra7: Enable OPP_OD 1.5Ghz
  defconfig: omap2plus: input: Enable atmel_mxt_ts touch driver
  ARM: dts: dra7-evm: Add DT entry for Atmel MXT244 touch driver
  Input: atmel_mxt_ts: Add device tree support
  Input: atmel_mxt_ts: switch to using devm_kzalloc
  Input: atmel_mxt_ts: switch to using devm_request_threaded_irq
  usb: dwc3: host: Change platform device ID for xhci-hcd to AUTO
  usb: host: xhci: Enable XHCI_SPURIOUS_SUCCESS for all controllers with xhci 1.0

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

Change-Id: Id160cefc6e5baf70166415b7143d5cbbf43be064
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
10 years agoHACK: ARM: DRA7XX: ETH: Use n_latch in pcf8575 to drive P10 for ETH0
Praveen Rao [Thu, 8 Aug 2013 18:47:43 +0000 (14:47 -0400)]
HACK: ARM: DRA7XX: ETH: Use n_latch in pcf8575 to drive P10 for ETH0

Use n_latch to hack the pcf8575 driver to "drive P10" to not hold ETH0
in reset.

Description: nETH_RST is a pin that controls the phy reset -> this was
the core of the issue -> we have pcf8575 GPIO expander on i2c1 whose
P10(ETH0) and P11(ETH1) hold or release the ETH from reset. On the very
first write by Display Panel driver (which rightly control's it's own
GPIO expander pin P15), all other pins are written as 0 -> since this is
the first write(by panel), this is precisely when pcf8575 starts to
drive the signal -> at this point the default pulls are overridden by
pcf8575's pulls. As ETH driver does not drive it's pin, the ETH0_RST is
driven low, holding Ethernet in reset.

Nishanth Menon helped in isolatng this issue.

REVISIT: This is a ethernet driver bug and has to be fixed properly post
release.

Change-Id: I45ddb1202761f052f8a8a04faf14b841da5af2ec
Signed-off-by: Praveen Rao <prao@ti.com>
10 years agoarm/dts: dra7xx: Enable CPSW and MDIO for dra7xx EVM
Praveen Rao [Thu, 8 Aug 2013 18:37:35 +0000 (14:37 -0400)]
arm/dts: dra7xx: Enable CPSW and MDIO for dra7xx EVM

Adding CPSW phy-id, CPSW and MDIO pinmux configuration for active
and sleep states and enable them in board evm dts file.

Change-Id: I5524a2d4c2713388ba59da75fa6e90b27c100fc1
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
[Resolved merge conflict and rebased on 3.8 kernel.
This patch is based on
http://git.ti.com/cgit/cgit.cgi/~mugunthanvnm/ti-linux-kernel/mugunth-connectivity-linux-feature-tree.git/commit/?h=dra7-3.11-rc3-cpsw&id=8da845bd7fbab68b4899d5a6477e70a34748f6c6
]
Update the pinmux configuration for CPSW and MDIO by removing the
macro definitons to match the 3.8 implementation.
Signed-off-by: Praveen Rao <prao@ti.com>
10 years agoarm/dts: dra7xx: Add CPSW and MDIO module nodes for dra7xx
Mugunthan V N [Tue, 9 Jul 2013 14:49:45 +0000 (20:19 +0530)]
arm/dts: dra7xx: Add CPSW and MDIO module nodes for dra7xx

Add CPSW and MDIO related device tree data for DRA7XX and made as status
disabled. Phy-id, pinmux for active and sleep state needs to be added in
board dts files and enable the CPSW device.

Change-Id: Ia8c6f8ec8eff0d66e0d05f4a6e1ce174a725b2fd
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
[Resolved merge conflict and rebased to 3.8 kernel]
Updated the CPSW and MDIO related device tree data with correct device
address offset and also to remove marco defines which caused compilation error
seen as below:
Error: arch/arm/boot/dts/dra7.dtsi:701.22-23 syntax error
FATAL ERROR: Unable to parse input tree
Signed-off-by: Praveen Rao <prao@ti.com>
10 years agoarm: dra7xx: Add hwmod data for MDIO and CPSW
Mugunthan V N [Tue, 9 Jul 2013 14:49:42 +0000 (20:19 +0530)]
arm: dra7xx: Add hwmod data for MDIO and CPSW

Adding hwmod data for CPSW and MDIO which is present in DRA7xx SoC

Change-Id: I9652c4956025335b3cdf3831bbd87ce104a80f65
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Update the hwmod data for CPSW and MDIO to added addr space and irq
info hwmod data.
Signed-off-by: Praveen Rao <prao@ti.com>
10 years agodrivers: net: cpsw: Add support for new CPSW IP version
Mugunthan V N [Tue, 9 Jul 2013 14:49:41 +0000 (20:19 +0530)]
drivers: net: cpsw: Add support for new CPSW IP version

The new IP version has a minor changes and the offsets are same as the
previous version, so adding new IP version support in the driver.

Change-Id: I19274d09b25be8acc3db3cdd74346aa79989f46a
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
[Added change-id for gerrit]
Signed-off-by: Praveen Rao <prao@ti.com>
10 years agoARM: dts: dra7: Enable OPP_OD 1.5Ghz
Praneeth Bajjuri [Fri, 9 Aug 2013 21:47:54 +0000 (16:47 -0500)]
ARM: dts: dra7: Enable OPP_OD 1.5Ghz

OPP_OD Can be enabled on trimmed and poly fixed DRA7xx samples.

to identify poly-fixed trim samples:
[dieID: 0x4AE0C20C], [FT_Rev bits 15:8] >= 5.

This enables 1.5 Ghz for dra7xxx mpu.

Change-Id: If92bff1889de54cf51bedde3ebe8f1c9b17a7657
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
10 years agodefconfig: omap2plus: input: Enable atmel_mxt_ts touch driver
Praneeth Bajjuri [Fri, 9 Aug 2013 21:35:49 +0000 (16:35 -0500)]
defconfig: omap2plus: input: Enable atmel_mxt_ts touch driver

Enable Atmel MXT244 touch screen driver for dra7-evm

Change-Id: I8332c0cd677fdfd0c83e5f9c7ebf6275a9db49c2
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
10 years agoARM: dts: dra7-evm: Add DT entry for Atmel MXT244 touch driver
Sundar Raman [Wed, 7 Aug 2013 19:10:53 +0000 (14:10 -0500)]
ARM: dts: dra7-evm: Add DT entry for Atmel MXT244 touch driver

This patch adds DT entry for atmel MXT244 touch driver (atmel_mxt_ts).
The device is on i2c1 and with address 0x4a. Platform configuration data
and interrupts data is added inside dra7-evm.dts file. Pinctrl for
Wakeup2 irq pin, which is used for touchscreen interrupt, has also been
updated

Change-Id: Icfb2f9e9655febaa40e6f6b3b7334462eb8e056a
Signed-off-by: Sundar Raman <a0393242@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
10 years agoInput: atmel_mxt_ts: Add device tree support
Sundar Raman [Wed, 7 Aug 2013 18:57:48 +0000 (13:57 -0500)]
Input: atmel_mxt_ts: Add device tree support

Add device tree support for Atmel touch driver. All platform
specific data is now read from dts files and parsed inside the
driver.

NOTE: Provision for supplying config data for controller is
given from board specific dts file since the driver no longer
configures these values for different firmware revisions,
after this commit: 71749f5c66e797a39600dae9de58aab3858dc488

Change-Id: Ic88bc62246e2465d527410e6fef78b301d681628
Signed-off-by: Sundar Raman <sunds@ti.com>
Acked-by: Nishanth Menon <nm@ti.com>
10 years agoInput: atmel_mxt_ts: switch to using devm_kzalloc
Nishanth Menon [Thu, 8 Aug 2013 19:48:49 +0000 (14:48 -0500)]
Input: atmel_mxt_ts: switch to using devm_kzalloc

Using managed allocation helps us simplify our probe and cleanup.

Change-Id: I239ddefb4a07c92c902f5460e6da7f0663a877c2
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
10 years agoInput: atmel_mxt_ts: switch to using devm_request_threaded_irq
Nishanth Menon [Thu, 8 Aug 2013 19:44:19 +0000 (14:44 -0500)]
Input: atmel_mxt_ts: switch to using devm_request_threaded_irq

Using managed request irq helps us simplify our probe and cleanup
a lot.

Change-Id: Ibe5a5b76b072e56414699798ea63ed8dd7f45c89
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
10 years agousb: dwc3: host: Change platform device ID for xhci-hcd to AUTO
Vivek Gautam [Fri, 25 Jan 2013 11:22:02 +0000 (16:52 +0530)]
usb: dwc3: host: Change platform device ID for xhci-hcd to AUTO

Multiple dwc3 controllers will try to allocate multiple xhci-hcd
interfaces.
Changing platform device IDs from NONE to AUTO to support
such cases.

upstream-status:: https//git.kernel.org/cgit/linux/kernel/git/torvalds/
linux.git/commit/?id=52758bcb7c12bede2a81849dee13f1edcd44e1c1

Change-Id: Iaaf38e258c28ead10cff51b993f378a6fc3f5679
Signed-off-by: Vivek Gautam <gautam.vivek@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Ravi Babu <ravibabu@ti.com>
10 years agoMerge branch 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video...
Praneeth Bajjuri [Fri, 9 Aug 2013 06:15:11 +0000 (01:15 -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: dts: dra7-evm: Add MCASP8 pins to select HDMI/I2c2
  OMAPDSS: HDMI: Change HDMI selection pin to MCASP8_AXR2
  HACK: OMAPDSS: HDMI: set DSS_CLKSTCTRL in SW_WKUP to enable edid read
  OMAPDSS: HDMI: Add support for edid read through DDC and I2C2
  OMAPDSS: DISPC: remove revision check on arbitration
  OMAPDSS: DISPC: Add support for global MFLAG feature
  OMAPDSS: DISPC : Enable GFX pipeline arbitration
  OMAPDSS: HDMI: Add sysfs entries for hdmi_timings and edid
  OMAPDSS: HDMI: Enable HPD switch implementation
  OMAPDSS: HDMI: Add support for HDMI HPD

Change-Id: Iae2d487e96ea014afd1023991f0c9bbb7add3212
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
10 years agousb: host: xhci: Enable XHCI_SPURIOUS_SUCCESS for all controllers with xhci 1.0
George Cherian [Wed, 31 Jul 2013 08:59:19 +0000 (14:29 +0530)]
usb: host: xhci: Enable XHCI_SPURIOUS_SUCCESS for all controllers with xhci 1.0

Xhci controllers with hci_version > 0.96 gives spurious success events on short packet completion.
During webcam capture the "ERROR Transfer event TRB DMA ptr not part of current TD" was observed.
The same application works fine with synopsis controllers hci_version 0.96.
The same Issue is seen with Intel Pantherpoint xhci controller. So enabling this quirk in xhci_gen_setup if
controller verion is greater than 0.96.
For xhci-pci move the quirk to much generic place xhci_gen_setup.

Note from Sarah:
The xHCI 1.0 spec changed how hardware handles short packets.  The HW
will notify SW of the TRB where the short packet occurred, and it will
also give a successful status for the last TRB in a TD (the one with the
IOC flag set).  On the second successful status, that warning will be
triggered in the driver.

Software is now supposed to not assume the TD is not completed until it
gets that last successful status.  That means we have a slight race
condition, although it should have little practical impact.  This patch
papers over that issue.

It's on my long-term to-do list to fix this race condition, but it is a
much more involved patch that will probably be too big for stable.  This
patch is needed for stable to avoid serious log spam.

This patch should be backported to kernels as old as 3.0, that
contain the commit ad808333d8201d53075a11bc8dd83b81f3d68f0b "Intel xhci:
Ignore spurious successful event."

The patch will have to be modified for kernels older than 3.2, since
that kernel added the xhci_gen_setup function for xhci platform devices.
The correct conflict resolution for kernels older than 3.2 is to set
XHCI_SPURIOUS_SUCCESS in xhci_pci_quirks for all xHCI 1.0 hosts.

upstream-status: http://marc.info/?l=linux-usb&m=137265657724242&w=2

Change-Id: I4f5b93a6031118facd971985e40c77280e53ffe3
Signed-off-by: George Cherian <george.cherian@ti.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
[backported to 3.8]
Signed-off-by: Ravi Babu <ravibabu@ti.com>
10 years agoMerge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Thu, 8 Aug 2013 23:21:36 +0000 (18:21 -0500)]
Merge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y

* origin/p-ti-linux-3.8.y:
  ASoC: davinci-mcasp: Mute transmit data during stop

Change-Id: Ifb9e43cc3e2747a409e3e5e3b94ebb49d7cee47e
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
10 years agoARM: dts: dra7-evm: Add MCASP8 pins to select HDMI/I2c2
srinivas pulukuru [Wed, 7 Aug 2013 00:25:34 +0000 (19:25 -0500)]
ARM: dts: dra7-evm: Add MCASP8 pins to select HDMI/I2c2

Add MCASP8 pins to control selection between HDMI and I2C2

Change-Id: I9a1cf062cbc19012c80c26df2a356f87e25c7551
Signed-off-by: Srinivas pulukuru <srinivas.pulukuru@ti.com>
10 years agoMerge branch 'hdmi' into p-ti-android-3.8.y-video
srinivas pulukuru [Thu, 8 Aug 2013 20:37:28 +0000 (15:37 -0500)]
Merge branch 'hdmi' into p-ti-android-3.8.y-video

* hdmi:
  OMAPDSS: HDMI: Change HDMI selection pin to MCASP8_AXR2
  HACK: OMAPDSS: HDMI: set DSS_CLKSTCTRL in SW_WKUP to enable edid read
  OMAPDSS: HDMI: Add support for edid read through DDC and I2C2
  OMAPDSS: HDMI: Add sysfs entries for hdmi_timings and edid
  OMAPDSS: HDMI: Enable HPD switch implementation
  OMAPDSS: HDMI: Add support for HDMI HPD

10 years agoMerge branch 'dss' into p-ti-android-3.8.y-video
srinivas pulukuru [Thu, 8 Aug 2013 20:37:21 +0000 (15:37 -0500)]
Merge branch 'dss' into p-ti-android-3.8.y-video

* dss:
  OMAPDSS: DISPC: remove revision check on arbitration
  OMAPDSS: DISPC: Add support for global MFLAG feature
  OMAPDSS: DISPC : Enable GFX pipeline arbitration

10 years agoOMAPDSS: HDMI: Change HDMI selection pin to MCASP8_AXR2
srinivas pulukuru [Thu, 8 Aug 2013 11:38:17 +0000 (06:38 -0500)]
OMAPDSS: HDMI: Change HDMI selection pin to MCASP8_AXR2

Change the SEL_HDMI_I2C2 mux selector pin from MCASP2_ACLKR to MCASP8_AXR2
Switching to MCASP8 to avoid configuring the current McASP2 PFUNC/PDIR
registers from both ARM and DSP.

Change-Id: I40eb5c2e59de6c610999a5cd10ea9a989ae2ba3b
Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com>
10 years agoHACK: OMAPDSS: HDMI: set DSS_CLKSTCTRL in SW_WKUP to enable edid read
srinivas pulukuru [Fri, 26 Jul 2013 05:06:39 +0000 (00:06 -0500)]
HACK: OMAPDSS: HDMI: set DSS_CLKSTCTRL in SW_WKUP to enable edid read

Edid read fails when DSS Clock domain is in HW_AUTO. Set it to SW_WKUP
to enable DSS_L3_GICLK all the time when reading EDID.
Revert back to HW_AUTO when done with reading.

Change-Id: I48b357ab6b537886de2c522a171f9aaa3245daf3
Signed-off-by: srinivas pulukuru <srinivas.pulukuru@ti.com>
10 years agoOMAPDSS: HDMI: Add support for edid read through DDC and I2C2
srinivas pulukuru [Wed, 17 Jul 2013 19:25:08 +0000 (14:25 -0500)]
OMAPDSS: HDMI: Add support for edid read through DDC and I2C2

Added a config option to swtich edid read between DDC and I2C2.
Set muxmode for for DDC or I2C2 based on the config option.

Change-Id: If029ce1ea05fd787f106ea13db0bd40d2f7dc2a5
Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com>
Signed-off-by: archit taneja <archit@ti.com>
10 years agoOMAPDSS: DISPC: remove revision check on arbitration
Sergiy Kibrik [Wed, 31 Jul 2013 19:45:47 +0000 (14:45 -0500)]
OMAPDSS: DISPC: remove revision check on arbitration

Move code that turns arbitration on to be logically close
to MFLAG setting and dispose of OMAP5 revisions checks,
   as all OMAP5 revisions have MFLAG support, so prioritizing
   their GFX planes is redundant.

Change-Id: Ief0b203bc8966a5d810b71a94a76395758950024
Signed-off-by: Sergiy Kibrik <sergiy.kibrik@globallogic.com>
Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com>
10 years agoOMAPDSS: DISPC: Add support for global MFLAG feature
Sreenidhi Koti [Wed, 31 Jul 2013 19:16:48 +0000 (14:16 -0500)]
OMAPDSS: DISPC: Add support for global MFLAG feature

Description: DSS generates real time and non real time traffic (read and write).
Real time traffic can not be stalled. FIFO overflow/underflow can occur in case
of real time traffic. MFLAG mechanisum can dynamically increase the priority of
DISPC real time traffic when required based on the fullness of the DISPC
DMA buffers (read and write buffers).

Programmable buffer thresholds are used to indicate when MFLAG shall be generated.
MFLAG is provided to L3 and used to grant OCP requests. It is implemented for all
DMA buffers (gfx, video1, video2, video3 and write-back).

Set mflag start signal at the beginning of each frame

Change-Id: I89e5ec9eff1ee533da44de429a0a4f670f1f8ef2
Signed-off-by: Sreenidhi Koti <sreenidhi@ti.com>
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com>
10 years agoOMAPDSS: DISPC : Enable GFX pipeline arbitration
Dandawate Saket [Wed, 31 Jul 2013 17:42:44 +0000 (12:42 -0500)]
OMAPDSS: DISPC : Enable GFX pipeline arbitration

Issue:
Framebuffer width selected as 1080p or higher on OMAP5
is causing underflows when pushed on to 1080@60fps HD
TV.

GFX pipeline is always presented with largest ARGB 32 bit
buffers vs other pipes. Also we see issue more often when
SGX is used to do composition instead of overlays. In this
case GFX BW requirement to fetch scale and compose is higher
for each composition than via DSS. This is because DSS does
these on the fly in its pipelines saving BW.

Fix
Enable GFX pipeline arbitration to avoid underflows
seen due to high BW requirements.

Current fix is applicable for omap5xxx.

Change-Id: I88602159625fe412cf4ee1c47aa454a8c8648a71
Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
10 years agoOMAPDSS: HDMI: Add sysfs entries for hdmi_timings and edid
srinivas pulukuru [Thu, 8 Aug 2013 11:30:34 +0000 (06:30 -0500)]
OMAPDSS: HDMI: Add sysfs entries for hdmi_timings and edid

Add hdmi_timings and edid sysfs entries.

Change-Id: Iaacb005410fb1dff35bbf1f6ecc2c4702c948606
Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com>
10 years agoOMAPDSS: HDMI: Enable HPD switch implementation
srinivas pulukuru [Thu, 1 Aug 2013 21:50:54 +0000 (16:50 -0500)]
OMAPDSS: HDMI: Enable HPD switch implementation

Add switch implementation and propagate switch state on  HPD

Change-Id: Ia74c907a10d7958d0750dc879d687eb56ecd2ce3
Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com>
10 years agoOMAPDSS: HDMI: Add support for HDMI HPD
srinivas pulukuru [Thu, 8 Aug 2013 11:13:17 +0000 (06:13 -0500)]
OMAPDSS: HDMI: Add support for HDMI HPD

Add hpd support in hdmi_panel and remove from hdmi_ip file

Added a new file hdmi.h. Going forward this file will include
all the hdmi interface driver declarations/definitions

Change-Id: I40b3172585bc7141981edc785ae706393a0b82b8
Signed-off-by: Srinivas Pulukuru <srinivas.pulukuru@ti.com>
10 years agoASoC: davinci-mcasp: Mute transmit data during stop
Misael Lopez Cruz [Thu, 8 Aug 2013 06:23:07 +0000 (01:23 -0500)]
ASoC: davinci-mcasp: Mute transmit data during stop

Reset of the state machine, serializer and frame sync generator can
occur in the middle of a slot, making the transmit pin go to its
inactive state. It can cause discontinuities that may lead to glitches.
The discontinuities can be more abrupt for audio samples with negative
values.

Muting the transmit data by masking out all its bits can prevent this
problem. A delay is required to ensure at least one slot uses the new
bit mask, the worst case (longest slot) is for 8kHz, mono (125 us).

Change-Id: I812ac674d1c9a3905086a966e0ec4795374f333a
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
10 years agodefconfig: android: enable interactive governor as the default cpufreq governor
Ranganath Krishnan [Thu, 25 Jul 2013 15:48:37 +0000 (10:48 -0500)]
defconfig: android: enable interactive governor as the default cpufreq governor

Enable interactive governor as the default cpufreq governor.
ondemand governor option retained.

Change-Id: I9439d3f0ac9b638d0e1d2391125210a2f00234d8
Signed-off-by: Ranganath Krishnan <ranganath@ti.com>
10 years agocpufreq: interactive: select performance governor as it is the fallback option
Ranganath Krishnan [Mon, 5 Aug 2013 16:21:03 +0000 (11:21 -0500)]
cpufreq: interactive: select performance governor as it is the fallback option

Interactive governor will fail at the cpufreq driver load time if the driver
does not support fast enough frequency switching, and cpufreq governor will
fallback to the performance governor. This patch ensures to select performance
governor in Kconfig when interactive governor is the default cpufreq governor.

Change-Id: I282cb7c6d5069d0da366267d192a528c4d5f5c34
Signed-off-by: Ranganath Krishnan <ranganath@ti.com>
10 years agoMerge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Thu, 8 Aug 2013 05:49:27 +0000 (00:49 -0500)]
Merge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y

* origin/p-ti-linux-3.8.y:
  ARM: dts: dra7: Set cpufreq transition latency value

Change-Id: Ie5f6304f5132fb96452a0cb0872c7c193813b5ef
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
10 years agoARM: dts: dra7: Set cpufreq transition latency value
Ranganath Krishnan [Fri, 26 Jul 2013 00:24:29 +0000 (19:24 -0500)]
ARM: dts: dra7: Set cpufreq transition latency value

Without clock-latency initialization, default value of (2^32 -1)
is taken. Because of the too long transition latency, ondemand
governor fails and the cpufreq governor fallback to performance
governor.

With this change, ondemand governor can be enabled by default for DRA7.
clock-latency value referenced from  omap5 (TBD: to be instrumented and
use the actual value at later point of time)

Change-Id: I2fa2e53088ba7e7f8f8509a8005b81ee593b55a7
Signed-off-by: Ranganath Krishnan <ranganath@ti.com>
10 years agoRevert "Input: qt602240_ts: [TEMP] Add atmel MXT244 touch screen driver for Vayu...
Praneeth Bajjuri [Mon, 5 Aug 2013 23:01:04 +0000 (18:01 -0500)]
Revert "Input: qt602240_ts: [TEMP] Add atmel MXT244 touch screen driver for Vayu EVM"

This reverts commit 4cafaba33bc8b3024e0bf76e3ac63724c1f40601.

Reason:
        1) Fix has to come thru p-ti-linux-3.8.y
        2) Not yet underwent thru basic review cycle.

Change-Id: Ia86cd14aba584e8759782afc5aa255aeec5ff48e
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
10 years agoRevert "dra7x: dts: [TEMP] Add DT entry for Atmel MXT 244 touch screen"
Praneeth Bajjuri [Mon, 5 Aug 2013 22:59:18 +0000 (17:59 -0500)]
Revert "dra7x: dts: [TEMP] Add DT entry for Atmel MXT 244 touch screen"

This reverts commit 1e53fa74f4c3c38e57c4ac006b5de22931e2a60e.

Reason:
    1) Fix has to come thru p-ti-linux-3.8.y
    2) Not yet underwent thru basic review cycle.

Change-Id: I112be640f2374fd986c5f3ecabe7e5bc13b97c33
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
10 years agoRevert "defconfig: [TEMP] Enable Atmel MXT244 touchscreen for Vayu EVM"
Praneeth Bajjuri [Mon, 5 Aug 2013 22:52:33 +0000 (17:52 -0500)]
Revert "defconfig: [TEMP] Enable Atmel MXT244 touchscreen for Vayu EVM"

This reverts commit 1ef84e8996bf0dc8f8616d3a0503e2c3a9dca3e4.

Reason:
1) Equivalen Fix has to come thru p-ti-linux-3.8.y
for omap2plus_defconfig first.
2) Not yet underwent thru basic review cycle.

Change-Id: I0860637fc9fdda6e69c3556753f85b9d68d96ddd
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
10 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Vishal Mahaveer [Mon, 5 Aug 2013 20:59:34 +0000 (15:59 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  ARM: dts: dra7-evm: Primary card as always-on
  ASoC: DRA7: dra7-evm: Add support for always on
  ARM: dts: dra7-evm: Add tlv320aic3x capture settle time
  ASoC: tlv320aic3x: Add ADC settle time
  ASoC: tlv320aic3x: Add output driver pop reduction controls
  ASoC: tlv320aic3x: Connect Line1R-LADC and Line1L-RADC
  ARM: dts: dra7: Add McASP interrupts
  ASoC: DRA7: dra7-evm: Remove crossbar hacks

10 years agoARM: dts: dra7-evm: Primary card as always-on
Misael Lopez Cruz [Tue, 9 Jul 2013 06:43:20 +0000 (01:43 -0500)]
ARM: dts: dra7-evm: Primary card as always-on

Power resources are not a concern in dra7-evm context so keeping primary
card as always-on to reduce audio artifacts.

Change-Id: I1ba906d8716922e63a8622acefbc2cea498875b6
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
10 years agoASoC: DRA7: dra7-evm: Add support for always on
Misael Lopez Cruz [Tue, 30 Jul 2013 20:27:03 +0000 (15:27 -0500)]
ASoC: DRA7: dra7-evm: Add support for always on

There are environments where power resources are not a concern, but having
the best quality in terms of artifacts is more important. For those scenarios,
allow keeping the analog codecs always on, set via DT. This is achieved by
simply using a very high pmdown_time value.

Change-Id: I91bda710096427a9d5ec4c998eea40efb87ff123
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
10 years agoARM: dts: dra7-evm: Add tlv320aic3x capture settle time
Misael Lopez Cruz [Wed, 24 Jul 2013 21:28:24 +0000 (16:28 -0500)]
ARM: dts: dra7-evm: Add tlv320aic3x capture settle time

Add a capture settle time to reduce the pop noise in capture path of DRA7EVM,
the pop noise lasts around 30-40ms.

Change-Id: Idde7aec70e95354f25544aad3429050630259cc0
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
10 years agoASoC: tlv320aic3x: Add ADC settle time
Misael Lopez Cruz [Wed, 24 Jul 2013 21:00:44 +0000 (16:00 -0500)]
ASoC: tlv320aic3x: Add ADC settle time

There are artifacts during capture route start (e.g. caused by bias or even
ADC power-on itsef) that cannot be removed through DAPM or with CODEC's
facilities. A settle time is added to account for these artifacts.

--
similar to:
commit: 07ca81d43d5c7ed7be2e164e0f85631c1938be30
Author: Gabriel M. Beddingfield <gabrbedd@ti.com>
ASoC: twl6040: Let amics settle after biasing
--

Change-Id: Iba12c014b8e088d2a4346a1cf34884be40959ac9
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
10 years agoASoC: tlv320aic3x: Add output driver pop reduction controls
Misael Lopez Cruz [Mon, 8 Jul 2013 08:52:30 +0000 (03:52 -0500)]
ASoC: tlv320aic3x: Add output driver pop reduction controls

Output driver has two parameters that can be configured to reduce
pop noise: power-on delay and ramp-up step time. Two new kcontrols
have been added to set these parameters.

Change-Id: Icb9963ce046adb81bf31997a037c404178e18f71
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
10 years agoASoC: tlv320aic3x: Connect Line1R-LADC and Line1L-RADC
Misael Lopez Cruz [Fri, 26 Jul 2013 00:10:08 +0000 (19:10 -0500)]
ASoC: tlv320aic3x: Connect Line1R-LADC and Line1L-RADC

'Left Line1R Mux' and 'Right Line1L Mux' were not connected in the audio
map of the CODEC, hence changing the kcontrols associated with them had
no effect.

Change-Id: I6060e6415e742e9145c2c17fe7e4d7b3fe7c1c1a
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
10 years agodefconfig: [TEMP] Enable Atmel MXT244 touchscreen for Vayu EVM
Sundar Raman [Mon, 5 Aug 2013 15:39:16 +0000 (10:39 -0500)]
defconfig: [TEMP] Enable Atmel MXT244 touchscreen for Vayu EVM

Enable the button touch based Atmel MXT244 touchscreen driver
for Vayu EVM.

Change-Id: Ie04ad90feab83c98e0be9fd5e1e8a2b6a9824d71
Signed-off-by: Sundar Raman <a0393242@ti.com>
10 years agodra7x: dts: [TEMP] Add DT entry for Atmel MXT 244 touch screen
Sundar Raman [Mon, 5 Aug 2013 15:37:32 +0000 (10:37 -0500)]
dra7x: dts: [TEMP] Add DT entry for Atmel MXT 244 touch screen

This is the DT entry for invoking the atmel mxt 244 driver
during bootup, and corresponding configurations like mux etc.

Change-Id: Ie3d1e99ee2c7a98a3202cb6bedc767eeea8371d4
Signed-off-by: Sundar Raman <a0393242@ti.com>
10 years agoInput: qt602240_ts: [TEMP] Add atmel MXT244 touch screen driver for Vayu EVM
Sundar Raman [Mon, 5 Aug 2013 15:32:20 +0000 (10:32 -0500)]
Input: qt602240_ts: [TEMP] Add atmel MXT244 touch screen driver for Vayu EVM

Adding back the old driver for Atmel touch screen as the upstream
driver atmel_mxt_ts is not functioning on Vayu EVM even with appropriate
platform data and driver init values being passed.

This driver is button touch based.

Change-Id: Ibbe2f7ce13e53b12e8f5e48a8e6d32a4fc5df4fb
Signed-off-by: Sundar Raman <a0393242@ti.com>
10 years agoARM: dts: dra7: Add McASP interrupts
Misael Lopez Cruz [Fri, 2 Aug 2013 17:06:54 +0000 (12:06 -0500)]
ARM: dts: dra7: Add McASP interrupts

Add interrupts information to McASP3 and McASP6 nodes. These IRQ numbers
also need configured in the IRQ crossbar.

Change-Id: Ic4f1409e9f54a4705ef45f727dfed5b2757ed96b
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
10 years agoASoC: DRA7: dra7-evm: Remove crossbar hacks
Misael Lopez Cruz [Fri, 2 Aug 2013 16:45:25 +0000 (11:45 -0500)]
ASoC: DRA7: dra7-evm: Remove crossbar hacks

Partially remove DMA crossbar hack done by "ASoC: DRA7: dra7-evm: HACK: Set
McASP DMA reqs in sDMA crossbar". The sDMA reqs in DRA7xx hwmod are kept.

Change-Id: I99ffe54e83a09b3003df5b07c5621565a1d9aed4
Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
10 years agoMerge branch 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video...
Vishal Mahaveer [Tue, 30 Jul 2013 14:23:47 +0000 (09:23 -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:
  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

Change-Id: I0985cd0eb7bb96cd5a9fbd20964ef24a8ee816d6
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>
10 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>