aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* s5pc110_battery: fix charging display for car dockPawit Pornkitprasan2012-07-252-1/+6
| | | | | | Thanks to logicmann on xda for sending me an adapter to test with Change-Id: If497ecd39c2e2646320f5e603c94968edd0cc837
* USB: f_mass_storage: Disable write cache supportChiranjeevi Velempati2012-07-251-1/+1
| | | | | | | | | As part of mode sense CBW command, communicate to the host that write cache support is enabled and due to this during the write commnd, the host is asking for FUA and because of this write performance is degrading. Hence during mode sense command, intimate the host that write cache is not supported.
* aries: add input boosting to ondemandDaniel Bateman2012-07-231-0/+126
| | | | | | * Ported from MSM8660 kernel's ondemand driver Change-Id: If8708a367462fca0b7cad8414f634af57197a2c4
* aries: stop DVFS from spammingDaniel Bateman2012-07-231-4/+4
| | | | Change-Id: I05f3f0656a6d9c43f1e8e611c16f83c9d78d90a8
* aries: add OC supportDaniel Bateman2012-07-229-5/+83
| | | | Change-Id: Iaf1e26ad7e19ea0205b7f2905f28fccc19f712f8
* aries: adjust ramdisk for built in stage2Pawit Pornkitprasan2012-07-2124-385/+27
| | | | | | also remove duplicate ramdisks for ease of maintenance Change-Id: Ie101d47db1120a059ea03e1a52b5da0c2151df93
* aries: more space for /cachePawit Pornkitprasan2012-07-202-6/+6
| | | | | | so we can put system dalvik on /cache Change-Id: I173e7aa7b12735394beb297244fb501bdec53936
* gpu: pvr: match version to driverPawit Pornkitprasan2012-07-201-1/+1
| | | | Change-Id: I996254dcf39b105c7f295c86bdbd3ed626e251d6
* aries: Update defconfig following herringPawit Pornkitprasan2012-07-205-10/+35
| | | | Change-Id: I51b47ea57eb6c5e92af1c5b4f0bc5b4d83211ac1
* Merge remote-tracking branch 'google/android-samsung-3.0-jb' into HEADPawit Pornkitprasan2012-07-201314-12308/+28272
|\ | | | | | | | | | | | | | | | | | | | | | | Reverted ad-hoc support for now Conflicts: drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c drivers/net/wireless/bcmdhd/dhd_linux.c drivers/net/wireless/bcmdhd/wl_android.c drivers/net/wireless/bcmdhd/wl_cfg80211.c Change-Id: Ibaa7a841b177c86a235828e94be5b870f0ac090e
| * gpu: pvr: Flush the whole CPU cache when allocating uncached.Alistair Strachan2012-06-202-0/+5
| | | | | | | | | | | | | | This is a workaround for range-based CPU cache invalidation apparently not working reliably. Change-Id: I62fe3d10a465ee630729d7edf054f7bc82a422d8
| * Revert "gpu: pvr: Add thread safety checks to SGX MMU code."jp abgrall2012-06-182-107/+2
| | | | | | | | | | Not needed anymore, was just to get a prebuild that QA could use. This reverts commit ca5c535e1e9cae41831adae5a29a76f848f7f792
| * Revert "gpu: pvr: Fix a bug that prevented MMU PTs from being dumped."jp abgrall2012-06-181-1/+7
| | | | | | | | | | Not needed anymore, was just to get a prebuild that QA could use. This reverts commit 5a7b9539f5c1a9bb35131014907929a2da3fa723
| * Revert "gpu: pvr: Harden MMU code's use-after-free checks."jp abgrall2012-06-181-31/+9
| | | | | | | | | | | | Not needed anymore, was just to get a prebuild that QA could use. This reverts commit d00c00ef81aba03db7d7ebcdbc0ca7c11de5d2ec
| * Revert "gpu: pvr: Intentionally leak SGX MMU PTs."jp abgrall2012-06-181-5/+2
| | | | | | | | | | Not needed anymore, was just to get a prebuild that QA could use. This reverts commit ce3815df4836c1f8e10f7a71213b4d2d7615c496
| * gpu: pvr: Intentionally leak SGX MMU PTs.Alistair Strachan2012-06-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | When page tables would normally be freed, leak them instead. This experiment is to try to prove a distinction between a use-after-free type bug and another driver corrupting our page tables. At the point the asserts go off, we don't expect the page to have been freed yet. So it should contain only valid PTEs. If however the PT is being used after free, it might contain junk from other kernel drivers. If we don't free the PTs, the latter should never happen. Change-Id: I69714cfd0ee81adb9a60a996d11e8373e209dfa9
| * Revert "herring_defconfig: Enable SLUB / PAGEALLOC debug."jp abgrall2012-06-141-2/+0
| | | | | | | | | | It needs to be undone for experiment 3. This reverts commit 8a055ff107b57392864ec8590fc6ef0aafb4bf62
| * herring_defconfig: Enable SLUB / PAGEALLOC debug.Alistair Strachan2012-06-141-0/+2
| | | | | | | | | | | | To help us diagnose an issue relating to SGX MMU page table corruption. Change-Id: Idede40ddcb4fe6216513de83be955df1897750fb
| * Revert "gpu: pvr: Intentionally leak SGX MMU PTs."JP Abgrall2012-06-141-5/+2
| | | | | | | | | | | | | | | | Clicked submit in the wrong window. It needs to go after some other change. This reverts commit cc92b070b828b739cb5653407f8d22ca04762de2 Change-Id: Ie2cc8d1715af6b9c40145f5f3e857051916bea0a Signed-off-by: JP Abgrall <jpa@google.com>
| * gpu: pvr: Harden MMU code's use-after-free checks.Alistair Strachan2012-06-141-9/+31
| | | | | | | | | | | | | | | | Add signature words to MMU_CONTEXT and MMU_PT_INFO. These words are initialized at alloc time and zeroed at free time. They are checked any time a page table is validated before being freed. Change-Id: I74aa57c1e8b48e89bfbb1f4f8a4120c54859122f
| * gpu: pvr: Intentionally leak SGX MMU PTs.Alistair Strachan2012-06-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | When page tables would normally be freed, leak them instead. This experiment is to try to prove a distinction between a use-after-free type bug and another driver corrupting our page tables. At the point the asserts go off, we don't expect the page to have been freed yet. So it should contain only valid PTEs. If however the PT is being used after free, it might contain junk from other kernel drivers. If we don't free the PTs, the latter should never happen. Change-Id: I3046bb81896ed6ae4ea1f2de19a62a0e5e89e063
| * gpu: pvr: Fix a bug that prevented MMU PTs from being dumped.Alistair Strachan2012-06-141-7/+1
| | | | | | | | | | | | | | | | | | | | | | DumpPT already had a static inline if PT_DEBUG or PT_DUMP weren't defined, so it shouldn't have been #ifdef guarded. Furthermore, PT_DEBUG isn't enabled so DumpPT would not have been called to dump the page tables in one case. This is incorrect as it should have been called if PT_DUMP was enabled. Change-Id: I4a0d2a3665b7586a5dfa4390098df4edb6edfe74
| * gpu: pvr: Add thread safety checks to SGX MMU code.Alistair Strachan2012-06-142-2/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SGX MMU code was not designed to be used from multiple driver threads. One theory is that somehow the driver does sometimes use the MMU code from multiple threads, which could cause corruption of meta data. We must allow PID 1 through because the kernel uses this ID before userspace is up, and the module_init code interacts with the MMU subsystem. Otherwise, check that the outer bridge lock is held. If it is held, check the PID of the caller matches the PID holding the bridge lock. Change-Id: I35f42f251316b158576e5d853f8099e24942b4f2
| * Merge remote-tracking branch 'common/android-3.0' into ↵JP Abgrall2012-06-0815-172/+779
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | android-samsung-30-wip-mergedown * common/android-3.0: ext4: add missing save_error_info() to ext4_error() net: wireless: bcmdhd: Update to version 5.90.195.75 net: wireless: bcmdhd: Fix P2P driver crash for MFG firmware net: wireless: bcmdhd: Make responce waiting uninterruptible
| | * ext4: add missing save_error_info() to ext4_error()Theodore Ts'o2012-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ext4_error() function is missing a call to save_error_info(). Since this is the function which marks the file system as containing an error, this oversight (which was introduced in 2.6.36) is quite significant, and should be backported to older stable kernels with high urgency. Change-Id: Ia1eb8d91f37ceb67faf3b79d6bc79b899f1d6bfc Reported-by: Ken Sumrall <ksumrall@google.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: ksumrall@google.com Cc: stable@kernel.org Signed-off-by: Ken Sumrall <ksumrall@android.com>
| | * net: wireless: bcmdhd: Update to version 5.90.195.75Dmitry Shmidt2012-05-3113-142/+764
| | | | | | | | | | | | | | | | | | | | | - Fix false PCB-OVERLAP issue - Fix simultanious connect request on two P2P devices Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * net: wireless: bcmdhd: Fix P2P driver crash for MFG firmwareLeslie Yu2012-05-301-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * net: wireless: bcmdhd: Make responce waiting uninterruptibleDmitry Shmidt2012-05-302-28/+12
| | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | ARM: s5pv210: herring: FIMC1 buffers are not used, so reduce them.JP Abgrall2012-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jung-min.oh@samsung.com suggested ... """ Some memory can be reduced in crespo. For normal video playback, liboverlay in GB uses the reserved memory of FIMC1 but libhwcomposer in ICS uses the reserved memory of FIMD. """ Change-Id: Id3f40d78795fb96900678fb97ee8e0189daa79d3 Signed-off-by: JP Abgrall <jpa@google.com>
| * | gpu: pvr: Update to DDK 1.8@945322Alistair Strachan2012-06-061-3/+3
| | | | | | | | | | | | | | | | | | | | | This is a version number change only, for compatibility with the user-mode driver. Change-Id: I272428a490fbbd18ce9016e92e82829c5dc6b898
| * | Revert "gpu: pvr: Update to DDK 1.8@943950"JP Abgrall2012-06-051-3/+3
| | | | | | | | | | | | | | | | | | | | | This reverts commit a4f4aa198065e8d33f86cf3567bb4aba0eac5eef. The DDK change is not yet qualified as a JB release. But there is a USB VBUS fix needed.
| * | Revert "power: enable USB VBUS of cp and WiMAX"JP Abgrall2012-06-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b0293800181f91f5930075ccfc2ef7938cce1f8e. Breaks UART handling in the rild. 06-01 19:23:04.156 83 83 E RIL(s) : UART_Read : select - timeout occur! Bug: 6601359 Change-Id: Iffe12ae24e4738c0944d960fad49d9fe94d9b59d Signed-off-by: JP Abgrall <jpa@google.com>
| * | gpu: pvr: Update to DDK 1.8@943950Ben Jones2012-06-011-3/+3
| | | | | | | | | | | | | | | | | | | | | This is a version number change only, for compatibility with the user-mode driver. Change-Id: I0cfc6d73c1a386597f96efa97a3bd2e2d366e760
| * | Merge remote-tracking branch 'common/android-3.0' into ↵JP Abgrall2012-05-304-16/+18
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | android-samsung-30-wip-mergedown * common/android-3.0: USB: gadget: f_audio_source: Adjust packet timing to reduce glitches usb: gadget: android: Fix product name net: wireless: bcmdhd: Fix WPS PBC overlap failure usb: gadget: composite: Fix corruption when changing configuration
| | * USB: gadget: f_audio_source: Adjust packet timing to reduce glitchesMike Lockwood2012-05-291-8/+9
| | | | | | | | | | | | | | | | | | | | | Increase max packet size and clean up timing logic so we can better recover from not getting an interrupt in time for a SOF. Signed-off-by: Mike Lockwood <lockwood@google.com>
| | * usb: gadget: android: Fix product nameBenoit Goby2012-05-291-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Product names may contain spaces and scanf %s only matches the 1st word. Use strlcpy instead. Change-Id: Ie8703fea9775f7fc17fe615a42597ca3816d36b0 Signed-off-by: Benoit Goby <benoit@android.com>
| | * net: wireless: bcmdhd: Fix WPS PBC overlap failureNeeraj Kumar Garg2012-05-241-0/+2
| | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * usb: gadget: composite: Fix corruption when changing configurationBenoit Goby2012-05-211-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the config from the configs list before releasing the spinlock. Otherwise the other cpu might be processing a SET_CONFIGURATION that will switch to the configuration that is being released. Bug: 6521576 Change-Id: Id4da0d0e18ead63e20cb236cd1d3e8e6d116acce Signed-off-by: Benoit Goby <benoit@android.com>
| * | Merge branch 'android-3.0' into android-samsung-3.0-wipDmitry Shmidt2012-05-1713-40/+1401
| |\ \ | | |/
| | * net: wireless: bcmdhd: Ignore signal_pending() while waiting in IOCTLDmitry Shmidt2012-05-161-4/+1
| | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * net: wireless: bcmdhd: Check return value from dhd_dev_init_ioctl()Dmitry Shmidt2012-05-163-6/+8
| | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * net: wireless: bcmdhd: Fix WARN_ON(!res->pub.channel)Dmitry Shmidt2012-05-161-0/+5
| | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * net: wireless: bcmdhd: Change singal pending return value from -110 to -4Dmitry Shmidt2012-05-161-3/+3
| | | | | | | | | | | | | | | | | | | | | - ETIMEDOUT is interpreted as FW is not responding, so return EINTR instead Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | * USB: gadget: f_audio_source: New gadget driver for audio outputMike Lockwood2012-05-162-0/+887
| | | | | | | | | | | | | | | | | | | | | This driver presents a standard USB audio class interface to the host and an ALSA PCM device to userspace Signed-off-by: Mike Lockwood <lockwood@google.com>
| | * USB: gadget: f_accessory: Add support for HID input devicesMike Lockwood2012-05-153-9/+437
| | | | | | | | | | | | Signed-off-by: Mike Lockwood <lockwood@google.com>
| | * Add ACCESSORY_SET_AUDIO_MODE control request and ioctlMike Lockwood2012-05-152-2/+26
| | | | | | | | | | | | | | | | | | | | | The control request will be used by the host to enable/disable USB audio and the ioctl will be used by userspace to read the audio mode Signed-off-by: Mike Lockwood <lockwood@google.com>
| | * cpufreq: interactive: fixup trace of string paramsTodd Poynor2012-05-111-8/+8
| | | | | | | | | | | | | | | Change-Id: Iac47f62437e61b13724afbbf9df1a0729f58f236 Signed-off-by: Todd Poynor <toddpoynor@google.com>
| | * cpufreq: interactive: restart above_hispeed_delay at each hispeed loadTodd Poynor2012-05-101-1/+8
| | | | | | | | | | | | | | | Change-Id: I2e5b91d45e8806b0ab94ca2301ed671c9af9ab13 Signed-off-by: Todd Poynor <toddpoynor@google.com>
| | * net: wireless: bcmdhd: Fix filtering setting in case of P2PDmitry Shmidt2012-05-103-8/+19
| | | | | | | | | | | | Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | s3cfb: fix S3CFB_SET_VSYNC_INT ioctlGreg Hackmann2012-05-153-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S3CFB_SET_VSYNC_INT previously moved the interrupt to back porch instead of disabling it. S3CFB_SET_VSYNC_ACTIVE is now redundant. The vsync_active flag is also redundant, and removing it fixes some heavily-delayed vsync events. Change-Id: I37d6bb357e0ccb5faa4618ed10573e40ca1a3c54 Signed-off-by: Greg Hackmann <ghackmann@google.com>