aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ASoC: OMAP: HDMI: Defer audio transfer startAxel Castaneda Gonzalez2012-02-204-14/+45
| | | | | | | | | | | Defer audio transfer after HDMI AUDIO wrapper is enabled. If audio transmit was started along with audio wrapper enabling, spurious data (zeros) was sent at the beginning of the transfer as part of the of audio sample packets, due an AUDIO FIFO UNDERFLOW, which was shifting audio channels. Change-Id: I48d8c02c0467dd3158ac748eb0720173d3b209ca Signed-off-by: Axel Castaneda Gonzalez <x0055901@ti.com>
* OMAP4: HDMI: Update 6 channel configurationAxel Castaneda Gonzalez2012-02-201-2/+10
| | | | | | | | | | | For 6 channel, set info frame with channel count = 7 (8-1) and CA = 0x13 in order to ensure that sample_present bits configuration matches the number of channels (2 channels are padded with zeroes) that are sent to sink device, in order to fullfil multichannel compliance test. Change-Id: I5f149ec679e4a808ed0dbcf845de746e3a113c68 Signed-off-by: Axel Castaneda Gonzalez <x0055901@ti.com>
* ASoC: OMAP: HDMI: Use generated audio MCLK for OMAP4430 ES 2.3Axel Castaneda Gonzalez2012-02-201-1/+5
| | | | | | | | | For OMAP4430 ES2.3, use pseudo generated clock (MCLK- based on TMDS clock) to form Audio Clock Regeneration (ACR) packets. MCLK is also used for OMAP4460 and later chip versions. Change-Id: I65f255cb7eac39bbbb52b2f0105f6721f0f08df7 Signed-off-by: Axel Castaneda Gonzalez <x0055901@ti.com>
* OMAPDSS:tc358765: Remove tc358765_board_dataSergiy Kibrik2012-02-171-13/+23
| | | | | | | | | Replace driver configuration via struct tc358765_board_data with generic struct omap_dss_device, as all required parameters are already there. Change-Id: I1529cc60e1f47d0aa15513a0cbfef754214144de Signed-off-by: Sergiy Kibrik <sergiy.kibrik@globallogic.com>
* OMAPDSS:tc358765: make timings configurable via board filesSergiy Kibrik2012-02-172-78/+57
| | | | | | | | Avoid using tc358765_bard_data structure, as all required attributes already in struct omap_dss_device. Change-Id: I6fbe5cc8d3df8d79e1a9f06e288c19e96c00f47f Signed-off-by: Sergiy Kibrik <sergiy.kibrik@globallogic.com>
* OMAP4460: TWL: disable PD on VCORE1 shutdownDan Murphy2012-02-171-0/+8
| | | | | | | | | | | | | | When the PREQ goes low, both VCORE1(VDD_CORE) and VDDD_MPU start transitioning to 0 volt but VCORE1 discharge is faster than VDD_MPU discharge. This causes reliability concern from OMAP's perspective. So, we disable pulldown on VCORE1 to slow down VDD_CORE discharge to make it comparable to VDD_MPU. The Pulldown does not impact DVFS transition, and actual OFF timing is not changed as well. Change-Id: I707bb4c4ae50b3452304180e6b42db6b2bfdedd9 Signed-off-by: Nishanth Menon <nm@ti.com>
* Re-Merge branch 'android-omap-3.0' into p-android-omap-3.0Dan Murphy2012-02-174-10/+51
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-omap2/Kconfig arch/arm/mach-omap2/omap_twl.c drivers/mmc/host/omap_hsmmc.c drivers/usb/gadget/android.c drivers/video/hdmi_ti_4xxx_ip.c drivers/video/omap2/dss/hdmi.c fs/proc/base.c include/video/hdmi_ti_4xxx_ip.h sound/soc/codecs/twl6040.c sound/soc/omap/sdp4430.c Signed-off-by: Dan Murphy <dmurphy@ti.com>
| * Merge branch 'linux-omap-3.0' into android-omap-3.0Dmitry Shmidt2012-02-069-168/+156
| |\
| | * ASoC: omap-mcasp: Relax S/PDIF clocks/frame constraintMisael Lopez Cruz2012-02-011-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first step in the current McASP clock dividers calculation is very strict with respect to the McASP FCLK being an integer multiple of 128 (number of clocks required for each S/PDIF frame). The clock divider calculation algorithm doesn't search for exact matches, but for dividers which can produce clock drift within an allowed PPM range. For this reason, rejecting McASP FCLK rates not divisible by 128, reduces the space of rates the algorithm can work on. By simply including the clocks per frame value in divider calculation we give more flexibility to the algorithm. Change-Id: Ic007f9fa9e776c2e5475a36b5444e2ec39c8b0bb Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| | * ASoC: twl6040: Configure PLL during hw_paramsMisael Lopez Cruz2012-02-011-27/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Configure TWL6040 PLL during hw_params() operation since at that point the final PLL settings are known. Current PLL configuration done at DAI sysclk handler is redundant and hence removed. Change-Id: If72b6ac2145dad7f3756e19390181642021b5838 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| | * ASoC: core: Remove DAI link pre/post opsMisael Lopez Cruz2012-02-012-19/+0
| | | | | | | | | | | | | | | | | | | | | | | | Due to DAI link startup promotion in ASoC PCM open sequence, remove DAI link pre/post ops sice they are now redundant. Change-Id: I21b6b4ab9a91b351e6078b69c18b66cae1bf9014 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| | * ASoC: SDP4430: Enable/disable TWL6040 in startup/shutdown opsMisael Lopez Cruz2012-02-011-34/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SDP4430 machine driver needs to pass current sysclk configuration before TWL6040 CODEC adds hw constraints, so sysclk needs to be configured during DAI link startup. Otherwise the constraint will take place till next stream is opened. TWL6040 enable/disable can be moved to startup/shutdown, respectively. DAI link pre/post operations are dropped as they become redundant. Change-Id: I06abed139cc403912c73a2bb76be2f24772558bd Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| | * ASoC: core: Promote DAI link startupMisael Lopez Cruz2012-02-011-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Promote DAI link startup to the beginning of SoC PCM open(), required to: - Prepare machine-level external environment (like clocks, power supplies) for CPU DAIs and CODECs - Some CODECs add hw constraints (e.g. snd_pcm_hw_constraint_list for twl6040, wm8523, wm8988, etc) during their startup handler which can be dependent on machine level settings (e.g. sysclk). Currently, those constraints are honored until next stream activity takes place as the DAI link startup occurs after CODEC's. Similarly, DAI link shutdown is now moved to the last position in SoC PCM close(). Change-Id: Iabf4256be528d1d7befa2e03bfda89a9cafe959a Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| | * ASoC: twl6040: Use single set of PLL idsMisael Lopez Cruz2012-02-013-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | Use a single set of TWL6040 PLL ids: TWL6040_LPPLL_ID and TWL6040_HPPLL_ID; redundant PLL definitions are removed. Change-Id: I9d396dafccc95054130a8f2fc691a84d2cabc759 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| | * ASoC: twl6040: Remove invalid LP constraintsMisael Lopez Cruz2012-02-011-42/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | TWL6040 codec supports all its features and paths when using the Low-Power PLL regardless of 44.1kHz or 48kHz configuration, so current software constraints are removed. Change-Id: I5aefe324dee35888f8bcc04fff0ea77d864b6ab4 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| | * ASoC: core: Query active DAI linksMisael Lopez Cruz2012-02-012-0/+20
| | | | | | | | | | | | | | | | | | | | | Query active DAI links (dynamic and legacy frontends) in a SoC card. Change-Id: Ieaef958833feb40499e0d67f3217f00a19ade87e Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| | * ASoC: DSP: Clear BE runtime in startup unwindMisael Lopez Cruz2012-02-011-0/+1
| | | | | | | | | | | | | | | | | | | | | Set BE's runtime to NULL when unwinding after startup errors. Change-Id: I7fb11dff3e623b79334345e563bb3f0da0c6823c Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
| | * serial: omap: disable serial port irq during suspendColin Cross2012-01-271-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the serial port interrupt is left enabled during suspend, it can fire during uart_resume_port, while the uart is in an undefined state and the port lock is not held. Disable the interrupt in serial_omap_suspend, and enable it in serial_omap_resume. This also requires moving the request_irq into probe, instead of startup, so that the irq is always available to disable. Change-Id: Iaa88fa527b056828303fe1fbad6883b720278440 Signed-off-by: Colin Cross <ccross@android.com>
| | * ARM: omap: sched_clock: Don't let sched_clock tick during suspendColin Cross2012-01-271-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The register used by sched_clock continues to count while in suspend. The timer that is used to prevent wraps, which normally fires after 90% of the register wrap time, does not count in suspend. This causes the timer to fire after the register has wrapped, which can cause sched_clock to wrap. Track an offset value that is updated in suspend and resume to cause the register read by sched_clock to appear not to count in suspend. This will cause the sched_clock time before and after suspend to be the same, but will prevent sched_clock wraps after 131072 seconds (36.4 hours). Change-Id: I37054a13232c3a4320a5a49fd99e8ab0c2d1c4fb Signed-off-by: Colin Cross <ccross@android.com>
| * | Merge branch 'android-3.0' into android-omap-3.0Dmitry Shmidt2012-02-06102-3825/+4901
| |\ \
| | * | Input: evdev - fix variable initialisationHeiko Stuebner2012-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 509f87c5f564 (evdev - do not block waiting for an event if fd is nonblock) created a code path were it was possible to use retval uninitialized. This could lead to the xorg evdev input driver getting corrupt data and refusing to work with log messages like AUO-Pixcir touchscreen: Read error: Success sg060_keys: Read error: Success AUO-Pixcir touchscreen: Read error: Success sg060_keys: Read error: Success (for drivers auo-pixcir-ts and gpio-keys). Signed-off-by: Heiko Stuebner <heiko@sntech.de>
| | * | Input: evdev - Add ioctl to block suspend while event queue is not empty.Arve Hjønnevåg2012-01-312-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an ioctl, EVIOCSSUSPENDBLOCK, to enable a wakelock that will block suspend while the event queue is not empty. This allows userspace code to process input events while the device appears to be asleep. The current code holds the wakelock for up 5 seconds for every input device and client. This can prevent suspend if sensor with a high data rate is active, even when that sensor is not capable of waking the device once it is suspended. Change-Id: I624d66ef30a0b3abb543685c343382b8419b42b9 Signed-off-by: Arve Hjønnevåg <arve@android.com>
| | * | Input: evdev - Don't hold wakelock when no data is available to user-spaceArve Hjønnevåg2012-01-311-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no SYN_REPORT event in the buffer the buffer data is invisible to user-space. The wakelock should not be held in this case. Change-Id: Idae890ff0da8eb46a2cfce61a95b3a97252551ad Signed-off-by: Arve Hjønnevåg <arve@android.com>
| | * | net: wireless: bcmdhd: Increase pm_notify callback priorityDmitry Shmidt2012-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make pm_notify callback to be called the first on suspend/resume path to ensure it will always be called. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | net: wireless: bcmdhd: Fix crash on dhdsdio_probe_attach() failureDmitry Shmidt2012-01-312-4/+21
| | | | | | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | net: wireless: bcmdhd: Daemonize wl_event_handlerDmitry Shmidt2012-01-313-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Daemonizing makes thread (besides other things) NON-FREEZABLE, and it will not get fake signal on suspend to quicl down_interruptible() Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | net: wireless: bcmdhd: Update to Version 5.90.195.23Dmitry Shmidt2012-01-278-359/+368
| | | | | | | | | | | | | | | | | | | | | | | | - WFD fixes Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | net: wireless: bcmdhd: Update to Version 5.90.195.22Dmitry Shmidt2012-01-279-42/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Disable Ad-hoc support for cfg80211 - dhd_linux.c: Fix incorrect pid check - Merge Android changes from Android tree Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | net: wireless: bcmdhd: Update to Version 5.90.195.19Dmitry Shmidt2012-01-2723-1684/+2074
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add WFD changes - Add extra locking for internal ioctl operations Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | net: wireless: bcmdhd: Update to Version 5.90.195.15Dmitry Shmidt2012-01-2781-752/+2737
| | | | | | | | | | | | | | | | | | | | | | | | - Add WFD concurrent mode support Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | net: wireless: bcmdhd: Add WIPHY_FLAG_SUPPORTS_FW_ROAM flagDmitry Shmidt2012-01-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding this flag will allow NL80211_ATTR_ROAM_SUPPORT, and will set WPA_DRIVER_FLAGS_BSS_SELECTION flag in wpa_supplicant Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | net: wireless: bcmdhd: Fake PNO event to wake up the wpa_supplicantDmitry Shmidt2012-01-272-5/+19
| | | | | | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | usb: gadget: android: Honor CONFIG_USB_GADGET_VBUS_DRAWScott Anderson2012-01-251-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The maximum current draw was hard coded to 500 mA. composite.c has code that uses CONFIG_USB_GADGET_VBUS_DRAW to set the bMaxPower and to set whether or not the device is self-powered if they haven't been set. This change removes the code in android.c to allow composite.c to set them. Change-Id: I9db37922e91ee86e9e5c0e14519e119e5c41ca48 Signed-off-by: Scott Anderson <saa@google.com>
| | * | usb: gadget: Fix usb string id allocationBenoit Goby2012-01-253-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't reset next_string_id every time the gadget is enabled, this makes the next strings allocated overwrite strings allocated at probe time. Instead, fix rndis not to allocate new string ids on every config bind. Change-Id: Ied28ee416bb6f00c434c34176fe5b7f0dcb2b2d4 Signed-off-by: Benoit Goby <benoit@android.com>
| | * | nl80211/cfg80211: Make addition of new sinfo fields saferJouni Malinen2012-01-243-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a comment pointing out the use of enum station_info_flags for all new struct station_info fields. In addition, memset the sinfo buffer to zero before use on all paths in the current tree to avoid leaving uninitialized pointers in the data. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | cfg80211/nl80211: Send AssocReq IEs to user space in AP modeJouni Malinen2012-01-242-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When user space SME/MLME (e.g., hostapd) is not used in AP mode, the IEs from the (Re)Association Request frame that was processed in firmware need to be made available for user space (e.g., RSN IE for hostapd). Allow this to be done with cfg80211_new_sta(). Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * | misc: remove android pmem driver, it's obsolete.Dima Zavin2012-01-234-1443/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I48d9778007e1e9eed2bb34e33ceee818c23afaa5 Signed-off-by: Dima Zavin <dima@android.com>
| | * | Revert "proc: enable writing to /proc/pid/mem"Dima Zavin2012-01-191-0/+5
| | | | | | | | | | | | | | | | This reverts commit 198214a7ee50375fa71a65e518341980cfd4b2f0.
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Erik Gilling2012-01-279-15/+81
| |\ \ \ | | | |/ | | |/|
| | * | gpu: pvr: Update to DDK 1.8@796887.Alistair Strachan2012-01-278-10/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Re-introduce DC refcounting fix, which makes an unrelated (and unfixed) problem more reproducible. - Fix a bug where the driver would not wait for propagation (during power transitions) before performing a soft reset. Change-Id: I88d9b6d0e434bcbcfacae967b634a0699723d35b
| | * | gpu: pvr: Update to DDK 1.8@795947Alistair Strachan2012-01-271-2/+2
| | | | | | | | | | | | | | | | Change-Id: I06b43df6f86c7199b5d75dc10716e6e6b65ee9b5
| | * | mmc: omap_hsmmc: Prevent calling mmc_host_lazy_disable() on suspend pathDmitry Shmidt2012-01-261-5/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Erik Gilling2012-01-1921-216/+767
| |\ \ \ | | |/ /
| | * | gpu: pvr: Update to DDK 1.8@794370Alistair Strachan2012-01-1921-216/+767
| | | | | | | | | | | | | | | | Change-Id: I77887fd47acf5f29cce09bc9e06378d3c8608614
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Todd Poynor2012-01-181-0/+1
| |\ \ \ | | |/ /
| | * | OMAP4: Clock: Force a DPLL clkdm/pwrdm ON before a relockRajendra Nayak2012-01-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All DPLLs except USB are in ALWON powerdomain. Make sure the clkdm/pwrdm for USB DPLL (l3init) is turned on before attempting a DPLL relock. So, mark the database accordingly. Without this fix, it was seen that DPLL relock fails while testing relock in a loop of USB DPLL. Change-Id: I52f621a2c83e3e0dc4f6c440291860b285854e12 Tested-by: Ameya Palande <ameya.palande@ti.com> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
| * | | Merge branch 'linux-omap-3.0' into android-omap-3.0Todd Poynor2012-01-187-45/+252
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-omap2/Kconfig Change-Id: I43e69654c80590b971018903ae00fc7fa2ea5cc7
| | * | OMAP4: PM: work around for CPU1 onlining from OFF/OSWR state on older PPAWenbiao Wang2012-01-182-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally detected in OMAP4430 ES2.3 HS samples, CPU1 crashes the device upon calling PPA service DEFAULT_POR_NS_SMP(0x25). Rootcause showed that cache maintenance operations required to be performed before handing over control of CPU1 to HLOS, were incomplete and not broadcasted from CPU0 to CPU1. Kernel workaround for this is to use WFI to put CPU1 in OFF state if CPU0 is not ready yet (this mechanism was in place in previous versions of this code base but was meant to address a different need). When putting CPU1 back to off, its internal MMU descriptors are reset and sync'd with CPU0. CPU1 is brought online by later kernel subsystems. Note: CPU0 power state is made to OFF for both OSWR and OFF modes. This issue has been analysed to impact all OMAP4 non GP devices. A config flag is introduced to allow platforms and distributions to enable/disable if PPA version requirement is not met. Change-Id: I82c5880ec2d9a98a54755dfbd01aa981cfed9852 [nm@ti.com, cileija@ti.com: improvements and rootcause support] Signed-off-by: Carlos Leija <cileija@ti.com> Signed-off-by: Nishanth Menon <nm@ti.com] [wwang@ti.com: WA identification] Signed-off-by: Wenbiao Wang <wwang@ti.com>
| | * | OMAP3+: PM: VC: vcbypass needs to wait for valid to clearNishanth Menon2012-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | valid bit is cleared when the command has been send to PMIC. Current code is waiting for the invert of this. fix the same. Change-Id: Ic9ae3b7a0c2f825edeb01e75602ee8fb07536900 Signed-off-by: Nishanth Menon <nm@ti.com>
| | * | OMAP4: PM: TPS6236x: speed up voltage rampup rateNishanth Menon2012-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the voltage ramp rate to 32mv/uSec from 8mV/uSec This should fasten up our Voltage transition times and benefit latencies as well. Change-Id: I5246a75c2f7ec4cc187ba8ad63a7ad71c94616da Signed-off-by: Nishanth Menon <nm@ti.com>