summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-08-06Merge remote-tracking branch 'fsl-linux-sdk/imx_3.10.31_1.1.0_beta' into ↵kk4.4.3_2.0.0-betaguoyin.chen
imx_3.10.y_android_kk4.4.3-beta
2014-08-06ENGR00324668 mmc: core: add delay for SD3.0 UHS mode switchDong Aisheng
We may meet the following errors with a SD3.0 DDR50 cards during reboot test. mmc0: new ultra high speed DDR50 SDHC card at address aaaa mmcblk0: mmc0:aaaa SU08G 7.40 GiB mmcblk0: error -84 transferring data, sector 0, nr 8, cmd response 0x900, card status 0xb00 mmcblk0: retrying using single block read mmcblk0: error -84 transferring data, sector 0, nr 8, cmd response 0x900, card status 0x0 end_request: I/O error, dev mmcblk0, sector 0 ..... Buffer I/O error on device mmcblk0, logical block 0 mmcblk0: unable to read partition table The root cause is still unknown. Since there's an errata of Sandisk eMMC card before that it requires delay for CMD6 for eMMC DDR mode to work stable, we also suspect the SD3.0 DDR requires similar delay. (Still not confirmed by Sandisk) By adding the delay, the overnight reboot test(run 2000+ times) did not show the issue anymore. Originally it can easy show the error after about 20 times of reboot test. So this patch would be the temporary workaround for Sandisk SD3.0 DDR50 mode unstable issue. Signed-off-by: Dong Aisheng <b29396@freescale.com>
2014-08-06ENGR00325794 [#1087] fix video memory mutex sharing issueXianzhong
the root cause is video memory mutex is not global variable, it will cause video memory managment problem with mixed 2D/3D/VG. kernel panic with multiple instances stress test running glesx_viv.sh. Date: Jul 31, 2014 Signed-off-by: Xianzhong <b07117@freescale.com> Acked-by: Jason Liu (cherry picked from commit 9cec1cbd7ca2378e5c429f57d088d23d73d9c2f3)
2014-08-06ENGR00325494 pcie:delay is requried after clks_enRichard Zhu
- the async reset input need ref clock to sync internally, when the ref clock comes after reset, internal synced reset time is too short , cannot meet the requirement so, ssp_en should be asserted at least 4us after ref clock stable. - align to the community imx pcie driver, add the about 200us delay to make sure that it can allow the pcie clks stabilize, when pcie clks are enabled on imx6q/dl/solo. Signed-off-by: Richard Zhu <r65037@freescale.com> (cherry picked from commit 5d9635c8d92b21bc12753517fa3e9884417b19be)
2014-08-06ENGR00325794 [#1087] fix video memory mutex sharing issueXianzhong
the root cause is video memory mutex is not global variable, it will cause video memory managment problem with mixed 2D/3D/VG. kernel panic with multiple instances stress test running glesx_viv.sh. Date: Jul 31, 2014 Signed-off-by: Xianzhong <b07117@freescale.com> Acked-by: Jason Liu Conflicts: drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel.c
2014-08-06Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.31_1.1.0_beta' ↵guoyin.chen
into imx_3.10.y_android_kk4.4.3-beta
2014-08-05ENGR00242201 imx: Update specific clock code for MX6DLLoren Huang
-Update the parent of gpu2d_core for mx6dl. -Update the parent of gpu3d_shader and gpu3d_core for mx6dl. -Update the clock of gpu3d_shader and gpu3d_core for mx6dl. The code change is cherry-picked from patch 00e75bcba16d. Signed-off-by: Loren Huang <b02279@freescale.com> (cherry picked from commit 2b335e6232b807d114a5a57e0b5956ab794786a4)
2014-08-05Merge remote-tracking branch 'fsl-linux-sdk/imx_3.10.31_1.1.0_beta' into ↵guoyin.chen
imx_3.10.y_android_kk4.4.3-beta Conflicts: drivers/media/platform/mxc/capture/fsl_csi.h
2014-08-01ENGR00325572 v4l2 capture: fix build issue for built-in modulesOliver Brown
Fix a build error for built-int modules do to missing inline declaration Signed-off-by: Oliver Brown <oliver.brown@freescale.com>
2014-08-01ENGR00325203 usb: chipidea: host: check if ci->hcd initialized before access itLi Jun
When ci core driver enable runtime pm in probe, it's possible runtime suspend will be started before otg fsm queue work get to run, in this case, host has not been started yet so ci->hcd is NULL, but suspend routine will access it for save ehci registers, which result in kernle panic, this patch adds pointer valid check. Signed-off-by: Li Jun <b47624@freescale.com>
2014-07-31ENGR00322643-2 WFD between source and sink lost if disable USB tetheringguoyin.chen
In rndis_unbind(struct usb_configuration *c, struct usb_function *f), it will free the rndis->notify_req and rndis. But the rndis_response_available(void *_rndis) still will access the rndis and still summit notify_req to our usb ep. Add checking on used in rndis_msg_parser to avoid this case. Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
2014-07-31ENGR00322643-1 WFD between source and sink lost if disable USB tetheringguoyin.chen
RNDIS will keep allocate the string id from USB Composite drivers RNDIS will corrupt the list in unbind if the allocation fails in bind Follow mtp gadget driver to only allocate the ID in bind And not to clear the ID in unbind Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
2014-07-28Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.31_1.1.0_beta' ↵guoyin.chen
into imx_3.10.y_android_kk4.4.3-beta
2014-07-28ENGR00323977 fix UI no response or trigger lowmemorykiller easily.b37945
The root cause is CMA memory configured to be too large. So system memory is exhausted easily, but it can't trigger lowmemorykiller. The first step to resolve this is change CMA memory to 384M. Then reduce CMA pages from free pages when allocate non-movable memory. Low down minfree to half because it is only for non-movable memory. Signed-off-by: b37945 <b37945@freescale.com>
2014-07-28ENGR00323977 [#1002] remove cacheable for contiguous poolXianzhong
the explicit cacheable flag is added in 5.0.11p1, the cacheable limit shall be removed for contiguous pool. with this fix, more memory request could go to CMA, otherwise Android will have obvious issues, Apps or Games: UI no response or trigger the low memory killer easily. Date: Jul 25, 2014 Signed-off-by: Xianzhong <b07117@freescale.com> Acked-by: Jason Liu
2014-07-23ENGR00324009 Revert "ENGR00323404-1 ASoC: fsl_sai: Reset FIFOs after ↵Nicolin Chen
disabling TE/RE" Patch "ASoC: fsl_sai: Reset FIFOs after disabling TE/RE" may accidentally increase the underrun rate of SAI. To keep an equal quality as previous release, we decide to revert this patch and find a thorough way to reset the FIFO later. This reverts commit b85f840a60de8d0a5ca8fbe7eda15f611ff5b622. Acked-by: Wang Shengjiu <b02247@freescale.com> Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
2014-07-21ENGR00323924 iMX6SX: dts: disable weim-nor in default dtsAllen Xu
only enable this module in specific dts file. Signed-off-by: Allen Xu <b45815@freescale.com>
2014-07-21ENGR00323464 ARM: dts: imx6sx: add gpmi-weim dts fileAllen Xu
Add new dts file and enable gpmi module. Signed-off-by: Allen Xu <b45815@freescale.com>
2014-07-21ENGR00323682 MMC: Fixed boot_config overwritten by switch partitionYe.Li
In MMC driver, two variables: boot_config and part_config are used to keep eCSD(179) PARTITION_CONFIG. The part_config is not updated when set new boot_config, which causes the eCSD(179) is overwritten by any following partition switching, so the new boot_config is lost. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit ed6ae43d513d211aba3ab6218feebbccbc33bdbd)
2014-07-18ENGR00323404-2 ASoC: fsl_sai: Fix incorrect register writing in fsl_sai_isr()Nicolin Chen
In the rx irq handling part, we should clear the flags in RCSR not TCSR. Acked-by: Wang Shengjiu <b02247@freescale.com> Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
2014-07-18ENGR00323404-1 ASoC: fsl_sai: Reset FIFOs after disabling TE/RENicolin Chen
SAI will not clear their FIFOs after disabling TE/RE. Therfore, the driver should take care the task so as not to let useless data remain in the FIFO. Acked-by: Wang Shengjiu <b02247@freescale.com> Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
2014-07-18ENGR00323241 usb: chipidea: otg: delay 2s to decrease power.usage_countLi Jun
There is 2s delay for controller resume from usb wakeup case already, in OTG fsm mode, A-dev can start a new session via sys input file(means not via usb wakeup), in this case, A-dev still need the 2s delay for host root hub access registers, otherwise system will hang due to access register at low power mode. Signed-off-by: Li Jun <b47624@freescale.com>
2014-07-18Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.31_1.1.0_beta' ↵Ke Qinghua
into imx_3.10.y_android Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts
2014-07-18ENGR00322215 EPDC: kernel dump when do EPDC framebuffer unit testFancy Fang
[<80013b00>] (unwind_backtrace+0x0/0xf4) from [<80011524>] (show_stack+0x10/0x14) [<80011524>] (show_stack+0x10/0x14) from [<8026bc4c>] (Ldiv0+0x8/0x10) [<8026bc4c>] (Ldiv0+0x8/0x10) from [<802c1144>] (pxp_dispatch_thread+0xd74/0x11f8) [<802c1144>] (pxp_dispatch_thread+0xd74/0x11f8) from [<80046a90>] (kthread+0xb4/0xb8) [<80046a90>] (kthread+0xb4/0xb8) from [<8000e118>] (ret_from_fork+0x14/0x3c) This is caused by div by 0 in some corner cases. So add the check before doing the division. Signed-off-by: Fancy Fang <chen.fang@freescale.com> (cherry picked from commit 2a5dfad5ff763d4eb8b33628ea96291ad4b95d5e)
2014-07-18ENGR00323172 EPDC: there will be garbage when doing rotation unit testFancy Fang
Just as what the V4L2 PXP does, we should pass the drect w/h and output w/h accroding to the rotation angle. Signed-off-by: Fancy Fang <chen.fang@freescale.com> (cherry picked from commit bf95e3ee4131ce3ee78050f098704588766e8b07)
2014-07-17ENGR00321817-02 fbcon: System hang when calling fb_new_modelist()Sandor Yu
System will hang if calling fb_new_modelist() function from mxc_hdmi driver. In the function of fbcon_new_modelist(), pointer variable vc is missing null pointer check, add null pointer check vc to fix the issue. Signed-off-by: Sandor Yu <R01008@freescale.com>
2014-07-17ENGR00321817-01 HDMI: Dispaly blank after resumeSandor Yu
Issue reproduce steps: 1. Boot up without HDMI cable plugin 2. Insert the HDMI cable. 3. echo mem > /sys/power/state , enter suspend, 4. resume it, System can resume from suspend but display is blank. Error log: mxc_sdc_fb fb.31: Unable to allocate framebuffer memory detected fb_set_par error, error code: -12 In mxc hdmi driver, if system bootup without hdmi cable plugin, driver will create a default modelist. In fbcon driver, array fb_display[] initialized when system bootup and save current mode pointer that point to default modelist. When hdmi cable is plugin the modelist will rebuild according edid data, but the pointer of video mode in fb_display[] is not updated. When system resume, fbcon will use the invalidate pointer to configured framebuffer, framebuffer will crash. Add function fb_new_modelist() after modelist is rebuild to fix the issue. Signed-off-by: Sandor Yu <R01008@freescale.com>
2014-07-17ENGR00323027 MTD:QuadSPI: Remove the M4 checking workaroundYe.Li
The QuadSPI driver has a workaround to check if M4 is using QuadSPI NOR flash. When M4 is running on QuadSPI NOR, the QuadSPI driver will quit. This workaround has a bug when system booting from QuadSPI NOR. Therefore, removed the workaround and disabled the QuadSPI driver in MCC specific DTB. The MCC DTB will let the QuadSPI driver to disabled, not conflict with M4. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 6733ca3382ddb6358f4ccf8dd4f16d8f65995241)
2014-07-17ENGR00323026 iMX6SX:MCC Disable ADC1 and ADC2 in MCC DTSYe.Li
M4 has occupied the ADC1 and ADC2 in RDC, must disable them in DTS to avoid kernel boot panic. Signed-off-by: Ye.Li <B37916@freescale.com> (cherry picked from commit 046b1c214af6740e7936aae6876941e79c10da8e)
2014-07-17ENGR00321693 - [Android_MX6Q_SD] Camera:Preview hung after taking a picture. 2%Fang Hui
in ION_IOC_PHYS, should call ion_handle_put after ion_handle_get_by_id, or the ref count will added by 1. So when ion free, will not really free. Signed-off-by: Fang Hui <b31070@freescale.com>
2014-07-17ENGR00310060 USB:return to align with AOSP's new adb realization.Jianzheng Zhou
Revert "ENGR00300018-2 Update USB and Power Manager driver for android linux kernel 3.10" This reverts commit 3a2c9c92bf4f6153c4b50d03e853ebb884365175. Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
2014-07-16ENGR00323074 ARM: dts: imx6sx-sdb: add v4l2 capture and csi node for vadcRobby Cai
enable dual camera support on imx6sx-sdb. For camera ov5640, need an adapter (sch 700-28342) For VADC, need expansion board (sch 700-26109) Signed-off-by: Sandor Yu <R01008@freescale.com> Signed-off-by: Robby Cai <r63905@freescale.com> (cherry picked from commit ce4e36b59f225b3af75ba04accde746049a58cb4)
2014-07-16ENGR00322596 [Android_MX6SL_EVK] Resume: Any key can wake up system from ↵Ke Qinghua
suspend mode. 100% Setup KPP PIN to sleep state when system enter suspend Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-07-16ENGR00321444 sl&sx dts: Backlight changes to dark during splash logo displayguoyin.chen
Change sl&sx default backlight setting to max, which align with bootloader's splash screen setting Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
2014-07-16Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.31_1.1.0_beta' ↵Ke Qinghua
into imx_3.10.y_android
2014-07-16ENGR00322956 disable SATA in androidKe Qinghua
Disable SATA function in DTS Signed-off-by: Ke Qinghua <qinghua.ke@freescale.com>
2014-07-15ENGR00322509-2 ARM:imx6sl:busfreq: Fix incorrect clk_set_parent() call.Ranjani Vaidyanathan
The code incorrectly attempts to set the parent of periph2_clk to periph2_clk2_sel. Fix this by calling the clk_set_parent() function with the correct parameters. Also replace all calls to clk_set_parent() and clk_set_rate() with imx_clk_set_parent() and imx_clk_set_rate() function that prints out error messages in case of failure. Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@freescale.com>
2014-07-15ENGR00322509-1 Revert "ENGR00318063-6: ARM: imx6: add CLK_SET_RATE_GATE flag ↵Ranjani Vaidyanathan
for PLL clocks" The commit aabf4911f9971d4a6f02fe74bfdd39e7d74b7154, which added a check to prevent pll rate changes when PLL is enabled, causes incorrect reporting of MMDC clock during low power IDLE. So revert the patch as the code needs to be improved to handle all cases. Revert "ENGR00318063-6: ARM: imx6: add CLK_SET_RATE_GATE flag for PLL clocks" This reverts commit aabf4911f9971d4a6f02fe74bfdd39e7d74b7154. Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@freescale.com>
2014-07-15ENGR00318063-11: ARM: imx6: add return check for clock callsShawn Guo
There are a bunch of clk_enable_prepare, clk_set_parent and clk_set_rate calls in imx6 clock driver's initialization. They are called without retunr check. If there is something going wrong with the calls, they will just fail silently. The patch creates a set of helper functions imx_clk_enable_prepare, imx_clk_set_parent and imx_clk_set_rate, and use them instead from clock initialization to check the return and print error message to tell failures if any. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
2014-07-15ENGR00322895 dts: imx6sx-sdb: config PAD setting for GPIO17Shengjiu Wang
GPIO17 is used by headphone jack. if don't config the PAD setting, the gpio value is not correct. Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
2014-07-15ENGR00321142 gis: faster auto standards detectionSandor Yu
Vadc need time to auto standards detection, the default standard is NTSC, if vadc connect to PAL camera and no enough time to detect the video mode, driver will get NTSC mode. Confirmation from chip design architecture auto detect function is not required by rear-view camera application. Setting register vdec_stddbg standard_filte bits to 0 makes the standard detection faster, the issue duplicate decrease to 1%. Signed-off-by: Sandor Yu <R01008@freescale.com>
2014-07-15ENGR00322015 dts: imx6qdl: dcic: set dcic1 as disp-axi clock for dcic2Sandor Yu
On imx6dl dcic2 clock gate depend on dcic1, so setting dcic1 as disp-axi clock for dcic2 in imx6qdl dts. Signed-off-by: Sandor Yu <R01008@freescale.com>
2014-07-15Merge remote-tracking branch 'remotes/fsl-linux-sdk/imx_3.10.31_1.1.0_beta' ↵guoyin.chen
into imx_3.10.y_android
2014-07-14ENGR00322563 ARM:imx6sl:Ensure that the CPU frequency is maintianed at ↵Ranjani Vaidyanathan
396MHz in low power idle. In low power IDLE mode, CPU needs to be sourced from PLL1 instead of PLL2_PFD0 as PLL2 needs to be in bypass mode to achieve 24MHz DDR frequency. The original code attempts to relock the PLL1 at frequency that is as close as possible to 396MHz, which results in PLL1 at 648MHz and the ARM freq turns out to be 324MHz instead of 396MHz. This causes issues with CPUFREQ as 324MHz is not a frequency listed in the cpufreq table in the device tree. This patch attempts to fix this mis-match and maintains CPU freq at 396MHz in low power idle. Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@freescale.com>
2014-07-14ALSA: usb-audio: Fix deadlocks at resumingTakashi Iwai
The recent addition of the USB audio mixer suspend/resume may lead to deadlocks when the driver tries to call usb_autopm_get_interface() recursively, since the function tries to sync with the finish of the other calls. For avoiding it, introduce a flag indicating the resume operation and avoids the recursive usb_autopm_get_interface() calls during the resume. Reported-and-tested-by: Bryan Quigley <gquigs@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
2014-07-14ALSA: usb-audio: Save mixer status only once at suspendTakashi Iwai
The suspend callback of usb-audio driver may be called multiple times per suspend when multiple USB interfaces are bound to a single sound card instance. In such a case, it's superfluous to save the mixer values multiple times. This patch fixes it by checking the counter. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2014-07-14ALSA: usb-audio: Use SNDRV_DEV_CODEC for mixer objectsTakashi Iwai
Instead of SNDRV_DEV_LOWLEVEL, use SNDRV_DEV_CODEC type for mixer objects so that they are managed in a proper release order. No functional change at this point. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2014-07-14ALSA: usb-audio: Resume mixer values properlyTakashi Iwai
Implement reset_resume callback so that the mixer values are properly restored. Still no boot quirks are called, so it might not work well on some devices. Signed-off-by: Takashi Iwai <tiwai@suse.de>
2014-07-14ENGR00322581-05 tty: serial: imx: Revert "tty: serial: imx: set uart to cpu ↵Fugang Duan
mode by default" Since uart SDMA can work for Atheros BT module in android environment, the previous patch (commit f337845718) disable SDMA mode in default, now revert the patch to avoid the big change in dts for all platforms. By default, we enable SDMA mode for uart. Signed-off-by: Fugang Duan <B38611@freescale.com>
2014-07-14ENGR00322581-04 serial: imx: fix the software flow controlHuang Shijie
Controls the CTS pin when the CTSC bit is negated. CTS has no function when CTSC is asserted. After The CTS pin is low, it needs to enable CTSC. The patch just fix the issue. Signed-off-by: Fugang Duan <B38611@freescale.com>