summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-04-18Sound: Fix for improper handling of DMA RX Channelandroid-2012.04Ramesh Chandrasekaran
Signed-off-by: ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com>
2012-04-18inlining without body is not allowed with gcc 4.7Bernhard Rosenkranzer
Adding 'inline' before a function requires that the body be provided in the same file when using gcc 4.7. Signed-off-by: Bernhard Rosenkranzer <bernhard.rosenkranzer@linaro.org> Committed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
2012-04-13snowball: android: mali: Disable profiling of Mali L2 cacheJon Medhurst (Tixy)
When connecting the ARM Streamline Performance Analyzer to Snowball Android this will cause a board lock-up if the screen is static (Bug #961962). The cause of this appears to be a know issue with reading the L2 cache performance counters whilst the hardware block is powered down. As the current code is written to access these counters even when they have not been explicitly selected then this issue prevents Streamline being used reliably for any purpose. To workaround this bug, this patch disables support for the L2 cache counters in Mali. This has no effect on the operation of the cache. Signed-off-by: Jon Medhurst <tixy@linaro.org>
2012-04-13Enable USB Video in Snowball kernel configsupriya karanth
Enable the USB VIDEO CLASS for android https://bugs.launchpad.net/igloocommunity/+bug/975593 Signed-off-by: supriya karanth <supriya.karanth@stericsson.com>
2012-04-13dma/ste_dma40: fix erroneous comparisonLinus Walleij
A small fallout from Vinod's conversions to dma_transfer_direction, this small comparison was done with a dma_data_direction instead. Fix it by comparing against the correct enum. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-04-02sound: Fix for audio doesn't work in IK 3.3ramesh.chandrasekaran
Enable "Headset left" and "Headset Right" ALSA options by default Signed-off-by: ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com>
2012-04-02Merge remote-tracking branch 'jstultz/linaro-android-3.3' into ↵Philippe Langlais
stable-android-ux500-3.3
2012-03-29Merge branch 'upstream/android-3.3' into linaro-android-3.3John Stultz
2012-03-28mach_ux500:Removed suspend flagNaveen Kumar GADDIPATI
By disbaling the suspend we could avoid the hangs in suspend and resume. This workaround will be removed once the power management supports for all other peripheral drivers. Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
2012-03-28Revert "serial:pl011:Patch for resume and hibernation issue"Naveen Kumar GADDIPATI
This patch still the problem comes for cw1200. This reverts commit 77e19ebf618f63d3e71b16e94e7291bc0bd37e90.
2012-03-22cw1200: wakelock: Change for new Google wakelock implementation over PM sleepPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-03-22Merge remote-tracking branch 'jstultz/linaro-android-3.3' into ↵Philippe Langlais
stable-android-ux500-3.3
2012-03-21android-paranoid-net: Fix compile issueAndrey Konovalov
This gets rid of the "'AID_NET_RAW' and 'AID_NET_ADMIN' undeclared" compilation error. Signed-off-by: John Stultz <john.stultz@linaro.org>
2012-03-21Fix 3.3 merge error in: drivers: power: Add watchdog timer to catch drivers ↵Arve Hjønnevåg
which lockup during suspend. __device_suspend could return with an active timer on the stack Change-Id: I113f5f9aa12f909cb46621b6744e02a104ddd2bd Signed-off-by: Arve Hjønnevåg <arve@android.com>
2012-03-21usb: gadget: adb: Only enable the gadget when adbd is readyBenoit Goby
When adb is enabled, only connect the gadget when adbd is ready. If adbd dies or is restarted (e.g. "adb root"), the gadget is disconnected when the adb device is close, and it is re-connected once adb re-open the device. - Add callbacks to adb, similar to FunctionFs callbacks, to notify the gadget when the daemon is ready or closed. - Refcount calls to android_enable/android_disable to enable the gadget only once all the function daemons are ready. - Add enable/disble to android_usb_function to notify the function when it is added/removed from the list of enabled functions. Change-Id: Id54ff85aec9cf8715c94b4f9bd6137a79ad58bfc Signed-off-by: Benoit Goby <benoit@android.com>
2012-03-21android: logger: Allow a UID to read it's own log entriesNick Kralevich
Modify the kernel logger to record the UID associated with the log entries. Always allow the same UID which generated a log message to read the log message. Allow anyone in the logs group, or anyone with CAP_SYSLOG, to read all log entries. In addition, allow the client to upgrade log formats, so they can get additional information from the kernel. Change-Id: Ie48fb614b43c9302a07ad2673b78dd8749b492b6 Signed-off-by: Nick Kralevich <nnk@google.com>
2012-03-21serial:pl011:Patch for resume and hibernation issueNaveen Kumar GADDIPATI
In resuming the system hangs in PL011 driver.This patch solves the resume and hibernation issue. Signed-off-by: Naveen Kumar GADDIPATI <naveen.gaddipati@stericsson.com>
2012-03-21snowball: removing GPIO161 config for external connectorMathieu J. Poirier
On snwoball V5 and up GPIO161 is routed to PMU_EN of the cg2900 and as such shouldn't be configured to handle an event from the external connector (J23). Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
2012-03-21cg2900: Change the PMU_EN gpio for snowballRobert MARKLUND
Snowball have the GPIO_EN on GPIO161 diffrent from u8500. Change-Id: I6dddb1e3d7b7b80ce046fbd92a7852a3d0a6c59d Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-03-20net: wireless: bcmdhd: Daemonize wl_event_handlerDmitry Shmidt
Daemonizing makes thread (besides other things) NON-FREEZABLE, and it will not get fake signal on suspend to quite down_interruptible() Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-03-20usb: otg: ab8500: Go back to previous 3.2 version for ab8500-usb.cPhilippe Langlais
This is a workaround, till there is an explanation why this don't work on Snowball Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2012-03-20configs: Temporary disable STM traces for SnowballPhilippe Langlais
There are conflicts with Snowball GPIOs Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2012-03-19ARM: fiq_debugger: fix multiple consoles and make it a preferred consoleColin Cross
Fix setting up consoles on multiple fiq debugger devices by splitting the tty driver init into the initcall, and initializing the single tty device during probe. Has the side effect of moving the tty device node to /dev/ttyFIQx, where x is the platform device id, which should normally match the serial port. To avoid having to pass a different console=/dev/ttyFIQx for every device, make the fiq debugger a preferred console that will be used by default if no console was passed on the command line. Change-Id: I6cc2670628a41e84615859bc96adba189966d647 Signed-off-by: Colin Cross <ccross@android.com>
2012-03-19Merge remote-tracking branch 'jstultz/linaro-android-3.3' into ↵Philippe Langlais
integration-android-ux500 Conflicts: arch/arm/common/Makefile drivers/gpu/Makefile drivers/misc/Kconfig drivers/misc/Makefile drivers/mmc/card/block.c drivers/mmc/core/core.c drivers/video/Kconfig include/net/bluetooth/hci.h include/net/bluetooth/hci_core.h include/net/bluetooth/sco.h kernel/printk.c net/bluetooth/hci_conn.c net/bluetooth/hci_event.c net/bluetooth/l2cap_core.c net/bluetooth/mgmt.c net/bluetooth/sco.c
2012-03-19Merge branch 'mali-android' into integration-android-ux500-3.3Philippe Langlais
2012-03-19mcde: hdmi: Workaround to don't use the clock framework for MCDE on SnowballPhilippe Langlais
After Jimmy Rubin commit "video: mcde: Add dsi/dpi freq settings", HDMI framebuffer is no more functional, hence this workaround. Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-03-19Merge topic branch 'other' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'caif' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'hsi' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'modem' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'ste-multimedia-framework' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'wlan' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'st-mems-sensors' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'cg2900-fm' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'cg2900' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'audio' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'security' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'mali-generic' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'video' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'hwmem' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'input' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'trace-debug' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'usb' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'storage-mmc' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'dma' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'gpio' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'mach-plat' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'core' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19snowball: android: Fixing access right for BTKejun ZHOU
Signed-off-by: Kejun ZHOU <kejun.zhou@linaro.org> Committer: Mathieu Poirier <mathieu.poirier@linaro.org>
2012-03-19BT: Add sec_level to auth_conn_infoLukasz Rymanowski
With this patch it is possible to retrieve sec_level from the kernel by user space. This is needed for SAP working on hciops. This patch missed to be added when moving to kernel 3.0 ST-Ericsson ID: 256270 ST-Ericsson FOSS-OUT ID: FOSS-OUT-10060 Change-Id: Ic569db392e6f6ee2e546003dec86cc2d62a1fcd7 Signed-off-by: Lukasz Rymanowski <lukasz.rymanowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/42169 Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Tested-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: Hakan GARDRUP <hakan.gardrup@stericsson.com> Reviewed-by: Henrik POSSUNG <henrik.possung@stericsson.com> Reviewed-by: Kanak GUPTA <kanak.gupta@stericsson.com>