summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-09-07touchscreen: temp disable eGalax touchscreen suspend functionimx-android-r12Zhang Jiejing
the touchscreen chip can't be wake up during resume. it caused by the irq pin can't pull down while resume. this is may caused by 6q cpu board HW design. temp disable suspend function of eGalax touch screen for release. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
2011-09-02config: change mx6 defconfig to 1g/3g address partitionZhang Jiejing
change back to 1g/3g address partition, give more vma to user space. Signed-off-by: Zhang Jiejing <jiejing.zhang@freescale.com>
2011-08-25cpu hotplug: remove the printk to avoid unknow crashXinyu Chen
It will happen to crash on cpu hotplug. Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
2011-08-24mx6q: increase the dma zone size to 184MBXinyu Chen
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
2011-08-23Add HDMI support into the defconfigXinyu Chen
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
2011-08-18Revert "ENGR00154922 [MX6]Disable some clocks during boot"Xinyu Chen
This reverts commit 187111c874936a35e8d5004db9537d2760f2bae1.
2011-08-18Merge branch 'imx_2.6.38' into imx_2.6.38_androidXinyu Chen
2011-08-17ENGR00154961 [MX6]system hang in suspend with irqAnson Huang
If the wakeup source irq pending during suspend process, system will hang, we need to abort suspend, and resume immediately to make system running normally. Signed-off-by: Anson Huang <b20788@freescale.com>
2011-08-17ENGR00153887 mx53 ard: add display supportLily Zhang
- Add VGA support. The command option to use VGA as primary display: video=mxcfb0:dev=vga,VGA-XGA,if=GBR24 ard-vga For VGA, Need to disable Ethernet and short PIN 1-2 of J14 and J16. - Add LVDS support. The default display is LVDS0. LVDS1 needs further modification on ldb driver Signed-off-by: Lily Zhang <r58066@freescale.com>
2011-08-17ENGR00154931 [MX6]L2 cache init wrong after resumeAnson Huang
1.Need to add condition check after resum, or if we didn't config L2 cache, build will fail. 2.Need to call the mxc_init_l2x0 instead of l2x0_init. Signed-off-by: Anson Huang <b20788@freescale.com>
2011-08-17ENGR00154922 [MX6]Disable some clocks during bootAnson Huang
To save power, we should disable as much as possible when kernel boot up, only leaving the necessary clocks on, devices should enable their clock in init.This is necessary for our MX6q, or the chip will be too hot, may damage. After doing this change, we can save more than 150mA@5V. Signed-off-by: Anson Huang <b20788@freescale.com>
2011-08-17ENGR00154917 [MX6]Enable MMDC low-power modeAnson Huang
1. Set MMDC pad ctrl to low-power mode when dormant; 2. DRAM_RESET can't be changed due to hardware design; 3. GPR_CTLDS should be changed to lower the MMDC IO power to 0mA, but it needs hardware change, will add it in next hardware version after we figure out how to change the hardware. Current MMDC data in dormant is: IO: 28mA@1.5V; DDR: 35mA@1.5V. 4. Change the suspend code to run in iRAM; Signed-off-by: Anson Huang <b20788@freescale.com>
2011-08-16ENGR00154889-2: Add virtual iim driverTerry Lv
Add virtual iim driver. This driver will be used by MM team. Signed-off-by: Terry Lv <r65388@freescale.com>
2011-08-16ENGR00154889-1: Add virtual iim driver to imx5 and imx6 platformTerry Lv
This patch adds platform changes to system files, including: 1. Add viim platform deivce. 2. Add viim menu. Signed-off-by: Terry Lv <r65388@freescale.com>
2011-08-16ENGR00154890 [MX6Q]suspend/resume restore GPIO interrupt enable statusTony Lin
re-init GPIO interrupt to make GPIO interrupt workable after suspend/resume (dormant mode) Signed-off-by: Tony Lin <tony.lin@freescale.com>
2011-08-15Android: viv_gpu: imx6q: disable 2d & vgRichard Zhao
system bar can not display if we enable 2d & vg. Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
2011-08-15Merge branch 'imx_2.6.38' into imx_2.6.38_androidXinyu Chen
Conflicts: arch/arm/mach-mx6/board-mx6q_sabreauto.c
2011-08-15ENGR00154727 ESAI: Resolve i2c access problem when there is no audio cardLionel Xu
I2c device should not probe successfully when there is no such device on the bus. This will make i2c access failure later. Signed-off-by: Lionel Xu <R63889@freescale.com>
2011-08-12only register ipu0 for ipu device.Xinyu Chen
2011-08-12ENGR00139261 [MX6Q]support 8 bit MMC and eMMC DDR modeTony Lin
enable 8 bit MMC mode according to mmc stack. enable eMMC DDR mode according to mmc stack, but change sdhci a little, since sdhci does not support DDR mode so far. Signed-off-by: Tony Lin <tony.lin@freescale.com>
2011-08-11ENGR00139261-1 [esdhc]add 8 bit mode support para in platform dataTony Lin
set to 1 if the port on board supports 8 bit MMC card. else set to 0 Signed-off-by: Tony Lin <tony.lin@freescale.com>
2011-08-11ENGR00154704 usb-gadget: wmb is needed after dtd pointer is updated for armv7Peter Chen
At armv7 SoC, the dma_alloc_coherent returns non-cachable, but bufferable region, so the driver needs to drain write buffer by itself, if the controller needs to visit dma buffer immediately after cpu writes There is a discussion for this armv7 change: http://marc.info/?t=127918539100004&r=1&w=2 For this issue, the next dtd pointer is invalid sometimes, the reason is the region which is used to store dtd is dma buffer, so the data may not be written to memory when the controller visit this data. Signed-off-by: Peter Chen <peter.chen@freescale.com>
2011-08-11ENGR00154703 usb-gadget: fix spin_lock recursion problem at SMP platformPeter Chen
- The spin_lock is at interrupt handler, so all code routines using at interrupt handler are forbidden to hold spin_lock again - Move the code which needs to be protected by spin_lock to workqueue, and it will be called when workqueue is scheduled. Signed-off-by: Peter Chen <peter.chen@freescale.com>
2011-08-11ENGR00154705 [MX6Q]suspend/resume sometimes hangAnson Huang
1. Better to write disable and reset together into SRC_SCR register; 2. Should wait for reset done. Signed-off-by: Anson Huang <b20788@freescale.com>
2011-08-11Enable ipu device driverXinyu Chen
As ipuv3 has changed the interface to support multi ipu instance, without ipu_device driver updated, we must porting ipu_device driver to only use first ipu. For ipu user space lib, just change the include/linux/ipu.h, revert the mutli ipu instance interface change, copy to linux-lib.git.
2011-08-11ENGR00154382 usb-udc: Set fsl arc usb driver as default usb device driverPeter Chen
Set fsl arc usb device driver as default usb device driver Signed-off-by: Peter Chen <peter.chen@freescale.com>
2011-08-10ENGR00154648 [Mx6]SMP hotplug sometimes hangAnson Huang
1. boot_secondary ioremap need unmap, or the stress test of hot-plug and suspend/resume will cause the virtual address space leak; 2. Disable secondary CPUs need done by CPU0, move the SRC_SCR setting to platform_cpu_kill. Signed-off-by: Anson Huang <b20788@freescale.com>
2011-08-10Disable the virtual console and framebuffer consoleXinyu Chen
2011-08-10ENGR00154647 mxc: viv-gpu: squash gpu devicesRichard Zhao
gpu multi-core dirver 4.4.2 needs one single gpu device. Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
2011-08-09ENGR00154437 mxc edid: add cea extend revision 1 and 2 supportJason Chen
Add cea extend revision 1 and 2 support. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-08-09Update mx6 android defconfig to enable cs42888 codec.Xinyu Chen
Resolve the touch intr pin request conflict. Add ipuv3 fb earlysuspend callbacks. Avoid the cs42888 suspend/resume failed issue when we do not have the audio extension board (cs42888 on it) connected. Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
2011-08-09ENGR00154526 MX5x, SSI: audio capture not supportedZeng Zhaoming
Audio capture not support in 2.6.38 kernel, it is caused by not setting ssi correctly in clock and sync method. Signed-off-by: Zeng Zhaoming <b32542@freescale.com>
2011-08-09ENGR00154525 SDMA: SDMA not works when event number bigger than 32Zeng Zhaoming
New sdma driver in 2.6.38 kernel not map event to channel correctly by ignore events bigger than 32. Fix it by remove this restriction Signed-off-by: Zeng Zhaoming <b32542@freescale.com>
2011-08-09ENGR00139247-6 DMA : add DMA support for imx6qHuang Shijie
add the dma support for imx6q. Signed-off-by: Huang Shijie <b32955@freescale.com>
2011-08-09ENGR00139247-5 ARM: add APBH-DMA device for imx6QHuang Shijie
add the dma device for imx6q. Signed-off-by: Huang Shijie <b32955@freescale.com>
2011-08-09ENGR00139247-4 ARM: add APBH-DMA arch code for imx6qHuang Shijie
add the arch code for APBH-DMA. Signed-off-by: Huang Shijie <b32955@freescale.com>
2011-08-09ENGR00139247-3 MTD : add GPMI driver for IMX6QHuang Shijie
add the gpmi driver for imx6q. Signed-off-by: Huang Shijie <b32955@freescale.com>
2011-08-09ENGR00139247-2 MX6Q: add GPMI deviceHuang Shijie
add gpmi device for sabreauto platform. Signed-off-by: Huang Shijie <b32955@freescale.com>
2011-08-09ENGR00139247-1 MX6Q: add arch support for GPMIHuang Shijie
add the arch code for GPMI. Signed-off-by: Huang Shijie <b32955@freescale.com>
2011-08-08ENGR00154431 - MXCFB_SET_WAVEFORMS ioctl brokenDanny Nold
- Fixed bug in how new waveform set is copied into EPDC driver internal copy of waveform modes. Signed-off-by: Danny Nold <dannynold@freescale.com>
2011-08-08ENGR00154429 rtc-snvs: request_irq too earlyRichard Zhao
request_irq should be after hw init. It can avoid meaningless interrupt. Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
2011-08-08ENGR00154429 rtc-snvs: request_irq too earlyRichard Zhao
request_irq should be after hw init. It can avoid meaningless interrupt. Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
2011-08-05Merge branch 'imx_2.6.38' into imx_2.6.38_androidXinyu Chen
2011-08-05ENGR00154108-3 mxc ldb: make ldb support two ipu in separate modeJason Chen
make ldb support two ipu in separate mode cmdline option changed: "ldb=spl0/1" -- split mode on DI0/1 "ldb=dul0/1" -- dual mode on DI0/1 "ldb=sin0/1" -- single mode on LVDS0/1 "ldb=sep0/1" -- separate mode begin from LVDS0/1 there are two LVDS channels(LVDS0 and LVDS1) which can transfer video datas, there two channels can be used as split/dual/single/separate mode. split mode means display data from DI0 or DI1 will send to both channels LVDS0+LVDS1. dual mode means display data from DI0 or DI1 will be duplicated on LVDS0 and LVDS1, it said, LVDS0 and LVDS1 has the same content. single mode means only work for DI0/DI1->LVDS0 or DI0/DI1->LVDS1. separate mode means you can make DI0/DI1->LVDS0 and DI0/DI1->LVDS1 work at the same time. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-08-05ENGR00154108-2 imx6q MSL: make ldb support two ipu in separate modeJason Chen
make ldb support two ipu in separate mode. Signed-off-by: Jason Chen <b02280@freescale.com>
2011-08-05ENGR00154108-1 fsl_devices.h: make ldb support two ipu in separate modeJason Chen
make ldb support two ipu in separate mode Signed-off-by: Jason Chen <b02280@freescale.com>
2011-08-04ENGR00154346 UART: fix uart deadlockZeng Zhaoming
UART hold the following locks in order of: imx_set_termios(): --> spin_lock_irqsave(&sport->port.lock, flags) del_timer_sync(&sport->timer); --> spin_lock(timer->base->lock); --> spin_unlock(timer->base->lock); spin_unlock_irqrestore(&sport->port.lock); while when imx_timeout() may invoked in following stack: run_timer_softirq(): --> spin_lock_irqsave(timer->base->lock, flags); imx_timeout(); --> spin_lock_irqsave(&sport->port.lock, flags); ...; --> spin_unlock_irqrestore(&sport->port.lock, flags); spin_unlock_irqrestore(timer->base->lock, flags); the above two cases hold lock with revert order, may deadlock in SMP platform. Signed-off-by: Zeng Zhaoming <b32542@freescale.com>
2011-08-04ARM: 6889/1: futex: add SMP futex support when !CPU_USE_DOMAINSWill Deacon
This patch uses the load/store exclusive instructions to add SMP futex support for ARM. Since the ARM architecture does not provide instructions for unprivileged exclusive memory accesses, we can only provide SMP futexes when CPU domain support is disabled. Cc: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2011-08-04arm: Remove bogus comment in futex_atomic_cmpxchg_inatomic()Thomas Gleixner
commit 522d7dec(futex: Remove redundant pagefault_disable in futex_atomic_cmpxchg_inatomic()) added a bogus comment. /* Note that preemption is disabled by futex_atomic_cmpxchg_inatomic * call sites. */ Bogus in two aspects: 1) pagefault_disable != preempt_disable even if the mechanism we use is the same 2) we have a call site which deliberately does not disable pagefaults as it wants the possible fault to be handled - though that has been changed for consistency reasons now. Sigh. I really should have seen that when committing the above. :( Catched-by-and-rightfully-ranted-at-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> LKML-Reference: <alpine.LFD.2.00.1103141126590.2787@localhost6.localdomain6> Cc: Michel Lespinasse <walken@google.com> Cc: Darren Hart <darren@dvhart.com>
2011-08-04futex: Sanitize futex ops argument typesMichel Lespinasse
Change futex_atomic_op_inuser and futex_atomic_cmpxchg_inatomic prototypes to use u32 types for the futex as this is the data type the futex core code uses all over the place. Signed-off-by: Michel Lespinasse <walken@google.com> Cc: Darren Hart <darren@dvhart.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Matt Turner <mattst88@gmail.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: David Howells <dhowells@redhat.com> Cc: Tony Luck <tony.luck@intel.com> Cc: Michal Simek <monstr@monstr.eu> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Paul Mundt <lethal@linux-sh.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Chris Metcalf <cmetcalf@tilera.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> LKML-Reference: <20110311025058.GD26122@google.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>