summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* do not merge bug 3370834 Cherrypick from master CL 79417Jean-Michel Trivi2011-01-214-44/+46
| | | | | | | | | | | | Rely on the audio input source parameter for mixer configuration. The generic APM implementation now passes the audio recording source as a configuration parameter, and uses the enum defined in mediarecorder.h. But the driver uses a string to define the "input source state". This change maps the input source to the string used by the driver. Change-Id: I5fce44579a3cda01ed73f67fb8c3091ef05cce76
* Merge "Fix issue 3305305." into gingerbreadEric Laurent2011-01-182-16/+62
|\
| * Fix issue 3305305.Eric Laurent2011-01-182-16/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that when the voice search tone is started, audio capture is still active and the output stream write function needs to place the input stream in standby to reconfigure the kernel driver. To do so it has to acquire the input stream mutex but as the input stream thread holds the lock most of the time while sleeping in the driver waiting for more data, this is very difficult and can take several seconds. The fix consists in forcing a sleep in the next read() when another function needs to acquire the input stream lock. The same change is done for output stream write() function. Also removed the workaround for issue 3201189 in setMode() (thread priority bump) as this change addresses the same problem. Change-Id: I3a5e672717752f83dfedce822a18748b165b0a5a
* | Merge "Set virtual key quiet time to 250ms. (DO NOT MERGE)" into gingerbreadJeff Brown2011-01-181-0/+7
|\ \ | |/ |/|
| * Set virtual key quiet time to 250ms. (DO NOT MERGE)Jeff Brown2011-01-111-0/+7
| | | | | | | | | | Bug: 3089163 Change-Id: I484e3a3fdaa519e780ba5598c2bc9b5359ea1ca8
* | Merge "Samsung changed the version scheme--but for the better" into gingerbreadEd Heyl2011-01-161-1/+1
|\ \
| * | Samsung changed the version scheme--but for the betterEd Heyl2011-01-161-1/+1
| | | | | | | | | | | | Change-Id: I24694ddbd8c5cfd639a7f8b466a70313faaafab8
* | | Merge "Allow new radios: KA4 (for I9020 and I9020A)" into gingerbreadEd Heyl2011-01-161-1/+1
|\ \ \ | |/ /
| * | Allow new radios: KA4 (for I9020 and I9020A)Ed Heyl2011-01-161-1/+1
| |/ | | | | | | Change-Id: I703a02ba4331098c1b58acb760496310bbfc02db
* | Update kernel: TFT/MAX8998 PMIC (AT&T/Euro) supportSimon Wilson2011-01-162-0/+0
|/ | | | | | | | | | | | | | | 37645a1 ARM: herring: touch: Change the touchscreen area for TFT LCD 987dab8 ASOC: support multi gain tables for several operator. 22e85d0 S5PC11X: BATTERY: charging register reconfigure for max8998 pmic bde8e28 ARM: herring: touchkey: Resize touchkey area to improve accuracy e14629b ARM: herring: touch: Calibrate touchscreen for TFT LCD 17d3f12 S5PC11X: BATTERY: don't turn on USB power of call processor 2cf499f S5PC11X: USB: Remove flush the tx fifo on dma 3eb31de Merge branch 'android-2.6.35' into android-samsung-2.6.35 aa30415 cgroup: leave cg_list valid upon cgroup_exit 0680fcd rtc: alarm: Update hrtimer if alarm at the head of the queue is reprogrammed Change-Id: If294d52c24214eac364c0477ace1a29b1e6ce28c
* Update kernel:Simon Wilson2011-01-062-0/+0
| | | | | | | | 87b314f net: wireless: bcm4329: Cumulative update to Version 4.218.248-18 2ff4164 Revert "S5PC11X: BATTERY:SOC level report as 100% if batt_full flag set true" 1a0b463 input:touchkey:Make touchkeys bigger for non on-cell devices Change-Id: Iaee27d140ac7e3c25e7af38103fe1e915633f8be
* Require new JL4 bootloader:Ed Heyl2010-12-291-1/+1
| | | | | | | | | | | | | S5PC11X : BOOTLOADER : JL4 Bootloader Release 1. Add androidboot.info command line to know correct reboot reason - Cold Power On : androidboot.info=0x1,0x0,0 - ADB Reboot : androidboot.info=0x4,0x0,1 - Panic and Reboot : androidboot.info=0x4,0xbb,1 - Watchdog Timeout : androidboot.info=0x4,0xee,1 2. Remove androidboot.reason command line (Not Used) Change-Id: I2f4d8af7e91d036f447b03ac98d67d02b1068a6c
* new kernel with more reset loggingBrian Swetland2010-12-292-0/+0
| | | | | | | | | | | | | | | | | 569b35d4 ARM: herring: improve reboot reason reporting d8fdc2e S5PC11X: ONENAND: erase 4KiB chip (SLC) by block ada7a44 S5PC11X/V210: ONENAND: Fix 4KiB pagesize OOB handling. 0893b26 S5PC11X: BATTERY: Support DeskDock Charging bff9bf5 S5PC11X: USB Switch: Support USB connection on deskdock 9ccdc8f S5PC11X: USB Switch: Support USB Path on deskdock 815f3d2 S5PC11X: USB: Add disconnection routine for deskdock 2ef5a95 gpu: pvr: Update DDK version number to 1.6.16.4061 0b094f1 S5PC11X: LCD: Turn off the LCD Power(LDO7,17) during sleep status 1584332 ARM: herring: lcd: Change unused OLED_ID GPIO PIN as INPUT/PULLDOWN for TFT LCD power consumption 7ffa3ca ARM: herring: Change TFT h/w revision 28b2d89 ARM: herring: panel: Correct color temperature. Change-Id: I466d13cb41b796d078236b1ea26113541f5623cc
* input: touchkey: Add new keylayout fileRom Lemarchand2010-12-232-1/+9
| | | | | | | | Add new keylayout file for devices that use the virtual touchkeys on the touch panel rather than a dedicated touchkey controller. Change-Id: Icc1ef7945a49d244d6ec3d55f7a89e2d465f5413 Signed-off-by: Rom Lemarchand <rlemarchand@sta.samsung.com>
* Require new bootloader JL3:Ed Heyl2010-12-221-1/+1
| | | | | | | | | | S5PC11X : BOOTLOADER : JL3 Bootloader Release 1. Disable "fastboot boot" command on locked state 2. Add audio gain code table to support I9020A & I9023 - add gain code value to command line Change-Id: Ida5d8ac23c89aedda2b81378091d41bb7cf1d862
* Reconcile with open-source GingerbreadJean-Baptiste Queru2010-12-210-0/+0
|\ | | | | | | Change-Id: I58c4c749e260c6016574df4c5a4ad2c6499381b8
| * New kernel from crespo-emr branch:Sriram Raman2010-12-202-0/+0
| | | | | | | | | | | | 7f1638 samsung_modemctl: downref mmio sem request count on failure Change-Id: I36d4b27d4b30300ca83f83c0f3566f5bf67662e1
| * New kernel prebuilt from crespo-emr branch:Ed Heyl2010-12-202-0/+0
| | | | | | | | | | | | a74912ac ARM: herring: touchkey power on delay Change-Id: If73bfe1b366b5ffc314a708e4fefd909792509b3
| * Make bluetooth the owner of /efs/bluetoothJaikumar Ganesh2010-12-201-0/+1
| | | | | | | | | | | | | | /efs permissions were changed. This was breaking Bluetooth. Bug: 3287732 Change-Id: I77ff74c8921995994c73525b2eb3b5a34737f913
| * fixup efs subdir permissionsBrian Swetland2010-12-201-0/+2
| | | | | | | | | | | | Apparently the factory process gets these wrong... Change-Id: I2016afd9fe505a8c1ac8cee641938d764ae655e6
* | Merge "Update kernel: desk dock, new nand support" into gingerbreadSimon Wilson2010-12-202-0/+0
|\ \
| * | Update kernel: desk dock, new nand supportSimon Wilson2010-12-202-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fed90c5 S5PC11X: ONENAND: erase 4KiB chip (SLC) by block 79883fc S5PC11X/V210: ONENAND: Fix 4KiB pagesize OOB handling. 2bc1809 S5PC11X: BATTERY: Support DeskDock Charging 1d83266 S5PC11X: USB Switch: Support USB connection on deskdock faad47d S5PC11X: USB Switch: Support USB Path on deskdock ab46daf S5PC11X: USB: Add disconnection routine for deskdock Change-Id: Iad9520cc8351544fee3402ede945c0f2fd72ecdf
* | | New radio JL2:Ed Heyl2010-12-201-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S5PC11X: radio: update radio image ver.I9020XXJL2 [ Problem ] - When we power on Crespo with SKT 3G USIM inserted. Crespo does not recognize USIM and causing infinite sim reset process. [ SW Modification ] - We enabled major sim toolkit command like Send SMS, display text, refresh etc. at Terminal Profile which notifing Mobile capability to SIM. [ Reason ] - Basically, STK USIM is not following 3GPP 31.101 standard. - When STK USIM receive Terminal Profile which basic sim toolkit command disabled from Mobile, It is not returning any status word 1,2 whcih have the result of current command processed. Because mobile didn't received any sw1, sw2 from SIM, It is trying to recover this invalid situation causing Cold reset to SIM. after that same Terminal Profile fall down to SIM and no sw1, sw2 again. this is repeated. [Problem] - UE return HPLMN too fast when UE camp on VPLMN. According to Spec, UE have to wait for HPLMN Search time. [ Reason ] - When UE camp on VPLMN and there is HPLMN history in Stored list of UE, UE start the searching for returning HPLMN every 100 secs regardless HPLMN Search timer according to Spec. [ SW Modification ] - Special FEATURE is not declared at this version. So UE start the searching when UE camp on VPLMN. So I declare this FEAUTE so that UE will start the searching when UE satisfy some condition. [ Problem ] - When we make voice call with TIM or WIND SIM card inserted in Italy, double ringback tones were heard in Crespo. [ Reason ] - Basically, TIM network have ringback tone problem. - When call is connecting, TIM network send the signal message that ringback tone should be ringing in phone side. But, TIM network also make a ringback tone even if sending that message. Therefore ringback tone is ringing in both side. [ SW Modification ] - In problem case, we change rx volume value to zero for the user didn't hear the ringback tone from TIM network. So the user can hear the ringback tone from only phone. [ Problem ] - EONS and ONS function is not working normally.. [ Reason ] - When LAC is only changed, NET REG NOTI msg is not happened. So AP side does not know current available LAC value. [ SW Modification ] - Make that NET REG NOTI msg is happen when LAC is only changed. NET REG NOTI msg inform current LAC value to AP side. [ Problem ] - RRC connections setup procedure fails [ Reason ] - The sequence of processing of DL-CCCH messages is wrong in current Rel-6 UMTS RRC implementation. So after UE receives a Rel-7 RRC impementation, UE does not handle UMTS RRC message appropriately. [ SW Modification ] - If the UE receives an RRC message on the DCCH, or addressed to the UE on the CCCH, then only UE should perform procedure specific error handling." Essentially this proposal is to implement a check in order to find whether the CCCH message is for the UE or not is put before message version check. [ Problem ] - After Boot on, Camp on time is too late [ Reason ] - The UE tried to attach before SIM initialization. in this case, the UE can not have NETPAR information(RAT and Frequency information.) Because the UE don't have reference value it takes long time to attach the N/W. [ SW Modification ] - Attaching before SIM init, the UE can read NETPAR from NV. [ SW Modification ] - Change SVN value to '3' for MR version (Crespo TMO) [ SW Modification ] - When Fastboot mode, Change version of the radio to I9020XXJL2 Change-Id: I7c517bb1bdc7bd11278ea4e11ca8ed384f4844fa
* | Merge "Update kernel: TFT, gamma, graphics DDK" into gingerbreadSimon Wilson2010-12-202-0/+0
|\ \
| * | Update kernel: TFT, gamma, graphics DDKSimon Wilson2010-12-202-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57c6693 gpu: pvr: Update DDK version number to 1.6.16.4061 50f8da5 S5PC11X: LCD: Turn off the LCD Power(LDO7,17) during sleep status 0aaf0db ARM: herring: lcd: Change unused OLED_ID GPIO PIN as INPUT/PULLDOWN for TFT LCD power consumption 865d7c1 ARM: herring: Change TFT h/w revision e761689 ARM: herring: panel: Correct color temperature. 9132519 ARM: herring: panel: Update gamma table 0a5f362 ARM: herring: panel: Add support for reading mtp data beae200 s3cfb_tl2796: Add debug function to read current gamma correction registers d4316cd s3cfb_tl2796: Add support for reading mtp gamma register offsets b0bb922 ARM: herring: panel: Adjust pentile gamma table 6c0d337 S5PC11X: CAMERA: change EXIF information in Front camera 509a6b4 S5PC11X: CAMERA: change EXIF information in back camera 76e767a samsung_modemctl: downref mmio sem request count on failure ac515c2 ARM: herring: increase touchkey power on delay b9fb7ef media: s5k4ecgx: preserve torch mode after focus/capture 42e7178 S5PC11X: CAMERA: update camera settings to version 1.39 8e9cc02 input: touchkey: Add support for TFT touchkey LED backlight ab842fcc ARM: herring: Add touchkey zones to the board file 0359232 input:touchkey:Conditionalizing init code based on board 826b0d3 S5PC11x: LCD: Add new CONFIG to support TFT LCD 06b8588 S5PC11X: LCD: Add new lcd platform data for support TFT LCD bfc7cbd S5PC11X: LCD: Add new lcd driver to support the TFT LCD Change-Id: I243eeb121755a7c7b48f4e2915b97cdf10c7397e
* | | New bootlaoder JL2:Ed Heyl2010-12-201-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S5PC11X : BOOTLOADER : JL2 Bootloader Release 1. Update board revision check routine to support several project - REV 00 ~ REV 15 : AMOLED & NS PMIC REV 16 ~ REV 47 : AMOLED & MAXIM PMIC REV 48 ~ REV 63 : TFT & MAXIM PMIC - To support TFT LCD, Sync with kernel lcd check routine 2. Modify onenand driver to remove spare read command - Use page read on bad block check routine - Original onenand don't support spare read - Kernel MTD driver is modified Change-Id: Iac9d6071718a58384e30850f80fa6b32e00569cd
* | libcamera: change shutterspeed units to microsecondsSimon Wilson2010-12-171-1/+2
| | | | | | | | | | | | | | This is to avoid shutter speeds less than 1ms from underflowing during the conversion to the denominator portion of 1/1000s. Change-Id: Ib6df304c38dd22a23aa31bc731c95030a089f05e
* | Merge "Require new bootloader (JL1): S5PC11X : BOOTLOADER : JL1 Bootloader ↵Ed Heyl2010-12-151-1/+1
|\ \ | | | | | | | | | Release" into gingerbread
| * | Require new bootloader (JL1):Ed Heyl2010-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S5PC11X : BOOTLOADER : JL1 Bootloader Release 1. Apply MPL for bug fix on LP3974 pmic (boot continue instead of power-off charging) 2. Change UVLO voltage from 2.7V to 2.5V to avoid voltage drop H/W reset 3. Modify topoff charging ratio to 20% on max8998 pmic 4. Change charging stop temperature to 50, recover at 42 5. Support TFT LCD 6. Update board revision check routine to support TFT LCD and PMIC Change 7. Support deskdock for power off charging 8. Timer Bug fix (Overflow : Affected on long time test) 9. Support oem state commnad line (oem_state=unlock or locked) Change-Id: If5f7838122d7befe437ee62ee074435317260527
* | | Make bluetooth the owner of /efs/bluetoothJaikumar Ganesh2010-12-151-0/+1
|/ / | | | | | | | | | | | | | | /efs permissions were changed. This was breaking Bluetooth. Bug: 3287732 Change-Id: Ib646d87a540b2307336077f5dfe2f3a1abee4d3c
* | fixup efs subdir permissionsBrian Swetland2010-12-131-0/+2
| | | | | | | | | | | | Apparently the factory process gets these wrong... Change-Id: I3c8f2b8372862437e0266fe8d3de3e2badcae8c3
* | reconcile with open-source gingerbreadJean-Baptiste Queru2010-12-090-0/+0
|\ \ | |/ | | | | Change-Id: Ie2eaeb35f7816ade7928c20e5ff4193561a407f0
| * manual merge 0244ecfandroid-merger2010-12-092-0/+0
| | | | | | | | Change-Id: I404698b15c85dfb09cc1f2c767e59aad99713893
| * 5PC11X: libcamera: move lens to default position when preview startskyoungho.yun2010-12-092-0/+3
| | | | | | | | | | | | | | | | | | | | | | After taking a picture, the focus is maintained. So if user change from camera mode to video mode after taking a picture very closely to object, focus in video mode is not normal. So move lens to default position when preview starts. Change-Id: If48d420eed5c872f375bce0985cffc18f6d39165 Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>
* | Merge "S5PC11X: libsensor: Changes to match libakm change" into gingerbreadMathias Agopian2010-12-084-43/+21
|\ \
| * | S5PC11X: libsensor: Changes to match libakm changeMike J. Chen2010-12-074-43/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to match libakm change to get raw acc data from driver and to allow setting acc driver delay separately from mag/orientation driver. Change-Id: Ibe5648f1395334ef3bf5975ec0660f10199c9833 Signed-off-by: Mike J. Chen <mjchen@sta.samsung.com>
* | | New prebuilt kernel:Ed Heyl2010-12-072-0/+0
| | | | | | | | | | | | | | | | | | fdc2d3b87c79956ed027517ce58048be5fb08baf pn544: Perform reset to correctly trigger firmware download mode. Change-Id: I4f5a74f45f5cd738d0b7922aeb4c220c49ca7842
* | | Update kernelandroid-merger2010-12-072-0/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 814333b ARM: herring: force console flush on restart 32b63bf S5PC11X: CAMERA: move lens to default position when preview starts 5b5fda5 S5PC11X: CAMERA: move lens to default position in INFINITY mode ae480c7 power: s5pc110_battery: reduce recovery temperature 823d8f3 power: s5pc110_battery: increase charge temperatures 7035b75 misc: samsung_modemctl: add timeouts to deal with modem crashes Change-Id: I8d94fe8c838fde2eb70fa436a76ea5be86e6d619 Conflicts: bcm4329.ko kernel
* | Merge "Change Encode output port Buffer size" into gingerbreadJames Dong2010-12-072-1/+23
|\ \
| * | Change Encode output port Buffer sizeSeungBeom Kim2010-12-062-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | o incoporate reviewer's comment to set parameter first to avoid code duplication bug - 3115953 Change-Id: Iaadbc4b803e0b9baa929494f3f3882c1fae45dd2 Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
* | | 5PC11X: libcamera: move lens to default position when preview startskyoungho.yun2010-12-072-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After taking a picture, the focus is maintained. So if user change from camera mode to video mode after taking a picture very closely to object, focus in video mode is not normal. So move lens to default position when preview starts. Change-Id: I3e41acbb22ad8a754755feae304c287dce690425 Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>
* | | Update kernelSimon Wilson2010-12-072-0/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | d439f08 ARM: herring: force console flush on restart f3cb873 S5PC11X: CAMERA: move lens to default position when preview starts 27db659 S5PC11X: CAMERA: move lens to default position in INFINITY mode 20eb9e2 S5PC11X: touchkey: Control the GPJ3[3] to support TFT touchkey LED 5e9441b power: s5pc110_battery: reduce recovery temperature bee69b2 Merge branch 'android-2.6.35' into crespo-rebased 238f71a power: s5pc110_battery: increase charge temperatures 3c9e01b ext4: initialize the percpu counters before replaying the journal Change-Id: Ia020aa5bca8ec3c3cd5aa016f983199392ec166a
* | Switch to the default AVC video encoder level from 40 to 31 so that the ↵James Dong2010-12-061-1/+1
| | | | | | | | | | | | | | | | recorded videos are playables on other phones bug - 3259224 Change-Id: I9f26bea7456221b01d4cb358786ecad39e34dca4
* | Update kernel: new graphics DDKSimon Wilson2010-12-012-0/+0
| | | | | | | | | | | | 9d194a8 gpu: pvr: Update to DDK 1.6.16.4046 Change-Id: I67b25ebb21224d225d68a562fe415f2e9c4fa3cf
* | Update kernel: increase framebuffer size, modem timeoutsSimon Wilson2010-12-012-0/+0
| | | | | | | | | | | | | | | | 38321bf ARM: herring: double framebuffer size eb355f3 ARM: herring: add calculation for FIMD size 49aeeb4 misc: samsung_modemctl: add timeouts to deal with modem crashes Change-Id: Ia559f07d5d8d268f8cd2a22d897f733cf52903a4
* | Fix issue 3198397Eric Laurent2010-11-301-5/+6
| | | | | | | | | | | | | | | | Use only 15 bits for fractional part of the increment in resample_441_320() to avoid overflow when multiplying by the difference between previous and next samples in interpolated value computation. Change-Id: I9f5a726d11f6b051db390df3d13312f1ee782d3a
* | Merge "libcamera: add 1900 to tm_year to fix gps date" into gingerbreadSimon Wilson2010-11-301-1/+1
|\ \ | |/ |/|
| * libcamera: add 1900 to tm_year to fix gps dateSimon Wilson2010-11-231-1/+1
| | | | | | | | Change-Id: I6b4d1457861dc25b464a530ea308d9a7b86690a7
* | Removed ALSA user space library and utilitiesEric Laurent2010-11-30536-241661/+67
| | | | | | | | Change-Id: I0a6492f7c834ea572531e77f75486bcc385e345b
* | Update kernelSimon Wilson2010-11-242-0/+0
| | | | | | | | | | | | 119403d ARM: herring: watchdog: Increase timeout and use realtime workqueue Change-Id: If2644c723b831800c58ad6c0e5e31bd003ff6b1c