summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-04-12ENGR00179485 fix android CTS hang up issueRichard Liu
fix android CTS hang up issue provided by Viv Signed-off-by: Richard Liu <r66033@freescale.com> Acked-by: Lily Zhang
2012-04-12ENGR00179510 ipu capture: fix system hang when running captureYuxi Sun
Add _ipu_get() and _ipu_put() when calling ipu_csi_get_sensor_protocol function. Signed-off-by: Yuxi Sun <b36102@freescale.com>
2012-04-11ENGR00179408 MX6DL:Increasing CPU voltage for 800MHz/400MHz/200MHz work pointsLin Fuzhen
It need add 25mV to 800MHz/400MHz/200MHz work points for MX6DL, otherwise system will crash when cpu freq switch to these work points Signed-off-by: Lin Fuzhen <fuzhen.lin@freescale.com>
2012-04-10ENGR00179243-2 Revert "ARM_CLK to PLL2_400MHz when ARM freq is below 400MHz."Xinyu Chen
This reverts commit 88d3af87222b37e454acd6a8de3b0cf18180da32. Signed-off-by: Xinyu CHen <xinyu.chen@freescale.com>
2012-04-10ENGR00179243-1: Revert "MX6-Fix TO1.0 boot-fail issue"Xinyu Chen
This reverts commit 599b1c5fb9275920b3f612e28b7d9c45a9688719. Signed-off-by: Xinyu CHen <xinyu.chen@freescale.com>
2012-04-09ENGR00179155 mx6q sabresd: take volume down key as power keyXinyu Chen
Temporary workaround for real power key not functional. Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
2012-04-09Merge remote branch 'fsl-linux-sdk/imx_3.0.15' into imx_3.0.15_androidXinyu Chen
2012-04-07ENGR00179130 Setting 480p Hsync and Vsync polarity is incorrectSandor Yu
Fix IPU DI registr DI_GENERAL incorrect initialize. Signed-off-by: Sandor Yu <R01008@freescale.com>
2012-04-06ENGR00178612 ESAI:add support for esai call asrcChen Liangjun
ESAI can call ASRC for sample rate convert if the input sample rate is not support. 1 ESAI will decide whether to use ASRC for sample rate convert in imx-cs42888.c. If ASRC is need, the asrc_enable will be set. 2 In imx-pcm-dma-mx2.c, according to the value of asrc_enable, the dma driver would decide whether to alloc another p2p dma channel to support MEMORY-->ASRC_INPUT-->ASRC_OUTPUT-->ESAI_TX_FIFO route. 3 The code support 2 channel,24/32 bit audio file playback. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-04-06ENGR00178875-3 VDOA: Add VDOA driver support on i.MX6Wayne Zou
VDOA needs to sync with IPU. Add VDOA driver support under IPU drivers. Signed-off-by: Wayne Zou <b36644@freescale.com>
2012-04-06ENGR00178875-2 VDOA: Add vdoa support on i.MX6 SOC platformWayne Zou
Add tiled format macros: IPU_PIX_FMT_TILED_NV12 and IPU_PIX_FMT_TILED_NV12F Signed-off-by: Wayne Zou <b36644@freescale.com>
2012-04-06ENGR00178875-1 VDOA: Add vdoa support on i.MX6 SOC platformWayne Zou
Add vdoa support on i.MX6 SOC platform Signed-off-by: Wayne Zou <b36644@freescale.com>
2012-04-06ENGR00172303 - FEC : fix 'eth0: tx queue full!' issue.Fugang Duan
The issue is hard to reproduce in normal envrionment. And the reproduce rate is about 40% when doing VTE auto test. while the driver did report being busy when the link is down or no transmission buffers are available, it did not stop the queue, causing instant retries. furthermore, transmission being triggered with link down was caused by unconditional queue wakes, especially on timeouts. Now, wake queue only if link is up and transmission buffers are available, and dont forget to wake queue when link has been adjusted. next, add stop queue notification upon driver induced transmission problems, so network stack has a chance to handle the situation. Signed-off-by: Fugang Duan <B38611@freescale.com>
2012-04-06ENGR00177235-2 SDMA: add p2p dma modeChen Liangjun
Add code to support p2p dma mode.Add membership in imx_dma_data struct to support P2P dma script. Because the P2P dma script need 2 dma request to trigger DMA burst. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-04-06ENGR00177235-1 SDMA: add p2p dma modeChen Liangjun
Add support for p2p(peripheral to peripheral) dma mode in SDMA module. 1 Add p2p script membership in struct sdma_channel to support device to device tranfer. 2 P2P dma script need more configure information then memory to peripheral or peripheral to memory script. we configure these information into watermark_level. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-04-06ENGR00179077 ASRC:delete unused variableChen Liangjun
Delete unused variable busy_lock in mxc_asrc.h. Signed-off-by: Chen Liangjun <b36089@freescale.com>
2012-04-06ENGR00178642-1 gpu-viv: fix suspend/resume issue for #304Richard Zhao
Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Acked-by: Lily Zhang
2012-04-06ENGR00179059 RTC: enable wakealarm attributeFrank Li
Set 10s wake alarm from now by below command echo +10 > /sys/class/rtc/rtc0/wakealarm Signed-off-by: Frank Li <Frank.Li@freescale.com>
2012-04-06ARM: assembler.h: Add string declaration macroDave Martin
Declaring strings in assembler source involves a certain amount of tedious boilerplate code in order to annotate the resulting symbol correctly. Encapsulating this boilerplate in a macro should help to avoid some duplication and the occasional mistake. Signed-off-by: Dave Martin <dave.martin@linaro.org> Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by: Huang Shijie <b32955@freescale.com>
2012-04-06ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflictsCatalin Marinas
This macro is used to generate unprivileged accesses (LDRT/STRT) to user space. Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Huang Shijie <b32955@freescale.com>
2012-04-06ENGR00178939 [mx6] usb host, msleep may be called in atomic contextTony LIU
- change msleep(1) to udelay(500) - msleep may be called in atomic context, which will cause warning message Signed-off-by: Tony LIU <junjie.liu@freescale.com>
2012-04-05ENGR00178916: imx-esai improve dump regs formatAdrian Alonso
* Improve dump regs format to easily correlate register content. * Update copyrigth year. Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2012-04-05ENGR00178915: imx6 clock fix build warningsAdrian Alonso
* Fix build warnings * clock.c: In function '_clk_pll1_enable': warning: no return statement in function returning non-void * clock.c: In function 'mx6_clocks_init': warning: unused variable 'reg' Signed-off-by: Adrian Alonso <aalonso@freescale.com>
2012-04-05ENGR00178951-2 SYSRQ: enable CONFIG_MAGIC_SYSRQ by defaultJason Liu
SYSRQ is very useful for kernel debug thus enable it by default. SYSRQ support serial port, we can send the command via minicom: CTRL A + F (send BRK) + T: to dump the task information Enable SYSRQ by default will not involve any performance drop Signed-off-by: Jason Liu <r64343@freescale.com>
2012-04-05ENGR00178951-1 serial/imx: dead lock dedected when handle sysrqJason Liu
imx_rxint -> spin_lock_irqsave(&sport->port.lock, flags); And then it will call the following functions: uart_handle_sysrq_char -> handle_sysrq -> printk -> __call_console_write_drivers -> imx_console_write -> Here the imx_console_write function will call: spin_lock_irqsave(&sport->port.lock, flags); The A-A deadlock happens. We need spin_unlock before handle sysrq char and spin_lock again after it. Signed-off-by: Jason Liu <r64343@freescale.com>
2012-04-05serial/imx: support to handle break characterHui Wang
The imx UART hardware controller can identify BREAK character and the imx_set_termios() can accept BRKINT set by users, but current existing imx_rxint() can't pass BREAK character and TTY_BREAK to the tty layer as other serial drivers do (8250.c omap_serial.c). Here add code to handle BREAK character and pass it to tty layer. To detect error occurrence, i use URXD_ERR to replace (URXD_OVRRUN | URXD_FRMERR | ...) because any kind of error occurs, URXD_ERR will always be set to 1. I put the URXD_BRK to the first place to check since when BREAK error occurs, not only URXD_BRK is set to 1, but also URXD_PRERR and URXD_FRMERR are all set to 1. This arrangement can filter out fake parity and frame errors when BREAK error occurs. Signed-off-by: Hui Wang <jason77.wang@gmail.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> (cherry picked from commit 019dc9ea8d528eb3640bbba604e1e5a2f6994b1f)
2012-04-05ENGR00178932 USB: fix two USB otg common bug for i.MX6make shi
- Built in gadget device driver, plug in USB cable with no response, the reason is USB VBUS wakeup is not enable after OTG switch,make sure pdata->port_enables is 1 even if the pdata is otg device pdata. -Without modprobe or built in gadget device driver,after plug out the USB otg cable,will output "wait otg vbus change timeout!".The reason is we get error otgsc data after USB enter low power mode. Signed-off-by: make shi <b15407@freescale.com>
2012-04-05ENGR00177281-5 WM8962: add record featureGary Zhang
1. add amic and dmic support. 2. update wm8962 codec driver Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-04-05ENGR00177581-4 MX6: add wm8962 mic supportGary Zhang
1. add amic_detect pin 2. add dmic_gpio init Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-04-05ENGR00160472 - MX6: add Ethernet ANSI/IEEE 802.2 LLC support in defconfig.Fugang Duan
- Add Ethernet ANSI/IEEE 802.2 LLC support. And the packet with IP head "ETH_P_802_2" will be processed in Ethernet stack L3 layer. - If disable the feature, ethernet stack will drop the LLC packets. Signed-off-by: Fugang Duan <B38611@freescale.com>
2012-04-05slub: fix a possible memleak in __slab_alloc()Eric Dumazet
commit 73736e0387ba0e6d2b703407b4d26168d31516a7 upstream. Zhihua Che reported a possible memleak in slub allocator on CONFIG_PREEMPT=y builds. It is possible current thread migrates right before disabling irqs in __slab_alloc(). We must check again c->freelist, and perform a normal allocation instead of scratching c->freelist. Many thanks to Zhihua Che for spotting this bug, introduced in 2.6.39 V2: Its also possible an IRQ freed one (or several) object(s) and populated c->freelist, so its not a CONFIG_PREEMPT only problem. Reported-by: Zhihua Che <zhihua.che@gmail.com> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Christoph Lameter <cl@linux.com> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-05ENGR00178938 defconfig: enable usb otg functionXinyu Chen
Enable USB otg function in android default configure Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
2012-04-05slub: fix a possible memleak in __slab_alloc()Eric Dumazet
commit 73736e0387ba0e6d2b703407b4d26168d31516a7 upstream. Zhihua Che reported a possible memleak in slub allocator on CONFIG_PREEMPT=y builds. It is possible current thread migrates right before disabling irqs in __slab_alloc(). We must check again c->freelist, and perform a normal allocation instead of scratching c->freelist. Many thanks to Zhihua Che for spotting this bug, introduced in 2.6.39 V2: Its also possible an IRQ freed one (or several) object(s) and populated c->freelist, so its not a CONFIG_PREEMPT only problem. Reported-by: Zhihua Che <zhihua.che@gmail.com> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Christoph Lameter <cl@linux.com> Signed-off-by: Pekka Enberg <penberg@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-05ENGR00178646-2 [MX6]Add SD1 and SD2 to interactive governorAnson Huang
Different have different SD ports, need to add all SD irqs to be condition of CPUfreq change and adjust the default irq threshold. Signed-off-by: Anson Huang <b20788@freescale.com>
2012-04-05ENGR00178646-1 [CPUFreq]Fix interactive governor bugAnson Huang
1. When system not boot up all cores, interactive governor will not work; 2. Adjust the default timer_rate to 50ms instead of 20ms to avoid too many freq up/down change. Signed-off-by: Anson Huang <b20788@freescale.com>
2012-04-04ENGR00175724-2 IPU: change ipu_device thread process mode to interrupt mode.Wayne Zou
IPU: change ipu_device thread process method to interrupt drive mode to get better IPU post-processing load balance. Signed-off-by: Wayne Zou <b36644@freescale.com>
2012-04-04ENGR00175724-1 IPU: change ipu_device thread process mode to interrupt mode.Wayne Zou
IPU: change ipu_device thread process method to interrupt drive mode to get better IPU post-processing load balance. Signed-off-by: Wayne Zou <b36644@freescale.com>
2012-04-02ENGR00178763: MX6-Fix TO1.0 boot-fail issueRanjani Vaidyanathan
TO1.0 parts donot boot properly after the following commit: 88d3af87222b37e454acd6a8de3b0cf18180da32 MX6-Switch ARM_CLK to PLL2_400MHz when ARM freq is below 400MHz. Correct gpt_clk was not getting enabled. Fix by adding the appropriate gpt_clk. Signed-off-by: Ranjani Vaidyanathan <ra5478@freescale.com>
2012-04-02ENGR00178584 uart3 pins configurationAlejandro Sierra
Uart 3 and NFC pins are shared. Uart 3 enablement is done by passing an early parameter called "uart3" from uboot. Both interfaces (Uart3 and NFC) can NOT coexist on the same configuration at the same time. Signed-off-by: Alejandro Sierra <b18039@freescale.com>
2012-04-01ENGR00178642-1 gpu-viv: fix suspend/resume issue for #304Richard Zhao
Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Acked-by: Lily Zhang
2012-04-01ENGR00178631 MX6: fix audmux build errorGary Zhang
fix the build error for audmux located at drivers\mxc\dam Signed-off-by: Gary Zhang <b13634@freescale.com>
2012-04-01ENGR00178629 i.MX6 sabresd:support software power off by SNVS settingRobin Gong
On sabresd board, PMIC_ON_REQ control pmic power on/off, we can set TOP and DP_EN of SNVS_LPCR to implement power off by software. On this way,SNVS RTC alarm can work after power off. The description of register can be found on other SNVS block document which provided by IC team, not i.MX6 RM. Signed-off-by: Robin Gong <B38343@freescale.com>
2012-03-30ENGR00178582 Remove uart2 early parameterAlejandro Sierra
UART2 and CAN interface do not have pins in common. Therefore uart2 early parameter is not required. Signed-off-by: Alejandro Sierra <b18039@freescale.com>
2012-03-31ENGR00178509 MX6DL SabreSD:Correct IPU id/IPU di for LDBLiu Ying
This patch corrects IPU id and IPU di for LDB mux. As there is only one IPU on MX6DL SoC, we'll use LVDS panel on IPU0 DI1/LVDS1 and HDMI on IPU0 DI0. Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
2012-03-30ENGR00178581 - EPDC fb: Fix regulator-related EPDC failure on SabreSDDanny Nold
Remove call to regulator_has_full_constraints() from Max17135 EPD PMIC initialization code, since leaving it enabled results in a failure of system to load properly - key regulators are disabled when 'epdc' is added to the kernel command line. Signed-off-by: Danny Nold <dannynold@freescale.com>
2012-03-30ENGR00176366: MX6-Switch ARM_CLK to PLL2_400MHz when ARM freq is below 400MHz.Ranjani Vaidyanathan
PLL1 can be disabled whenever ARM_CLK is below 400MHz since ARM_CLK can be sourced from PLL2_PFD_400MHz. Signed-off-by: Ranjani Vaidyanathan <ra5478@freescale.com>
2012-03-30ENGR00178552 MX6Q_SAREBSD: update pin for RevB board.Zhang Jiejing
update PCIE_PWR_EN pin for RevB board, the old pin was used by I2C3_SDA pin. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
2012-03-30ENGR00178552 MX6XX_SABRESD: update pin mux for revB board.Zhang Jiejing
update some pin mux of revB board. fix i2c3 not work on sabre6q board, and change related pins. Conflicts: arch/arm/mach-mx6/board-mx6q_sabresd.h Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
2012-03-30ENGR00178552 MX6XX_SABRESD: update pin mux for revB board.Zhang Jiejing
update some pin mux of revB board. fix i2c3 not work on sabre6q board, and change related pins. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
2012-03-30mmc: block: fixed NULL pointer dereferenceJaehoon Chung
We already check for ongoing async transfers when handling discard requests, but not in mmc_blk_issue_flush(). This patch fixes that omission. Tested with an SDHCI controller and eMMC4.41. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Per Forlin <per.forlin@linaro.org> Cc: <stable@kernel.org> Signed-off-by: Chris Ball <cjb@laptop.org>