linux-toradex.git/drivers/tty/serial/imx.c, branch v3.7

Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2012-10-02T02:11:38+00:00

Pull ARM soc multiplatform enablement from Olof Johansson:
 "This is a pretty significant branch.  It's the introduction of the
  first multiplatform support on ARM, and with this (and the later
  branch) merged, it is now possible to build one kernel that contains
  support for highbank, vexpress, mvebu, socfpga, and picoxcell.  More
  platforms will be convered over in the next few releases.

  Two critical last things had to be done for this to be practical and
  possible:
   * Today each platform has its own include directory under
     mach-/include/mach/*, and traditionally that is where a lot
     of driver/platform shared definitions have gone, such as platform
     data structures.  They now need to move out to a common location
     instead, and this branch moves a large number of those out to
     include/linux/platform_data.
   * Each platform used to list the device trees to compile for its
     boards in mach-/Makefile.boot.

  Both of the above changes will mean that there are some merge
  conflicts to come (and some to resolve here).  It's a one-time move
  and once it settles in, we should be good for quite a while.  Sorry
  for the overhead."

Fix conflicts as per Olof.

* tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
  ARM: add v7 multi-platform defconfig
  ARM: msm: Move core.h contents into common.h
  ARM: highbank: call highbank_pm_init from .init_machine
  ARM: dtb: move all dtb targets to common Makefile
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: vexpress: convert to multi-platform
  ARM: initial multiplatform support
  ARM: mvebu: move armada-370-xp.h in mach dir
  ARM: vexpress: remove dependency on mach/* headers
  ARM: picoxcell: remove dependency on mach/* headers
  ARM: move all dtb targets out of Makefile.boot
  ARM: picoxcell: move debug macros to include/debug
  ARM: socfpga: move debug macros to include/debug
  ARM: mvebu: move debug macros to include/debug
  ARM: vexpress: move debug macros to include/debug
  ARM: highbank: move debug macros to include/debug
  ARM: move debug macros to common location
  ARM: make mach/gpio.h headers optional
  ...

Merge branch 'multiplatform/platform-data' into next/multiplatform

2012-09-22T08:07:21+00:00

* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson

serial: imx: remove null check of sport in suspend/resume function

2012-09-21T16:53:16+00:00

platform_get_drvdata always retrun a valid value after probe succeed.

It also fixed smatch warnings:
drivers/tty/serial/imx.c:1376 serial_imx_suspend() warn: variable dereferenced before check 'sport' (see line 1372)
drivers/tty/serial/imx.c:1392 serial_imx_resume() warn: variable dereferenced before check 'sport' (see line 1388)

Signed-off-by: Richard Zhao 
Acked-by: Shawn Guo 
Signed-off-by: Greg Kroah-Hartman

serial: imx: set sport as drvdata, like it's used elsewhere

2012-09-21T16:53:15+00:00

Signed-off-by: Richard Zhao 
Acked-by: Shawn Guo 
Signed-off-by: Greg Kroah-Hartman

Merge tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup

2012-09-21T02:57:38+00:00

ARM: tegra: switch to dmaengine

The Tegra code-base has contained both a legacy DMA and a dmaengine
driver since v3.6-rcX. This series flips Tegra's defconfig to enable
dmaengine rather than the legacy driver, and removes the legacy driver
and all client code.

* tag 'tegra-for-3.7-dmaengine' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ASoC: tegra: remove support of legacy DMA driver based access
  spi: tegra: remove support of legacy DMA driver based access
  ARM: tegra: apbio: remove support of legacy DMA driver based access
  ARM: tegra: dma: remove legacy APB DMA driver
  ARM: tegra: config: enable dmaengine based APB DMA driver
  + sync to 3.6-rc6

Merge 3.6-rc6 into tty-next

2012-09-17T00:31:36+00:00

This pulls in the fixes in 3.6-rc6

Signed-off-by: Greg Kroah-Hartman

ARM: imx: move platform_data definitions

2012-09-14T09:17:21+00:00

Platform data for device drivers should be defined in
include/linux/platform_data/*.h, not in the architecture
and platform specific directories.

This moves such data out of the imx include directories

Signed-off-by: Arnd Bergmann 
Acked-by: Mark Brown 
Acked-by: Greg Kroah-Hartman 
Acked-by: Nicolas Pitre 
Acked-by: Mauro Carvalho Chehab 
Acked-by: Sascha Hauer 
Acked-by: Vinod Koul 
Cc: Russell King 
Cc: Dan Williams 
Cc: "Ben Dooks (embedded platforms)" 
Cc: "Wolfram Sang (embedded platforms)" 
Cc: Chris Ball 
Cc: David Woodhouse 
Cc: Grant Likely 
Cc: Alan Cox 
Cc: Felipe Balbi 
Cc: Alan Stern 
Cc: Florian Tobias Schandinat 
Cc: Liam Girdwood 
Cc: Javier Martin 
Cc: Shawn Guo 
Cc: Guennadi Liakhovetski

serial/imx: improve error diagnosics for clock and pinctrl failures

2012-09-05T20:15:07+00:00

These error paths are used more often now after deep changes to the
clock code and pinctrl is still new for imx. So help debugging and give
clues in the boot log.

Signed-off-by: Uwe Kleine-König 
Signed-off-by: Greg Kroah-Hartman

tty: serial: imx: don't reinit clock in imx_setup_ufcr()

2012-09-05T19:44:44+00:00

Remove the clock configuration from imx_setup_ufcr(). This
isn't needed here and will cause garbage output if done.

To be be sure that we only touch the bits we want (TXTL and RXTL)
we have to mask out all other bits of the UFCR register. Add
one non-existing bit macro for this, too (bit 6, DCEDTE on i.MX6).

Signed-off-by: Dirk Behme 
CC: Shawn Guo 
CC: Sascha Hauer 
CC: Troy Kisky 
CC: Xinyu Chen 
Cc: stable 
Acked-by: Shawn Guo 
Signed-off-by: Greg Kroah-Hartman

tty: serial: imx: console write routing is unsafe on SMP

2012-09-05T19:44:44+00:00

The console feature's write routing is unsafe on SMP with
the startup/shutdown call.

There could be several consumers of the console
* the kernel printk
* the init process using /dev/kmsg to call printk to show log
* shell, which open /dev/console and write with sys_write()

The shell goes into the normal uart open/write routing,
but the other two go into the console operations.
The open routing calls imx serial startup, which will write USR1/2
register without any lock and critical with imx_console_write call.

Add a spin_lock for startup/shutdown/console_write routing.

This patch is a port from Freescale's Android kernel.

Signed-off-by: Xinyu Chen 
Tested-by: Dirk Behme 
CC: Sascha Hauer 
Acked-by: Shawn Guo 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman