]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
11 years agomtd: gpmi-nand: move to dma_transfer_direction
Shawn Guo [Tue, 13 Dec 2011 15:48:06 +0000 (23:48 +0800)]
mtd: gpmi-nand: move to dma_transfer_direction

This patch fixes usage of dma direction to adopt dma_transfer_direction.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
11 years agomtd: gpmi: add missing include 'module.h'
Wolfram Sang [Wed, 23 Nov 2011 14:57:06 +0000 (15:57 +0100)]
mtd: gpmi: add missing include 'module.h'

Fixes:

drivers/mtd/nand/gpmi-nand/gpmi-nand.c: In function 'gpmi_nfc_init':
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1475:16: error: 'THIS_MODULE' undeclared (first use in this function)
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1475:16: note: each undeclared identifier is reported only once for each function it appears in
drivers/mtd/nand/gpmi-nand/gpmi-nand.c: At top level:
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1617:15: error: expected declaration specifiers or '...' before string constant
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1617:1: warning: data definition has no type or storage class
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:1617:1: warning: type defaults to 'int' in declaration of 'MODULE_AUTHOR'

and some more...

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
11 years agoENGR00173287 remove build warning in SDHC driver platform code
Ryan QIAN [Mon, 9 Jan 2012 08:08:18 +0000 (16:08 +0800)]
ENGR00173287 remove build warning in SDHC driver platform code

- remove unused 'u32 reg' in platform code

Signed-off-by: Ryan QIAN <b32804@freescale.com>
11 years agoENGR00173286 merge "eMMC: improve boot_info message output"
Ryan QIAN [Sat, 7 Jan 2012 04:38:06 +0000 (12:38 +0800)]
ENGR00173286 merge "eMMC: improve boot_info message output"

ENGR133884 eMMC: improve boot_info message output

Output bit means of important esd_csd register

Read esd_csd info each time when cat boot_info
becasue user may change config affect esd_csd
value.

boot_info:0x07;
  ALT_BOOT_MODE:1 - Supports alternate boot method
  DDR_BOOT_MODE:1 - Supports alternate dual data rate during boot
  HS_BOOTMODE:1 - Supports high speed timing during boot
boot_size:0512KB
  boot_partition:0x48;
  BOOT_ACK:1 - Boot acknowledge sent during boot operation
  BOOT_PARTITION-ENABLE: 1 - Boot partition 1 enabled
  PARTITION_ACCESS:0 - No access to boot partition
boot_bus:0x01
  BOOT_MODE:0 - Use single data rate + backward compatible timings
in boot operation
  RESET_BOOT_BUS_WIDTH:0 - Reset bus width to x1, single data rate
and backward compatible timings after boot operation
  BOOT_BUS_WIDTH:1 - x4 (sdr/ddr) bus width in boot operation mode

Signed-off-by: Frank Li <Frank.Li@freescale.com>
Signed-off-by: Ryan QIAN <b32804@freescale.com>
11 years agoENGR00173284 merge "eMMC: Configure boot_partition_enable"
Ryan QIAN [Sat, 7 Jan 2012 04:32:40 +0000 (12:32 +0800)]
ENGR00173284 merge "eMMC: Configure boot_partition_enable"

ENGR126228 eMMC: Configure boot_partition_enable

Enable the configurations of the boot enable on the eMMC cards.

Add the interface that used to configure the boot_bus_width

In order to make sure that the re-read the ext-csd of card
can be completed successfully, add the method to wait for
the finish of the busy state.

NOTE:
The following are the valid inputs when configure the boot
bus width of the eMMC cards.
+--------------------------------------------------------------------+
| Bit7 Bit6 Bit5 | Bit4 Bit3 | Bit2                 | Bit1 Bit0      |
|----------------|----------------------------------|----------------|
| X              | BOOT_MODE | RESET_BOOT_BUS_WIDTH | BOOT_BUS_WIDTH |
+--------------------------------------------------------------------+
Bit [4:3] : BOOT_MODE (non-volatile)
0x0 : Use single data rate + backward compatible timings in boot
operation (default)
0x1 : Use single data rate + high speed timings in boot operation mode
0x2 : Use dual data rate in boot operation
0x3 : Reserved
Bit [2]: RESET_BOOT_BUS_WIDTH (non-volatile)
0x0 : Reset bus width to x1, single data rate and backward compatible
timings after boot operation (default)
0x1 : Retain boot bus width and boot mode after boot operation
Bit[1:0] : BOOT_BUS_WIDTH (non-volatile)
0x0 : x1 (sdr) or x4 (ddr) bus width in boot operation mode (default)
0x1 : x4 (sdr/ddr) bus width in boot operation mode
0x2 : x8 (sdr/ddr) bus width in boot operation mode
0x3 : Reserved

The following are the valid inputs when configure the boot
partitions of the eMMC cards.
+------------------------------------------------------------+
| Bit7 | Bit6     | Bit5 Bit4 Bit3        | Bit2 Bit1 Bit0   |
|------|----------|-----------------------|------------------|
| X    | BOOT_ACK | BOOT_PARTITION_ENABLE | PARTITION_ACCESS |
+------------------------------------------------------------+
Bit7: Reserved
Bit6: always set to vaule '1' when boot_part is enabled
Bit[5:3]:
0x0 : Device not boot enabled (default)
0x1 : Boot partition 1 enabled for boot
0x2 : Boot partition 2 enabled for boot
0x7 : User area enabled for boot
Bit[2:0]:
0x0 : No access to boot partition (default)
0x1 : R/W boot partition 1
0x2 : R/W boot partition 2
So only the '0, 1, 2; 8, 9, 10; 16, 17, 18; 56, 57, 58' are
valid parameters when configure the boot_partiton.

Signed-off-by: Richard Zhu <r65037@freescale.com>
Signed-off-by: Ryan QIAN <b32804@freescale.com>
11 years agoENGR00173283 merge "eMMC: Boot Partition switch func used in MFG tool"
Ryan QIAN [Sat, 7 Jan 2012 04:20:28 +0000 (12:20 +0800)]
ENGR00173283 merge "eMMC: Boot Partition switch func used in MFG tool"

ENGR125411 eMMC: Boot Partition switch func used in MFG tool

User can get eMMC partitions info from user space layer in
linux OS enviroment.
User can do switch operations between the eMMC boot partitions
and the user partition.
User can access the eMMC boot partitions from user space layer
in linux OS enviroment.
NOTE:This func had been verified on TOSHIBA eMMC44 card only.

Signed-off-by: Richard Zhu <r65037@freescale.com>
Signed-off-by: Rob Herring <r.herring@freescale.com>
Signed-off-by: Ryan QIAN <b32804@freescale.com>
11 years agomtd: fix compile error for gpmi-nand
Huang Shijie [Tue, 13 Dec 2011 15:48:05 +0000 (23:48 +0800)]
mtd: fix compile error for gpmi-nand

The driver gpmi-nand should compile at least.  This patch adds the
missing gpmi-nand.h to fix the compile error below.

  CC      drivers/mtd/nand/gpmi-nand/gpmi-nand.o
  CC      drivers/mtd/nand/gpmi-nand/gpmi-lib.o
drivers/mtd/nand/gpmi-nand/gpmi-nand.c:25:33: fatal error: linux/mtd/gpmi-nand.h: No such file or directory
drivers/mtd/nand/gpmi-nand/gpmi-lib.c:21:33: fatal error: linux/mtd/gpmi-nand.h: No such file or directory

This header is grabbed from patch below, which has not been postponed
for merging.

  [PATCH v8 1/4] ARM: mxs: add GPMI-NAND support for imx23/imx28
  http://permalink.gmane.org/gmane.linux.drivers.mtd/37338

Signed-off-by: Huang Shijie <b32955@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
11 years agomtd: add the common code for GPMI-NAND controller driver
Huang Shijie [Thu, 8 Sep 2011 02:47:09 +0000 (10:47 +0800)]
mtd: add the common code for GPMI-NAND controller driver

These files contain the common code for the GPMI-NAND driver.

Signed-off-by: Huang Shijie <b32955@freescale.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Tested-by: Koen Beel <koen.beel@barco.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
11 years agomtd: add GPMI-NAND driver in the config and Makefile
Huang Shijie [Thu, 8 Sep 2011 02:47:11 +0000 (10:47 +0800)]
mtd: add GPMI-NAND driver in the config and Makefile

add the GPMI-NAND driver in the relevant Kconfig and Makefile in the MTD.

Signed-off-by: Huang Shijie <b32955@freescale.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Tested-by: Koen Beel <koen.beel@barco.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
11 years agomtd: add helper functions library and header files for GPMI NAND driver
Huang Shijie [Thu, 8 Sep 2011 02:47:10 +0000 (10:47 +0800)]
mtd: add helper functions library and header files for GPMI NAND driver

bch-regs.h : registers file for BCH module
gpmi-regs.h: registers file for GPMI module
gpmi-lib.c: helper functions library.

Signed-off-by: Huang Shijie <b32955@freescale.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Tested-by: Koen Beel <koen.beel@barco.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@intel.com>
11 years agoENGR00172362 mx6q-ard cleanup i2c board settings
Adrian Alonso [Wed, 18 Jan 2012 20:56:32 +0000 (14:56 -0600)]
ENGR00172362 mx6q-ard cleanup i2c board settings

* Clean i2c board settings for sabreauto platform
* Remove and unregister i2c0 device not used in this board
* Move i2c3 pads to general mx6q_sabreauto_pads[]
* [v2] add camera module ov3640 module to i2c2 bus

Signed-off-by: Adrian Alonso <aalonso@freescale.com>
11 years agoENGR00171946 SPI nor chip select update
Francisco Munoz [Fri, 13 Jan 2012 01:13:36 +0000 (19:13 -0600)]
ENGR00171946 SPI nor chip select update

SPI nor cannot be probed, due to a previous patch which
modified its chip select settings.

Signed-off-by: Francisco Munoz <b37752@freescale.com>
11 years agoENGR00172360-2 - MXC HDMI: New TO1.1 PLL5/PLL4 dividers not set up in clock code
Danny Nold [Thu, 19 Jan 2012 20:56:33 +0000 (14:56 -0600)]
ENGR00172360-2 - MXC HDMI: New TO1.1 PLL5/PLL4 dividers not set up in clock code

Due to the use of some higher frequencies for HDMI video modes, the
IPU clock set/get/round functions need to use 64-bit variables
for clock calculations instead of 32-bit variables.

Signed-off-by: Danny Nold <dannynold@freescale.com>
11 years agoENGR00172360-1 - MXC HDMI: New TO1.1 PLL5/PLL4 dividers not set up in clock co
Danny Nold [Thu, 19 Jan 2012 20:53:51 +0000 (14:53 -0600)]
ENGR00172360-1 - MXC HDMI: New TO1.1 PLL5/PLL4 dividers not set up in clock co

Update get_rate, set_rate, and round_rate for audio_video PLLs
to account for new dividers added for MX6Q TO1.1.  Since default value
for one of these dividers is 4, this is important for function of clocks
derived from PLL4 and PLL5.

Signed-off-by: Danny Nold <dannynold@freescale.com>
11 years agoENGR00172476 [USB Host]change the default wakeup value of RH
Tony LIU [Fri, 20 Jan 2012 03:14:54 +0000 (11:14 +0800)]
ENGR00172476 [USB Host]change the default wakeup value of RH

- change the default wakeup value of RH from enabled to disabled

Signed-off-by: Tony LIU <junjie.liu@freescale.com>
11 years agoENGR00172475 [USB]Add wakeup entry for USB device on Kernel3.0
Tony LIU [Fri, 20 Jan 2012 03:02:18 +0000 (11:02 +0800)]
ENGR00172475 [USB]Add wakeup entry for USB device on Kernel3.0

- in Kernel 3.0, all the wakeup entry is removed by default,
  we need add it manually

Signed-off-by: Tony LIU <junjie.liu@freescale.com>
11 years agoENGR00173271 [mx6q] Fix build break in imx6_updater_defconfig
Nancy Chen [Fri, 27 Jan 2012 10:55:42 +0000 (04:55 -0600)]
ENGR00173271 [mx6q] Fix build break in imx6_updater_defconfig

Enable PFUZE regulator.

Signed-off-by: Nancy Chen <Nancy.Chen@freescale.com>
11 years agoENGR00172375 MX6Q Sabresd: Enable camera sensors
Nancy Chen [Wed, 25 Jan 2012 15:39:01 +0000 (09:39 -0600)]
ENGR00172375 MX6Q Sabresd: Enable camera sensors

1. Enable parallel csi camera sensor, default sensor is ov5640
2. Enable mipi csi2 camera sensor, default sensor is ov5640
3. Rename to sabresd

Signed-off-by: Even Xu <b21019@freescale.com>
Signed-off-by: Nancy Chen <Nancy.Chen@freescale.com>
11 years agoENGR00172752-2 Remove usless code in pfuze100 regulator driver
Nancy Chen [Wed, 25 Jan 2012 15:01:36 +0000 (09:01 -0600)]
ENGR00172752-2 Remove usless code in pfuze100 regulator driver

Remove usless code in pfuze100 regulator driver

Signed-off-by: Robin Gong <b38343@freescale.com>
Signed-off-by: Nancy Chen <Nancy.Chen@freescale.com>
11 years agoENGR00172752-1 MX6Q: Add pfuze100 support for Sabre SD
Nancy Chen [Wed, 25 Jan 2012 15:00:48 +0000 (09:00 -0600)]
ENGR00172752-1 MX6Q: Add pfuze100 support for Sabre SD

  1. Add pfuze100's init fuction on board level
  2. Add mx6q_sabresd_pmic_pfuze100.c
  3. Rename to sabresd

Signed-off-by: Robin Gong <b38343@freescale.com>
Signed-off-by: Nancy Chen <Nancy.Chen@freescale.com>
11 years agoENGR00172676 MX6Q: Add suport for i.MX 6Q Sabre Smart Device
Nancy Chen [Tue, 24 Jan 2012 22:11:28 +0000 (16:11 -0600)]
ENGR00172676 MX6Q: Add suport for i.MX 6Q Sabre Smart Device

Add suport for i.MX 6Quad SABRE Smart Device.
Rename to SABRESD.

Signed-off-by: Tony Lin <tony.lin@freescale.com>
Signed-off-by: Nancy Chen <Nancy.Chen@freescale.com>
11 years agoENGR00172427 SPDIF: Add spdif build support.
Alan Tull [Thu, 12 Jan 2012 15:44:41 +0000 (09:44 -0600)]
ENGR00172427 SPDIF: Add spdif build support.

Add spdif to Makefile.

Signed-off-by: Alan Tull <r80115@freescale.com>
11 years agoENGR00172374-7 Sound: Asoc: fix the snd_soc_resume resume crash
Jason Liu [Tue, 10 Jan 2012 04:54:23 +0000 (12:54 +0800)]
ENGR00172374-7 Sound: Asoc: fix the snd_soc_resume resume crash

[  330.922320] [<800417e0>] (__bug+0x1c/0x24) from [<8007b4dc>] (__queue_work+0x24c/0x3f0)
[  330.930333] [<8007b4dc>] (__queue_work+0x24c/0x3f0) from [<8007b6e0>] (queue_work_on+0x38/0x40)
[  330.939039] [<8007b6e0>] (queue_work_on+0x38/0x40) from [<8007d568>] (queue_work+0x2c/0x58)
[  330.947401] [<8007d568>] (queue_work+0x2c/0x58) from [<803b83a4>] (snd_soc_resume+0x98/0xb8)
[  330.955852] [<803b83a4>] (snd_soc_resume+0x98/0xb8) from [<80280aa4>] (platform_pm_resume+0x2c/0x4c)
[  330.964996] [<80280aa4>] (platform_pm_resume+0x2c/0x4c) from [<80284388>] (pm_op+0xe4/0x11c)
[  330.973441] [<80284388>] (pm_op+0xe4/0x11c) from [<80284780>] (device_resume+0x78/0x13c)
[  330.981537] [<80284780>] (device_resume+0x78/0x13c) from [<802849d0>] (dpm_resume+0x144/0x194)
[  330.990154] [<802849d0>] (dpm_resume+0x144/0x194) from [<80284a2c>] (dpm_resume_end+0xc/0x18)
[  330.998692] [<80284a2c>] (dpm_resume_end+0xc/0x18) from [<8009cf18>] (suspend_devices_and_enter+0x78/0xb8)
[  331.008355] [<8009cf18>] (suspend_devices_and_enter+0x78/0xb8) from [<8009d010>] (enter_state+0xb8/0xe4)
[  331.017842] [<8009d010>] (enter_state+0xb8/0xe4) from [<8009c5b4>] (state_store+0x8c/0xc0)
[  331.026116] [<8009c5b4>] (state_store+0x8c/0xc0) from [<80223b20>] (kobj_attr_store+0x18/0x1c)
[  331.034740] [<80223b20>] (kobj_attr_store+0x18/0x1c) from [<801352ec>] (sysfs_write_file+0x104/0x184)
[  331.043969] [<801352ec>] (sysfs_write_file+0x104/0x184) from [<800e4ce8>] (vfs_write+0xb4/0x148)
[  331.052762] [<800e4ce8>] (vfs_write+0xb4/0x148) from [<800e4e4c>] (sys_write+0x40/0x70)
[  331.060781] [<800e4e4c>] (sys_write+0x40/0x70) from [<8003e380>] (ret_fast_syscall+0x0/0x30)

The commit:c4e133f ASoC: core: Don't schedule deferred_resume_work twice
commit c4e133f4e253b57e5d4409964a3b51f2d887e94b
Author: Stephen Warren <swarren@nvidia.com>
Date:   Wed May 25 14:06:41 2011 -0600

    ASoC: core: Don't schedule deferred_resume_work twice

    commit 82e14e8bdd88b69018fe757192b01dd98582905e upstream.

    For cards that have two or more DAIs, snd_soc_resume's loop over all
    DAIs ends up calling schedule_work(deferred_resume_work) once per DAI.
    Since this is the same work item each time, the 2nd and subsequent
    calls return 0 (work item already queued), and trigger the dev_err
    message below stating that a work item may have been lost.

    Solve this by adjusting the loop to simply calculate whether to run the
    resume work immediately or defer it, and then call schedule work (or not)
    one time based on that.

    Note: This has not been tested in mainline, but only in chromeos-2.6.38;
    mainline doesn't support suspend/resume on Tegra, nor does the mainline
    Tegra ASoC driver contain multiple DAIs. It has been compile-checked in
    mainline.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
changed the defaut behaviour for non-ac97 class which cause deferred_resume_work
was scheduled not by desire when card->num_rdt is zero.

Signed-off-by: Jason Liu <r64343@freescale.com>
11 years agoENGR00172374-6: fix the mlb modules build errors
Jason Liu [Mon, 9 Jan 2012 07:58:11 +0000 (15:58 +0800)]
ENGR00172374-6: fix the mlb modules build errors

/home/r64343/work_space/linux-2.6/drivers/mxc/mlb/mxc_mlb150.c: In function 'mlb_tx_isr':
/home/r64343/work_space/linux-2.6/drivers/mxc/mlb/mxc_mlb150.c:1351: error: 'TASK_INTERRUPTIBLE' undeclared (first use in this function)
/home/r64343/work_space/linux-2.6/drivers/mxc/mlb/mxc_mlb150.c:1351: error: (Each undeclared identifier is reported only once
/home/r64343/work_space/linux-2.6/drivers/mxc/mlb/mxc_mlb150.c:1351: error: for each function it appears in.)
/home/r64343/work_space/linux-2.6/drivers/mxc/mlb/mxc_mlb150.c: In function 'mlb_rx_isr':
/home/r64343/work_space/linux-2.6/drivers/mxc/mlb/mxc_mlb150.c:1400: error: 'TASK_INTERRUPTIBLE' undeclared (first use in this function)
/home/r64343/work_space/linux-2.6/drivers/mxc/mlb/mxc_mlb150.c: In function 'mxc_mlb150_read':
/home/r64343/work_space/linux-2.6/drivers/mxc/mlb/mxc_mlb150.c:1828: error: 'TASK_INTERRUPTIBLE' undeclared (first use in this function)
/home/r64343/work_space/linux-2.6/drivers/mxc/mlb/mxc_mlb150.c:1828: error: implicit declaration of function 'signal_pending'
/home/r64343/work_space/linux-2.6/drivers/mxc/mlb/mxc_mlb150.c:1828: error: implicit declaration of function 'schedule'

missing one header file: sched.h, add it to fix it.

Signed-off-by: Jason Liu <r64343@freescale.com>
11 years agoENGR00172374-5: GPIO: use chained_irq_enter/exit pair
Jason Liu [Mon, 9 Jan 2012 07:28:39 +0000 (15:28 +0800)]
ENGR00172374-5: GPIO: use chained_irq_enter/exit pair

Kernel oops when plug in/out sd card and throw out null pointer

this is due to: commit: 1a01753 ARM: gic: use handle_fasteoi_irq for SPIs

commit 1a01753ed90a4fb84357b9b592e50564c07737f7
Author: Will Deacon <will.deacon@arm.com>
Date:   Wed Feb 9 12:01:12 2011 +0000

    ARM: gic: use handle_fasteoi_irq for SPIs

    Currently, the gic uses handle_level_irq for handling SPIs (Shared
    Peripheral Interrupts), requiring active interrupts to be masked at
    the distributor level during IRQ handling.

    On a virtualised system, only the CPU interfaces are virtualised in
    hardware. Accesses to the distributor must be trapped by the
    hypervisor, adding latency to the critical interrupt path in Linux.

    This patch modifies the GIC code to use handle_fasteoi_irq for handling
    interrupts, which only requires us to signal EOI to the CPU interface
    when handling is complete. Cascaded IRQ handling is also updated to use
    the chained IRQ enter/exit functions to honour the flow control of the
    parent chip.

    Note that commit 846afbd1 ("GIC: Dont disable INT in ack callback")
    broke cascading interrupts by forgetting to add IRQ masking. This is
    no longer an issue because the unmask call is now unnecessary.

    Tested on Versatile Express and Realview EB (1176 w/ cascaded GICs).

Tested-and-reviewed-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
Tested-and-acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
the above commit has removed the irq_ack from gic chip tus the following call:
desc->irq_data.chip->irq_ack(&desc->irq_data);
will trow the kernel oops, to fix it, just involve the pair to fix it.

chained_irq_enter(chip, desc);
chained_irq_exit(chip, desc);

This also aligns the upstream kernel doing such as v3.2

Signed-off-by: Jason Liu <r64343@freescale.com>
11 years agoENGR00172374-4: remove platform _adjust_dma_zone function
Jason Liu [Mon, 9 Jan 2012 05:11:57 +0000 (13:11 +0800)]
ENGR00172374-4: remove platform _adjust_dma_zone function

fix the compiling warnings when upgrade to v3.0

arch/arm/mm/init.c:215: warning: 'arm_adjust_dma_zone' defined but not used

The commit: be20902 ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes by
Russell has make the _adjust_dma_zone function the common help function, thus
we can remove platform _adjust_dma_zone function by just define:ARM_DMA_ZONE_SIZE

commit be20902ba67de70b38c995903321f4152dee57b7
Author: Russell King <rmk+kernel@arm.linux.org.uk>
Date:   Wed May 11 15:39:00 2011 +0100

    ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes

    Rather than each platform providing its own function to adjust the
    zone sizes, use the new ARM_DMA_ZONE_SIZE definition to perform this
    adjustment.  This ensures that the actual DMA zone size and the
    ISA_DMA_THRESHOLD/MAX_DMA_ADDRESS definitions are consistent with
    each other, and moves this complexity out of the platform code.

Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Jason Liu <r64343@freescale.com>
11 years agoENGR00172374-3: flexcan: use irq_set_irq_wake
Jason Liu [Thu, 19 Jan 2012 06:04:43 +0000 (14:04 +0800)]
ENGR00172374-3: flexcan: use irq_set_irq_wake

fix the building errors when upgrade to v3.0

The following commit change the function name:
commit a0cd9ca2b907d7ee26575e7b63ac92dad768a75e
Author: Thomas Gleixner <tglx@linutronix.de>
Date:   Thu Feb 10 11:36:33 2011 +0100

    genirq: Namespace cleanup

    The irq namespace has become quite convoluted. My bad.  Clean it up
    and deprecate the old functions. All new functions follow the scheme:

    irq number based:
        irq_set/get/xxx/_xxx(unsigned int irq, ...)

    irq_data based:
         irq_data_set/get/xxx/_xxx(struct irq_data *d, ....)

    irq_desc based:
         irq_desc_get_xxx(struct irq_desc *desc)

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
We need give one fix to change the function call name to align this change,

-       ret = set_irq_wake(dev->irq, 1);
+       ret = irq_set_irq_wake(dev->irq, 1);

Signed-off-by: Jason Liu <r64343@freescale.com>
11 years agoENGR00172374-2: pfuze: use pdata_size from mfd_cell struct
Jason Liu [Thu, 19 Jan 2012 05:52:13 +0000 (13:52 +0800)]
ENGR00172374-2: pfuze: use pdata_size from mfd_cell struct

fix the building errors when upgrade to v3.0

we use data_size from mfd_cell struct on 2.6.38, but after that
there are some changes for this field of mfd_cell struct, see:

commit 40e03f571b2e63827f2afb90ea9aa459612c29e3
Author: Andres Salomon <dilinger@queued.net>
Date:   Thu Feb 17 19:07:24 2011 -0800

    mfd: Drop data_size from mfd_cell struct

    Now that there are no more users of this, drop it.

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
and this:

commit eb8956074e7652e802be5f078080c704c2c87104
Author: Samuel Ortiz <sameo@linux.intel.com>
Date:   Wed Apr 6 16:52:52 2011 +0200

    mfd: Add platform data pointer back

    Now that we have a way to pass MFD cells down to the sub drivers,
    we can gradually get rid of mfd_data by putting the platform pointer
    back in place.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
But the above commit also change the name from data_size to pdata_size,
This patch just give one fix for the pfuze driver to use pdata_size field.

Signed-off-by: Jason Liu <r64343@freescale.com>
11 years agoENGR00172374-1 i.mx: CPUFREQ: not use cpufreq_debug_printk
Jason Liu [Fri, 6 Jan 2012 09:37:29 +0000 (17:37 +0800)]
ENGR00172374-1 i.mx: CPUFREQ: not use cpufreq_debug_printk

fix the building errors when upgrade to v3.0

commit: d06d8c [CPUFREQ] use dynamic debug instead of custom infrastructure
has removed cpufreq_debug_printk, we will give one update for i.mx driver

Signed-off-by: Jason Liu <r64343@freescale.com>
11 years agoENGR00172281 GPMI : fix the wrong flag for send_page()
Huang Shijie [Wed, 18 Jan 2012 04:45:45 +0000 (12:45 +0800)]
ENGR00172281 GPMI : fix the wrong flag for send_page()

There is only one DMA command in the chain,
So MXS_DMA_F_APPEND is not needed.

Signed-off-by: Huang Shijie <b32955@freescale.com>
11 years agoENGR00172222:imx6_defconfig: enable ARM errata software workaround 764369
Jason Liu [Tue, 17 Jan 2012 11:00:30 +0000 (19:00 +0800)]
ENGR00172222:imx6_defconfig: enable ARM errata software workaround 764369

We need enable the following ARM errata software workaround:

    CONFIG_ARM_ERRATA_764369=y

This errata is TKT078684 in i.MX6Q errata list.

In order to enable this errata, we need cherry-pick the following commit:
ARM: 7091/1: errata: D-cache line maintenance operation by MVA may not succeed:
f64f6df4241093ea928b0a263ec53b93b65efc08

In order to apply the above patch successfully and keep the git history, we also
need cherry-pick the following commit:

ARM: pm: add function to set WFI low-power mode for SMP CPUs
292ec42af7c6361435fe9df50cd59ec76f6741c6

These ERRATAs applied to i.MX6Q(cortex-a9:r2p10 smp)

Signed-off-by: Jason Liu <r64343@freescale.com>
11 years agoENGR00172008 HDMI audio continues playing after doing ctrl-z
Alan Tull [Tue, 17 Jan 2012 14:34:44 +0000 (08:34 -0600)]
ENGR00172008 HDMI audio continues playing after doing ctrl-z

The bug is that HDMI audio continues playing after doing ctrl-z,
repeating playing a small part of the buffer.

Mask HDMI audio irq when we receive SNDRV_PCM_TRIGGER_STOP command.
Unmask when we receive SNDRV_PCM_TRIGGER_START.

Signed-off-by: Alan Tull <r80115@freescale.com>
11 years agoENGR00169906-5 GPMI : change the code for new interface
Huang Shijie [Mon, 16 Jan 2012 07:01:55 +0000 (15:01 +0800)]
ENGR00169906-5 GPMI : change the code for new interface

If we do not set the WAIT4END in the middle DMA command structure
of the long DMA command chain, a DMA timeout may occurs.

The reason of the DMA timeout is:
[1] We do not set the WAIT4END in the DMA command structure
    which do the ECC READ PAGE by the BCH.
[2] So the following DMA command structure (maybe in other DMA
CHAIN)may disable the BCH module.
[3] If the time delay between [2] and [1] is long enough,
    it's ok. But if the time delay is not long enough, the BCH
    module may become unnormal, so it can not finish its job.
    The DMA will timeout in this case.

We have changed the DMA interface to fix the bug, now use the new
interface.

Acked-by: Jason Liu <r64343@freescale.com>
Signed-off-by: Huang Shijie <b32955@freescale.com>
11 years agoENGR00169906-4 MXS-DMA : change the last parameter of mxs_dma_prep_slave_sg()
Huang Shijie [Mon, 16 Jan 2012 09:39:12 +0000 (17:39 +0800)]
ENGR00169906-4 MXS-DMA : change the last parameter of mxs_dma_prep_slave_sg()

For a long DMA chain which may have more then two DMA Command Structures,
the current DMA code sets the WAIT4END bit at the last one, such as:

+-----+       +-----+    +-----+
| cmd | ------------> | cmd | ------------------>  | cmd |
+-----+       +-----+    +-----+
       ^
       |
       |
      set WAIT4END here

But in the NAND ECC read case, the WAIT4END bit should be set
not only at the last DMA Command Structure, but also at the middle one,
such as:

+-----+       +-----+    +-----+
| cmd | ------------> | cmd | ------------------>  | cmd |
+-----+       +-----+    +-----+
                         ^                            ^
 |                            |
 |                            |
set WAIT4END here too        set WAIT4END here

We set the WAIT4END in the middle DMA Command Structure to ensure
the BCH module finishs its job. If we do not wait in this situation,
the BCH module may be changed in the following DMA Command Structures,
and it maybe becomes unstable which will cause a DMA timeout
This has been catched in the MX6Q board.

So rewrite the last parameter of mxs_dma_prep_slave_sg().
Add some more flags to let the driver sets the WAIT4END as it needs.

Acked-by: Jason Liu <r64343@freescale.com>
Signed-off-by: Huang Shijie <b32955@freescale.com>
11 years agoENGR00169906-3 MXS-DMA : add new flags
Huang Shijie [Mon, 16 Jan 2012 09:37:10 +0000 (17:37 +0800)]
ENGR00169906-3 MXS-DMA : add new flags

We catch a DMA timeout bug in the NAND in mx6q.

If we do not set the WAIT4END in the middle DMA command structure
of the long DMA command chain, a DMA timeout may occurs.

In order to fix the bug, we should let the driver to
set the proper DMA flags in the DMA command structrues.

So add the new flags for MXS-DMA.

The driver can use these flags to control the DMA in a flexible way.

Signed-off-by: Huang Shijie <b32955@freescale.com>
11 years agoENGR00169906-2 GPMI : setup the TIMING1 for ready/busy
Huang Shijie [Mon, 9 Jan 2012 07:59:01 +0000 (15:59 +0800)]
ENGR00169906-2 GPMI : setup the TIMING1 for ready/busy

The TIMING1 specifies the timeouts used when monitoring the
NAND READY pin and IOWAIT signals.

We should set a default value for it.

Signed-off-by: Huang Shijie <b32955@freescale.com>
11 years agoENGR00169906-1 GPMI : set the GPMI to 20M by default
Huang Shijie [Mon, 16 Jan 2012 09:09:34 +0000 (17:09 +0800)]
ENGR00169906-1 GPMI : set the GPMI to 20M by default

The 11M for GPMI is too slow.

Change the GPMI to 20MHz by default, most of the NAND
chips can run with this frequency.

Signed-off-by: Huang Shijie <b32955@freescale.com>
11 years agoENGR00172175 MX6Q: OV5640_MIPI support fast configure
Even Xu [Tue, 17 Jan 2012 02:04:31 +0000 (10:04 +0800)]
ENGR00172175 MX6Q: OV5640_MIPI support fast configure

OV5640_MIPI need to be configure faster to get capture image
quickly. So change the configures, when change the resolution
OV5640_MIPI sensor will not do reset.

Signed-off-by: Even Xu <b21019@freescale.com>
11 years agoENGR00171462-2 vpu: fix vpu cannot run after suspend/resume
Sammy He [Thu, 12 Jan 2012 05:15:33 +0000 (13:15 +0800)]
ENGR00171462-2 vpu: fix vpu cannot run after suspend/resume

This patch fix vpu cannot run issue after suspend/resume
with stop mode. Need to re-load vpu firmware if current PC
is zero.

Signed-off-by: Sammy He <r62914@freescale.com>
11 years agoENGR00171462-1 vpu: add BIT_PIC_RUN register in mxc_vpu.h
Sammy He [Thu, 12 Jan 2012 05:00:24 +0000 (13:00 +0800)]
ENGR00171462-1 vpu: add BIT_PIC_RUN register in mxc_vpu.h

Add BIT_PIC_RUN register definition in mxc_vpu.h of arch/arm

Signed-off-by: Sammy He <r62914@freescale.com>
11 years agoENGR00171949:gpu-viv: change from mutex to completion for waiting pm events
wu guoxing [Fri, 13 Jan 2012 01:57:41 +0000 (09:57 +0800)]
ENGR00171949:gpu-viv: change from mutex to completion for waiting pm events

viv code is using mutex to wait for pm events,
kernel will see this as a dead lock and give a warrning, as the mutex
can be hold for a long time.

Signed-off-by: Wu Guoxing <b39297@freescale.com>
Acked-by: Lily Zhang
11 years agoENGR00171383 HDMI: blank and unblank display can not resume.
Sandor Yu [Wed, 11 Jan 2012 08:42:53 +0000 (16:42 +0800)]
ENGR00171383 HDMI: blank and unblank display can not resume.

It cause by HDMI Blank/Unblank function not implement.
Implement the HDMI blank/unblank function.

Signed-off-by: Sandor Yu <R01008@freescale.com>
11 years agoENGR00171890 [MX6Q_ARD]fix the boot fail when otg power is not initialized
Anson Huang [Thu, 12 Jan 2012 12:53:07 +0000 (20:53 +0800)]
ENGR00171890 [MX6Q_ARD]fix the boot fail when otg power is not initialized

Add u43 setting back

Signed-off-by: Anson Huang <b20788@freescale.com>
Signed-off-by: Hake Huang <b20222@freescale.com>
11 years agoENGR00171116 [MX6]Remove unnecessary workaround for suspend/resume
Anson Huang [Sat, 31 Dec 2011 11:00:55 +0000 (19:00 +0800)]
ENGR00171116 [MX6]Remove unnecessary workaround for suspend/resume

The root cause of suspend/resume fail has been found,
the i-cache should be invalidated before resume. So
the workaround can be removed.

Signed-off-by: Anson Huang <b20788@freescale.com>
11 years agoENGR00171731 ipuv3 dev: add time statistic for each task
Jason Chen [Wed, 11 Jan 2012 06:03:42 +0000 (14:03 +0800)]
ENGR00171731 ipuv3 dev: add time statistic for each task

add time statistic for each task

Signed-off-by: Jason Chen <b02280@freescale.com>
11 years agoENGR00171622 - FEC : workaround for Gb enet in sabrelite board.
Fugang Duan [Wed, 11 Jan 2012 05:34:40 +0000 (13:34 +0800)]
ENGR00171622 - FEC : workaround for Gb enet in sabrelite board.

Micrel phy KSZ9021 Gb speed cannot work well in i.MX6 sabrelite
board. Advertise PHY is not 1000Base-T capable.

If nfs boot kernel, phy will work at 100Mbps, or else phy will
work at Gbps mode. And if hot-plugin cable, phy will work at Gbps
mode. Enet can work well in all of them.

But in Gbps mode, uDMA sometime cannot write  frame "L" bit in
exuberate transfer, so driver will print some warning message:
"FEC ENET: rcv is not +last"

Signed-off-by: Fugang Duan <B38611@freescale.com>
11 years agoENGR00171708: [v2] Remove build warnings in ENGR00170444
B37753 [Wed, 11 Jan 2012 05:24:01 +0000 (05:24 +0000)]
ENGR00171708: [v2] Remove build warnings in ENGR00170444

Remove ddc_dvi_init and ddc_dvi_update functions because
    those generate a compiler warning.
Also remove I2C duplicate IOMUXES and devices.

Signed-off-by: Israel Perez <B37753@freescale.com>
11 years agoENGR00171792: MX6Q_ARD: fix the pad setting conflicts between can0 and enet
Hake Huang [Wed, 11 Jan 2012 10:39:08 +0000 (18:39 +0800)]
ENGR00171792: MX6Q_ARD: fix the pad setting conflicts between can0 and enet

1. need add 'can0' in kernel commandline to enable can1,
the default enet is enabled, can2 is not affected by this.
2. add  MX6Q_PAD_SD2_DAT0__GPIO_1_15 back in pad setting,
as this is required for enet rework.
   add 4.7k pull down and GPIO_1_15 will reset the u39,
   to make it functional, we need pull high.
3. the ENET PHY steering is configured by u39 setting.

Signed-off-by: Hake Huang <b20222@freescale.com>
11 years agoENGR00170453-1 ssi: disable ssi2 clk after probe
Gary Zhang [Wed, 11 Jan 2012 02:47:11 +0000 (10:47 +0800)]
ENGR00170453-1 ssi: disable ssi2 clk after probe

disable ssi2 clk after init ssi.

Signed-off-by: Gary Zhang <b13634@freescale.com>
11 years agoENGR00171544 usb-core: usb host will be broken after system pm test
Peter Chen [Wed, 11 Jan 2012 03:27:45 +0000 (11:27 +0800)]
ENGR00171544 usb-core: usb host will be broken after system pm test

At i.mx6q sabrelite, there is a usb hub on board. After several
suspend suspend/resume iterations, the usb host will be broken.
It is IC limitation, and similar with:
574b9641d5846e58273dac6bf80fcf1ff312c5c9

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: make shi <b15407@freescale.com>
11 years agoENGR00169489-2 Add OV5642 csi camera support for i.mx6 sabre-lite board.
Yi Li [Mon, 2 Jan 2012 20:02:19 +0000 (14:02 -0600)]
ENGR00169489-2 Add OV5642 csi camera support for i.mx6 sabre-lite board.

Add OV5642 csi camera support for i.mx6 sabre-lite board

Signed-off-by: Yi Li <R80015@freescale.com>
11 years agoENGR00169489-1 Add OV5642 csi camera support for i.mx6 sabre-lite board.
Yi Li [Mon, 2 Jan 2012 20:01:46 +0000 (14:01 -0600)]
ENGR00169489-1 Add OV5642 csi camera support for i.mx6 sabre-lite board.

Add OV5642 csi camera support for i.mx6 sabre-lite board

Signed-off-by: Yi Li <R80015@freescale.com>
11 years agoENGR00171721 MX6Q: Add ADV7180 build as a module
Even Xu [Wed, 11 Jan 2012 03:06:58 +0000 (11:06 +0800)]
ENGR00171721 MX6Q: Add ADV7180 build as a module

Add ADV7180 build as a module

Signed-off-by: Even Xu <b21019@freescale.com>
11 years agoENGR00171444 HDMI: Change video mode system will hang.
Sandor Yu [Mon, 9 Jan 2012 13:23:33 +0000 (21:23 +0800)]
ENGR00171444 HDMI: Change video mode system will hang.

There are two couples register for HDMI PHY interrupt/mask:
HDMI_FC_INT2, HDMI_FC_MASK2 and HDMI_IH_FC_STAT2, HDMI_IH_MUTE_FC_STAT2.
The register can not mixed use it, otherwise the interrupt will missing
and not clean.
Mask interrupt with HDMI_IH_MUTE_FC_STAT2 so check interrupt
should use register HDMI_IH_FC_STAT2.

Signed-off-by: Sandor Yu <R01008@freescale.com>
11 years agoENGR00170740 enable pwm3 and pwm both lvds backlight
Guillermo Michel [Mon, 9 Jan 2012 18:59:47 +0000 (10:59 -0800)]
ENGR00170740 enable pwm3 and pwm both lvds backlight

configured GPIOs, added pwms iomux configuration, added both backlights

Signed-off-by: Guillermo Michel <guillermo.michel@freescale.com>
11 years agoENGR00170817 UART2 iomux fix configuration
Alejandro Sierra [Thu, 22 Dec 2011 15:29:55 +0000 (09:29 -0600)]
ENGR00170817 UART2 iomux fix configuration

Added iomux configuration pads to support UART2 through GPIO 7 and GPIO 8
Add flag to enable uart2. This flag avoids configure GPIO7 as CAN mode
when the uart2 is used. The flag is passed through bootargs and is called
uart2.

Signed-off-by: Alejandro Sierra <b18039@freescale.com>
11 years agomxs-dma: enable CLKGATE before accessing registers
Lothar Waßmann [Mon, 8 Aug 2011 12:47:47 +0000 (14:47 +0200)]
mxs-dma: enable CLKGATE before accessing registers

After calling mxs_dma_disable_chan() for a channel, that channel
becomes unusable because some controller registers can only be written
when the clock is enabled via CLKGATE.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agoARM: mxs-dma: reset after disable channel
Dong Aisheng [Tue, 19 Jul 2011 04:09:56 +0000 (12:09 +0800)]
ARM: mxs-dma: reset after disable channel

We met some channels in abnormal state after disable.
Reset it to get a clean state.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodma: mxs-dma: fix unterminated platform_device_id table
Axel Lin [Tue, 12 Jul 2011 10:53:52 +0000 (18:53 +0800)]
dma: mxs-dma: fix unterminated platform_device_id table

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agodmaengine: mxs-dma: skip request_irq for NO_IRQ
Shawn Guo [Thu, 30 Jun 2011 08:06:33 +0000 (16:06 +0800)]
dmaengine: mxs-dma: skip request_irq for NO_IRQ

In general, the mxs-dma users get separate irq for each channel,
but gpmi is special one which has only one irq shared by all gpmi
channels.  It causes mxs_dma channel allocation function fail for
all other gpmi channels except the first one calling into the
function.

The patch gets request_irq call skipped for NO_IRQ case, and leaves
this gpmi specific quirk to gpmi driver to sort out.  It will fix
above problem if gpmi driver sets chan_irq as gpmi irq for only one
channel and NO_IRQ for all the rest channels.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
11 years agoENGR00170323-mx6q:sabreauto:fix_flexcan_IO_expander_and_pad_settings
Oscar Luna [Mon, 9 Jan 2012 20:41:48 +0000 (14:41 -0600)]
ENGR00170323-mx6q:sabreauto:fix_flexcan_IO_expander_and_pad_settings

Fix CAN1 STBY, EN and STEER pins to be managed through
the IO expander(2) using GPIO's 3,5 and 6. Routes CAN2
TX pin correctly.STEER pin is managed dynamically when
either of the CAN interfaces is UP and/or DOWN.
CAN definitions removed for code clarification.

Signed-off-by: Oscar Luna <r01160@freescale.com>
11 years agoENGR00170880 Add gpio key support
Alejandro Sierra [Thu, 22 Dec 2011 14:37:13 +0000 (08:37 -0600)]
ENGR00170880 Add gpio key support

Adding gpio keys to support Android buttons. Button
functionality are back, menu, home, vol up, vol down

Signed-off-by: Alejandro Sierra <b18039@freescale.com>
11 years agoENGR00171564-3 MX6Q ARM2: Enable TVIN based on AutoBoard
Even Xu [Mon, 9 Jan 2012 08:44:31 +0000 (16:44 +0800)]
ENGR00171564-3 MX6Q ARM2: Enable TVIN based on AutoBoard

- Add adv7180 driver to ARM2 support
- Add adv7180 configure
- Chenge CSI configure for BT656 support

Signed-off-by: Even Xu <b21019@freescale.com>
11 years agoENGR00171564-2 MX6Q ARM2: Enable TVIN based on AutoBoard
Even Xu [Mon, 9 Jan 2012 08:41:33 +0000 (16:41 +0800)]
ENGR00171564-2 MX6Q ARM2: Enable TVIN based on AutoBoard

- Add TVin platform data
- Configure TVin io: such as RESET, POWERDOWN

Signed-off-by: Even Xu <b21019@freescale.com>
11 years agoENGR00171564-1 MX6Q ARM2: Enable TVin based on AUTO Board
Even Xu [Mon, 9 Jan 2012 08:37:02 +0000 (16:37 +0800)]
ENGR00171564-1 MX6Q ARM2: Enable TVin based on AUTO Board

Add TVin struct to Head file.

Signed-off-by: Even Xu <b21019@freescale.com>
11 years agoENGR00171535:gpu-viv: ENGR00170946 is missed when upgrading to viv 4.6.4
wu guoxing [Mon, 9 Jan 2012 01:56:37 +0000 (09:56 +0800)]
ENGR00171535:gpu-viv: ENGR00170946 is missed when upgrading to viv 4.6.4

rmmod fix for gpu is missed, add it back.
and also, change from manual reset to auto reset when gckOS_CreateSignal

Signed-off-by: Wu Guoxing <b39297@freescale.com>
Acked-by: Lily Zhang
11 years agoENGR00170912 HDMI: system hang if set hdmi_mode video=mxcfb1
Sandor Yu [Thu, 5 Jan 2012 12:29:52 +0000 (20:29 +0800)]
ENGR00170912 HDMI: system hang if set hdmi_mode video=mxcfb1

System will hang at PHY PLL lock wating loop, if HDMI PHY is down.
Added timeout check for HDMI PHY PLL lock waiting.

Signed-off-by: Sandor Yu <R01008@freescale.com>
11 years agoENGR00170444: [v3]imx6sabreauto adv7180 TVin port
b37753 [Fri, 6 Jan 2012 21:50:40 +0000 (15:50 -0600)]
ENGR00170444: [v3]imx6sabreauto adv7180 TVin port

Kconfig and Makefile was modified in order to
enable adv7180 driver for mx6q architecture.
adv7180.c mutex was changed to semaphore as is described in
"https://lwn.net/Articles/304725/ ".
sensor data structure is added in fsl_devices.h.
mxc_v4l2_capture.c condition in mxc_v4l2_sparam
was removed because is going to be always true
capture mode only have 1 possible value as is described in
"https://lwn.net/Articles/235023/".
ipu_capture.c clock divisor setup was added at init the csi.

Signed-off-by: B37753 <B37753@freescale.com>
11 years agoENGR00170444: [v3]imx6sabreauto adv7180 TVin port
b37753 [Fri, 6 Jan 2012 21:03:08 +0000 (15:03 -0600)]
ENGR00170444: [v3]imx6sabreauto adv7180 TVin port

imx6sabreauto adv7180 TVin port
ioexpanders addresss were incorrect, modification in
board-mx6q_sabreauto.c was done.
adv7180 boot structures and i2c structures were added in board-mx6q_sabreauto.c
i2c3 was not configured properly modified in iomux-mx6q.h.

Signed-off-by: B37753 <B37753@freescale.com>
11 years agoENGR00170124: Fix for USBH1 OTG IOMUX and GPIOs in board-mx6q_sabreauto.c
Francisco Munoz [Fri, 16 Dec 2011 23:16:03 +0000 (17:16 -0600)]
ENGR00170124: Fix for USBH1 OTG IOMUX and GPIOs in board-mx6q_sabreauto.c

USBH1 was not responding to plug events
USBH1 power up settings trough Port Exp B
OTG power up settings trough Port Exp C
Functionality was tested using a mx6qsabreauto cpu board + 53ARD main board

Signed-off-by: Francisco Munoz <b37752@freescale.com>
11 years agoENGR00171452 [MX6Qsabrelite]:wifi failed to work after system resume.
Ryan QIAN [Fri, 6 Jan 2012 05:58:12 +0000 (13:58 +0800)]
ENGR00171452 [MX6Qsabrelite]:wifi failed to work after system resume.

Set keep power on suspend flag for sd3 & sd4

Signed-off-by: Ryan QIAN <b32804@freescale.com>
11 years agoENGR0017124 Merge vivante 4.6.4 kernel driver
Loren Huang [Wed, 4 Jan 2012 10:47:33 +0000 (18:47 +0800)]
ENGR0017124 Merge vivante 4.6.4 kernel driver

Signed-off-by: Loren Huang <b02279@freescale.com>
Acked-by: Lily Zhang
11 years agoENGR00171259 mx6 Fix warning while remove GPU module
Larry Li [Wed, 4 Jan 2012 09:07:50 +0000 (17:07 +0800)]
ENGR00171259 mx6 Fix warning while remove GPU module

Avoid necessary clk_disable operation

Signed-off-by: Larry Li <b20787@freescale.com>
11 years agoENGR00169747 MX6Q:ARD:Enable SD1 Card reader from ARD Main board
Prabhu Sundararaj [Mon, 2 Jan 2012 20:12:06 +0000 (15:12 -0500)]
ENGR00169747 MX6Q:ARD:Enable SD1 Card reader from ARD Main board

Fix to enable SD1 Card reader for MX6Q ARD. This enables SD1 reader
from main board. SD1 does not support SD3.0 to maintain compatiblity
of MX53 Mainboard.

Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com>
11 years agoENGR00171115 mx6_ard: Enable the enet on mx6q ard
Hake Huang [Sat, 31 Dec 2011 09:37:35 +0000 (17:37 +0800)]
ENGR00171115 mx6_ard: Enable the enet on mx6q ard

Fix Mux config
Need hardware rework:
1. Add R450 10.0k
2. Remove R1105 1k
3. short Pin 1,2 of u516: will impact CAN1

Signed-off-by: Hake Huang <b20222@freescale.com>
11 years agoENGR00171113 flexcan: add self wakeup function
Dong Aisheng [Sat, 31 Dec 2011 09:08:03 +0000 (17:08 +0800)]
ENGR00171113 flexcan: add self wakeup function

Flexcan can use the self wakeup function to wakeup system in system
suspend state.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
11 years agoENGR00171043 gadget-audio: Kernel panic after insert g_audio at second time
Peter Chen [Sat, 31 Dec 2011 06:56:47 +0000 (14:56 +0800)]
ENGR00171043 gadget-audio: Kernel panic after insert g_audio at second time

The reason is it does not call usb_ep_disable at gadget disable routine.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
11 years agoENGR00162913-1 ASRC:fix asrc_audio_clock divider set bug
Chen Liangjun [Sat, 31 Dec 2011 03:03:33 +0000 (11:03 +0800)]
ENGR00162913-1 ASRC:fix asrc_audio_clock divider set bug

The asrc_audio_clock in MX5 is different from MX6.Thus the divider
value set can not be used in the MX6. Part of noise of ASRC output
is caused by this.

Add the function to calculate the divider and prescaler value
according to the sample rate and asrc_audio_clock.

Signed-off-by: Chen Liangjun <b36089@freescale.com>
11 years agoENGR00171083 Revert "ENGR00170944 [MX6Q MMC]suspend/resume crash"
Ryan QIAN [Sat, 31 Dec 2011 06:12:18 +0000 (14:12 +0800)]
ENGR00171083 Revert "ENGR00170944 [MX6Q MMC]suspend/resume crash"

issue:
in the reverted patch, sdhc driver will claim host on its
entering suspend state. and the wifi driver will hold host on
its loading. so once system is about to enter suspend state,
system will be pended on claiming host.

fix:
- Revert "ENGR00170944 [MX6Q MMC]suspend/resume crash"

This reverts commit 3b2e3729dc57a5ff532552cde49de7ace4c5792c.

Signed-off-by: Ryan QIAN <b32804@freescale.com>
11 years agoENGR00171111 MX6Q/TOUCHSCREEN : change the printk to dynamic print
Huang Shijie [Sat, 31 Dec 2011 05:43:00 +0000 (13:43 +0800)]
ENGR00171111 MX6Q/TOUCHSCREEN : change the printk to dynamic print

Too much printk make the dmesg mess.
Change it to dynamic print mode.

Signed-off-by: Huang Shijie <b32955@freescale.com>
11 years agoENGR00171026 SGTL5000: remove mono support
Gary Zhang [Fri, 30 Dec 2011 08:39:41 +0000 (16:39 +0800)]
ENGR00171026 SGTL5000: remove mono support

there is a issue on 24bit mono transmit of sgtl5000,
temporarily disable mono support

Signed-off-by: Gary Zhang <b13634@freescale.com>
11 years agoENGR00171035 Fix OV3640 XGA can not work
Even Xu [Fri, 30 Dec 2011 10:03:45 +0000 (18:03 +0800)]
ENGR00171035 Fix OV3640 XGA can not work

- Fix OV3640 XGA cannot work, XGA can be supported
- Add OV3640 720P, 1080P at 15fps support
- Fix a MXC_V4L2_CAPTURE driver bug, when setting param,
only when current mode and framerate are the same
with param, then not change current setting again

Signed-off-by: Even Xu <b21019@freescale.com>
11 years agoENGR00171027-3 usbcore:after plug in/out on the hub,host can't work
Tony LIU [Fri, 30 Dec 2011 06:34:38 +0000 (14:34 +0800)]
ENGR00171027-3 usbcore:after plug in/out on the hub,host can't work

This issue will happen only when suspend bit is set but phcd is not set
The root cause of this issue is the IC defect.
    - If the suspend bit is set without phcd bit set, host controller
      can't resume normally
    - The workaround is after set suspend bit, we need set the following
      bit in USB PHY at once:
      HW_USBPHY_PWD_RXPWDRX
      HW_USBPHY_PWD_RXPWDDIFF
      HW_USBPHY_PWD_RXPWD1PT1
      HW_USBPHY_PWD_RXPWDENV
      HW_USBPHY_PWD_TXPWDv2I
      HW_USBPHY_PWD_TXPWDIBIAS
      HW_USBPHY_PWD_TXPWDFS
    - Furthermore, after resume, we must clear these bits during the K state
    - IC has no plan to fix this issue
    - This issue only happen on MX6Q/MX28

core part

Signed-off-by: Tony LIU <junjie.liu@freescale.com>
11 years agoENGR00171027-2 [USB_HOST]after plug in/out on the hub,host can't work
Tony LIU [Fri, 30 Dec 2011 06:32:41 +0000 (14:32 +0800)]
ENGR00171027-2 [USB_HOST]after plug in/out on the hub,host can't work

This issue will happen only when suspend bit is set but phcd is not set
The root cause of this issue is the IC defect.
    - If the suspend bit is set without phcd bit set, host controller
      can't resume normally
    - The workaround is after set suspend bit, we need set the following
      bit in USB PHY at once:
      HW_USBPHY_PWD_RXPWDRX
      HW_USBPHY_PWD_RXPWDDIFF
      HW_USBPHY_PWD_RXPWD1PT1
      HW_USBPHY_PWD_RXPWDENV
      HW_USBPHY_PWD_TXPWDv2I
      HW_USBPHY_PWD_TXPWDIBIAS
      HW_USBPHY_PWD_TXPWDFS
    - Furthermore, after resume, we must clear these bits during the K state
    - IC has no plan to fix this issue
    - This issue only happen on MX6Q/MX28

driver part

Signed-off-by: Tony LIU <junjie.liu@freescale.com>
11 years agoENGR00171027-1 [USB_HOST]after plug in/out on the hub,host can't work
Tony LIU [Fri, 30 Dec 2011 06:07:18 +0000 (14:07 +0800)]
ENGR00171027-1 [USB_HOST]after plug in/out on the hub,host can't work

This issue will happen only when suspend bit is set but phcd is not set
The root cause of this issue is the IC defect.
- If the suspend bit is set without phcd bit set, host controller
  can't resume normally
- The workaround is after set suspend bit, we need set the following
  bit in USB PHY at once:
  HW_USBPHY_PWD_RXPWDRX
  HW_USBPHY_PWD_RXPWDDIFF
  HW_USBPHY_PWD_RXPWD1PT1
  HW_USBPHY_PWD_RXPWDENV
  HW_USBPHY_PWD_TXPWDv2I
  HW_USBPHY_PWD_TXPWDIBIAS
  HW_USBPHY_PWD_TXPWDFS
- Furthermore, after resume, we must clear these bits during the K state
- IC has no plan to fix this issue
- This issue only happen on MX6Q/MX28

MSL part
Signed-off-by: Tony LIU <junjie.liu@freescale.com>
11 years agoENGR00171094 MX6 GPIO keys: build in GPIO keys
Yuxi Sun [Fri, 30 Dec 2011 05:55:01 +0000 (13:55 +0800)]
ENGR00171094 MX6 GPIO keys: build in GPIO keys

This commit mainly build in GPIO keypad.But because config
file have not been update for long time, some item is added
by kconfig automatically.

The step is make imx6_defconfig,
Make menuconfig,
Choose gpio keypad enable
Cp .config to imx6_defconfig

Signed-off-by:Yuxi Sun <b36102@freescale.com>

11 years agoENGR00171087 [MX6]Need to add L1 Icache invalidate
Anson Huang [Fri, 30 Dec 2011 06:55:14 +0000 (14:55 +0800)]
ENGR00171087 [MX6]Need to add L1 Icache invalidate

As there might be dirty data line on any core of MX6
SOC when power on or reset, we need to do L1 I-cache
invalidation in the resume process and start up
process for all cores.

This is very important for us, as not all of the hardware
will do cache invalidation during power on or reset, so
we need to do the invalidation for all cache(L1, L2,
I and D) before first time enabling. Please keep in mind.

Signed-off-by: Anson Huang <b20788@freescale.com>
11 years agoENGR00171096 [MX6]Remove unnecessary workaroud of L2 in suspend/resume
Anson Huang [Fri, 30 Dec 2011 06:52:18 +0000 (14:52 +0800)]
ENGR00171096 [MX6]Remove unnecessary workaroud of L2 in suspend/resume

We have many operation before enabling L2 cache, which can
make sure L2 already can be accessed before enabled.

Signed-off-by: Anson Huang <b20788@freescale.com>
11 years agoENGR00171047 Fix ov5640 QSXGA can not work
Even Xu [Fri, 30 Dec 2011 05:25:31 +0000 (13:25 +0800)]
ENGR00171047 Fix ov5640 QSXGA can not work

Change sensor configuration to fix this issue.

Signed-off-by: Even Xu <b21019@freescale.com>
11 years agoENGR00171064 [MX6]Complete SNVS RTC feature
Anson Huang [Thu, 29 Dec 2011 09:17:35 +0000 (17:17 +0800)]
ENGR00171064 [MX6]Complete SNVS RTC feature

Add ioctl support to complete RTC feature.

Signed-off-by: Anson Huang <b20788@freescale.com>
11 years agoENGR00171052 mxc hdmi: fix HDMI CSC clock setting
Sandor Yu [Thu, 29 Dec 2011 08:25:51 +0000 (16:25 +0800)]
ENGR00171052 mxc hdmi: fix HDMI CSC clock setting

Move HDMI csc clock setting to fucntion mxc_hdmi_enable_video_path.

Signed-off-by: Sandor Yu <R01008@freescale.com>
11 years agoENGR00170999 Fix the record end, playback mute
b02247 [Mon, 26 Dec 2011 05:28:21 +0000 (13:28 +0800)]
ENGR00170999 Fix the record end, playback mute

SGTL5000_VAG_POWERUP used by record and playback.
when playback and record are opened, close one of them will cause
the other mute

Signed-off-by: b02247 <b02247@freescale.com>
11 years agoENGR00171010 enable exposure calculate function
Yuxi Sun [Wed, 28 Dec 2011 06:20:20 +0000 (14:20 +0800)]
ENGR00171010 enable exposure calculate function

Exposure calculate function was not used and this produce build
warning, enable this function not only remove this warning, but
also get a better image quality when take picture.

Signed-off-by: Yuxi Sun <b36102@freescale.com>
11 years agoENGR00171001-2 MX6Q PFUZE100: fix build warnings
Robin Gong [Wed, 28 Dec 2011 03:43:08 +0000 (11:43 +0800)]
ENGR00171001-2 MX6Q PFUZE100: fix build warnings

fix build warnings on pfuze driver:

arch/arm/mach-mx6/mx6q_sabreauto_pmic_pfuze100.c:388:
  warning: initialization from incompatible pointer type
drivers/mfd/pfuze-core.c:523:
  warning: initialization from incompatible pointer type
drivers/mfd/pfuze-core.c:412:
  warning: 'pfuze_add_subdevice' defined but not used

Signed-off-by: Robin Gong <B38343@freescale.com>
11 years agoENGR00171001-1 PFUZE100 MX6Q: fix build warning
Robin Gong [Wed, 28 Dec 2011 03:41:58 +0000 (11:41 +0800)]
ENGR00171001-1 PFUZE100 MX6Q: fix build warning

fix the board level function
Signed-off-by: Robin Gong <B38343@freescale.com>
11 years agoENGR00170969: Remove build warnings in MLB driver
Terry Lv [Tue, 27 Dec 2011 10:25:05 +0000 (18:25 +0800)]
ENGR00170969: Remove build warnings in MLB driver

Remove build warnings in MLB driver.

Signed-off-by: Terry Lv <r65388@freescale.com>
11 years agoENGR00171000 [MX6]Fix build warning
Anson Huang [Wed, 28 Dec 2011 02:59:02 +0000 (10:59 +0800)]
ENGR00171000 [MX6]Fix build warning

Fix the following build warning:

1.arch/arm/mach-mx6/cpu.c:36: warning: function declaration isn't a
prototype

2.arch/arm/mach-mx6/system.c:55: warning: function declaration isn't a
prototype

3.arch/arm/mach-mx6/board-mx6q_sabreauto.c:751: warning: unused variable
'iterations'

Signed-off-by: Anson Huang <b20788@freescale.com>
11 years agoENGR00170998 [MX6Q MMC]build warning
Tony Lin [Wed, 28 Dec 2011 02:34:17 +0000 (10:34 +0800)]
ENGR00170998 [MX6Q MMC]build warning

fix following build warning:

drivers/mmc/host/sdhci.c: In function 'sdhci_clk_worker':
drivers/mmc/host/sdhci.c:53: warning: unused variable 'flags'
drivers/mmc/host/sdhci.c: In function 'sdhci_resume_host':
drivers/mmc/host/sdhci.c:1751:
warning: 'ret' may be used uninitialized in this function

Signed-off-by: Tony Lin <tony.lin@freescale.com>
11 years agoENGR00161871: ENET: Changing MDIO read and write timeout
Rogerio Pimentel [Mon, 26 Dec 2011 18:23:48 +0000 (10:23 -0800)]
ENGR00161871: ENET: Changing MDIO read and write timeout

The original FEC_MII_TIMEOUT was set to 1ms, which is too low when
passed to the usecs_to_jiffies macro.

On ARM one jiffy is 10ms, so use msecs_to_jiffies instead and use
a timeout of 30ms, which corresponds to 3 jiffies.

After running 3 hours NFS boots, the MDIO timeout do not occur
anymore.

Signed-off-by: Rogerio Pimentel <rogerio.pimentel@freescale.com>
11 years agoENGR00170938-2 mxc hdmi: Enable HDMI output color space convert
Sandor Yu [Tue, 27 Dec 2011 01:50:46 +0000 (09:50 +0800)]
ENGR00170938-2 mxc hdmi: Enable HDMI output color space convert

Enable HDMI output CSC.
Enable HDMI under scan.

Signed-off-by: Sandor Yu <R01008@freescale.com>