1)Update MXC V4L2 capture driver for 2.6.31 kernel.
2)Update ov3640 camera and ov2640 camera driver for 2.6.31 kernel.
Signed-off-by: Liu Ying <b17645@freescale.com>
irq handler should be re-register to the correct FB's ipu channel.
Signed-off-by: Jason Chen <b02280@freescale.com>
(cherry picked from commit 37140ac9a62a382a6d206aa0754eedac90a151c0)
The battery charger driver contains 37xx specific battery charger
driver code that is incompatible with 378x/iMX23 and needs removal
Signed-off-by: Robert Lee <robert.lee@freescale.com>
ASRC can not work correctly when SPDIF_TX provides clock for asrc input
or output. The root cause is, the clock divider should be set as 6 if
SPDIF_TX provides the bit clock for ASRC, and be set as 7 if SPDIF_RX
provides the bit clock.
Signed-off-by: William Lai <b04597@freescale.com>
IPU channel disable should wait all channels finish busy state, should
wait for input dma interrupt first then output dma interrupt as the
correct sequence for all channels. This patch fix the DQ_BUF fail issue
in VPU unit test.
Signed-off-by: Jason Chen <b02280@freescale.com>
IPU channel disable should wait all channels finish busy state, should
wait for input dma interrupt as the correct finish signal for all
channels. This patch fix the DQ_BUF fail issue in VPU unit test.
Signed-off-by: Jason Chen <b02280@freescale.com>
Remove system timer restore codes in suspend and resume operations
since rtc class driver has done it. After removing these codes, srtc
driver can be built as module
Signed-off-by: Lily Zhang <r58066@freescale.com>
When executing the below operations (Open device -> Call
RTC_AIE_ON -> Close device), alarm interrupt can be received
when alarm time expires. This is because all interrupts are
cleared wrongly when the device is closed.
Signed-off-by: Lily Zhang <r58066@freescale.com>
Separate chromakey setting for s1 and s0.
Set chromakey for S1 via S_FMT
set chromakey for S0 via S_CTRL (with private CID)
Current V4l2 framework can not support this case with only S_FMT.
Signed-off-by: Robby Cai <r63905@freescale.com>
The keypad interrupt registering must be put at the end of probe,
behind the timer init. Otherwise, interrupt will occur during keypad initial.
Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
1.When inserting OneWire module at the second time, the error is reported.
This is because irq information isnot cleaned when removing the module.
2. Correct error handling in probe function.
Signed-off-by: Lily Zhang <r58066@freescale.com>
1) Set camera iomux when initializing camera device, and reset camera iomux
when camera driver disconnects with v4l2 capture master.
2) Remove the forcing debug messages.
Signed-off-by: Liu Ying <b17645@freescale.com>
MX233: Restructure the STMP378xxx USB Host and Gadget device structures
to be similar to MXC structures. Enable fsl_otg_arc driver to work on
MX233 platform. Remove FSL_USB2_DONT_REMAP requirement.
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Conflicts:
arch/arm/mach-stmp3xxx/Kconfig
arch/arm/mach-stmp3xxx/Makefile
arch/arm/mach-stmp3xxx/devices.c
arch/arm/mach-stmp3xxx/include/mach/stmp3xxx.h
arch/arm/mach-stmp3xxx/stmp378x_devb.c
Mask WM8350 GPIO and RTC interrupt, to avoid heavy data traffic on I2C
bus, which may incur kernel panic when system reboot.
Signed-off-by: Lionel Xu <r63889@freescale.com>
Putting PXP in reset state gains the lowest power.
Restrore the PXP regs once PXP comes out of reset state.
Signed-off-by: Robby Cai <r63905@freescale.com>
USB will enter low power mode if no vbus power supply.
Only finished this feature in Mx37.
1. When enter low power mode, driver will close usb related clocks
as possible as could.
set usb IP to stop.
Set PHY to low power suspend by setting PHCD bit of portsc.
2. This patch doesn't support low power mode in OTG mode yet.
Signed-off-by: Albert Chen <r65187@freescale.com>
Use IC channel to do input cropping even when other conditions make the
V4L2 output driver to bypass IC channel.
Signed-off-by: Liu Ying <b17645@freescale.com>
Nand status does not correct on MX51 TO2 and TO3.
1. Should use RBB_MODE 1 instead of 0 due to NFC bug(ENGcm09970)
For RBB_MODE 0,NFC has a bug,it doesn't sample correctly the
returned data on the I/O and therefore the INT is
asserted earlier than expected (i.e during the busy period)
2. Should use atomic status read instead of auto mode.
Auto mode status is not correct, the WP bit (IO7)
is not correct randomly, it wrongly report nand in write-protect
mode, which result in program/erase fail.
Signed-off-by:Jason Liu <r64343@freescale.com>
When framebuffer is being initialized in probe, don't allocate memory
for FB if it has memory resource already.
Signed-off-by: Liu Ying <b17645@freescale.com>
If did not set_var, fb driver will not allocate buffers. If user call
fb_set_var with the same size as fb default setting(in mxcfb_probe,
usually 240x320),fb drvier will not call mxcfb_set_par if no
FB_ACTIVATE_FORCE flag set, which will make mmap fail.
Allocate fb buffers in mxcfb_probe avoid such issue, but it will consume
memory at the very beginning.
Signed-off-by: Jason Chen <b02280@freescale.com>
This is gadget file storage changes needed for STMP universal updater
tool (manufacturing flashing tool).
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Some i.MX parts (MX31, MX37) need to have usb host queue descriptors
and/or buffers in on-chip IRAM in cases of heavily loaded memory
system (i.e. large LCDs).
Signed-off-by: Dinh Nguyen <r00091@freescale.com>
the USBPHY of STMP3xxx SoC has bug. The usb port power
is never enabled during standard ehci reset procedure if the
external device once passed plug/unplug procedure. This work-
around resets and reinitiates USBPHY before the ehci port reset
sequence started.
Signed-off-by: Rob Herring <r.herring@freescale.com>
This patch fix OTG pin-detect failure issue.
via sysfs set power/wakeup, i.MX51 can:
Put usb phy into low power mode when system enters stop or
standby mode; Enable usb device remote wakeup system by Vbus
and usb host remote wakeup system by device connection or
disconnection.
Signed-off-by: Li Jun <r65092@freescale.com>
Add custom register read/write functions. Some i.MX 3-stack boards
have CPLD to do spi to parallel bus translation to talk to smsc911x.
Signed-off-by: Rob Herring <r.herring@freescale.com>
The fec driver was enabling receive buffer descriptor without allocating
the buffers. Make sure the buffer descriptors are initialized to not
start receiving packets.
Signed-off-by: Rob Herring <r.herring@freescale.com>
Since it's not allowed to do synchronous I2C in the HR timer callback
context we have to switch to using the global workqueue. The work is
scheduled every 1ms when polling rather than 5 us.
Signed-off-by: Richard Röjfors <richard.rojfors.ext@mocean-labs.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
mii_discover_phy is only called by fec_enet_mii (via mip->mii_func). So
&fep->mii_lock is already held and mii_discover_phy must not call
mii_queue which locks &fep->mii_lock, too.
This was noticed by lockdep:
=============================================
[ INFO: possible recursive locking detected ]
2.6.31-rc8-00038-g37d0892 #109
---------------------------------------------
swapper/1 is trying to acquire lock:
(&fep->mii_lock){-.....}, at: [<c01569f8>] mii_queue+0x2c/0xcc
but task is already holding lock:
(&fep->mii_lock){-.....}, at: [<c0156328>] fec_enet_interrupt+0x78/0x460
other info that might help us debug this:
2 locks held by swapper/1:
#0: (rtnl_mutex){+.+.+.}, at: [<c0183534>] rtnl_lock+0x18/0x20
#1: (&fep->mii_lock){-.....}, at: [<c0156328>] fec_enet_interrupt+0x78/0x460
stack backtrace:
Backtrace:
[<c00226fc>] (dump_backtrace+0x0/0x108) from [<c01eac14>] (dump_stack+0x18/0x1c)
r6:c781d118 r5:c03e41d8 r4:00000001
[<c01eabfc>] (dump_stack+0x0/0x1c) from [<c005bae4>] (__lock_acquire+0x1a20/0x1a88)
[<c005a0c4>] (__lock_acquire+0x0/0x1a88) from [<c005bbac>] (lock_acquire+0x60/0x74)
[<c005bb4c>] (lock_acquire+0x0/0x74) from [<c01edda8>] (_spin_lock_irqsave+0x54/0x68)
r7:60000093 r6:c01569f8 r5:c785e468 r4:00000000
[<c01edd54>] (_spin_lock_irqsave+0x0/0x68) from [<c01569f8>] (mii_queue+0x2c/0xcc)
r7:c785e468 r6:c0156b24 r5:600a0000 r4:c785e000
[<c01569cc>] (mii_queue+0x0/0xcc) from [<c0156b78>] (mii_discover_phy+0x54/0xa8)
r8:00000002 r7:00000032 r6:c785e000 r5:c785e360 r4:c785e000
[<c0156b24>] (mii_discover_phy+0x0/0xa8) from [<c0156354>] (fec_enet_interrupt+0xa4/0x460)
r5:c785e360 r4:c077a170
[<c01562b0>] (fec_enet_interrupt+0x0/0x460) from [<c0066674>] (handle_IRQ_event+0x48/0x120)
[<c006662c>] (handle_IRQ_event+0x0/0x120) from [<c0068438>] (handle_level_irq+0x94/0x11c)
...
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Matt Waddel <Matt.Waddel@freescale.com>
Cc: netdev@vger.kernel.org
Cc: Tim Sander <tim01@vlsi.informatik.tu-darmstadt.de>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4d7a5644e4adfafe76c2bd8ee168e3f3b5dae3a8 upstream.
Add missing newline to dev_warn() message string. This is more of an issue
with older kernels that don't automatically add a newline if it was missing
from the end of the previous line.
Signed-off-by: Dean Nelson <dnelson@redhat.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
commit 7152b592593b9d48b33f8997b1dfd6df9143f7ec upstream.
This patch (as1352) fixes a bug in the way isochronous input data is
returned to userspace for usbfs transfers. The entire buffer must be
copied, not just the first actual_length bytes, because the individual
packets will be discontiguous if any of them are short.
Reported-by: Markus Rechberger <mrechberger@gmail.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
