Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new

Add basic function and uart device support.
Signed-off-by: NRichard Zhao <richard.zhao@freescale.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Add core definitions and memory map, gpio, irq, iomux, uart device
support.
Signed-off-by: NRichard Zhao <richard.zhao@freescale.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Signed-off-by: NRichard Zhao <richard.zhao@freescale.com>
Acked-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

mx5 SoCs have different GPIO port count.
Signed-off-by: NRichard Zhao <richard.zhao@freescale.com>
Acked-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Signed-off-by: NRichard Zhao <richard.zhao@freescale.com>
Acked-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Signed-off-by: NRichard Zhao <richard.zhao@freescale.com>
Acked-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

Add initial mx28evk support with duart and fec0.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

Add initial mx23evk support with duart.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

Dynamically allocate fec devices for MX28, which gets dual
fec interface.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

Dynamically allocate duart devices for MX23 and MX28.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

Create static memory mapping for MX23 and MX28.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

Add clock for MXS-based SoCs, MX23 and MX28.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

MXS-based SoCs implements iomux functions in block PINCTRL.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

MXS-based SoCs implement gpio support in block PINCTRL.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

There are 2 versions of the timrot on Freescale MXS-based SoCs.
The v1 on MX23 only gets 16 bits counter, while v2 on MX28
extends the counter to 32 bits.

The implementation uses two timers, one for clock_event and
another for clocksource. MX28 uses timrot 0 and 1, while MX23
uses 0 and 2.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

 - DEBUG_LL support, which is incompatible with multi-soc MXS image
   because of different DUART base address on MX23 and MX28
 - uncompress message support
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

Add Interrupt Collector (ICOLL) support for MXS-based.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

 - The mxs wdog is implemented in RTC block.
 - There is a generic software reset routine for most modules on mxs.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

This iomux file has been constructed from the Freescale pinmux tool.
It contains all pins from the tool, but the datasheet lists some
configurations not present in the tool, these are not yet added.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

This patch actually replaces the 'struct pad_desc' with a u64 cookie
to facilitate adding platform specific pad_ctrl settings to an
existing pad definition.

So, instead of:
	iomux_v3_cfg_t power_key = MX51_PAD_EIM_A27__GPIO_2_21;
	power_key.pad_ctrl = MX51_GPIO_PAD_CTRL_2;
	mxc_iomux_v3_setup_pad(&power_key);
one can write:
	mxc_iomux_v3_setup_pad((MX51_PAD_EIM_A27__GPIO_2_21 & ~MUX_PAD_CTRL_MASK) | MX51_GPIO_PAD_CTRL_2);

Patch applies to branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/imx/linux-2.6Signed-Off-By: NLothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

When building as module:
ERROR: "cpufreq_gov_performance" [arch/arm/plat-mxc/cpufreq.ko] undefined!
WARNING: modpost: Found 1 section mismatch(es).
To see full details build your kernel with:
'make CONFIG_DEBUG_SECTION_MISMATCH=y'
make[1]: *** [__modpost] Error 1
make: *** [modules] Error 2

It's due to the driver using CPUFREQ_DEFAULT_GOVERNOR, even it should not
(see commit 8122c6ce in Linus tree), so
remove it.
Signed-off-by: NArnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Add support for FIQ on mx51 TZIC

TZIC changes tested with FIQ audio on an mx51 board

AVIC changes build with mx3_defconfig, not tested
Signed-off-by: NPeter Horton <phorton@bitbox.co.uk>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Add SSI3 to MX51
Signed-off-by: NPeter Horton <phorton@bitbox.co.uk>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name.
Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Add helper definition and function for MXS-based.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

Add core definitions for MXS-based SoC MX23 and MX28.
Signed-off-by: NShawn Guo <shawn.guo@freescale.com>
Signed-off-by: NUwe Kleine-König <u.kleine-koenig@pengutronix.de>

Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

MX51 has two watchdog modules.

Add support for both of them.
Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>

Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Fix incorrect proc spurious output

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
  wmi: use memcmp instead of strncmp to compare GUIDs
  ACPI, hp-wmi: Fix memory leak in acpi query
  msi-wmi: fix semantically incorrect use of keycode instead of scancode
  msi-wmi: Add mute key support
  asus-laptop: add wimax and wwan support
  eeepc-wmi: fix compiler warning
  ibm_rtl: _RTL_ is not available in UEFI mode
  ibm_rtl: Loosen the DMI criteria to all IBM machines
  drivers/platform/x86/thinkpad_acpi.c: delete double assignment
  eeepc-wmi: add cpufv sysfs documentation
  toshiba_acpi.c: Add key_entry for a lone FN keypress
  ibm_rtl: fix printk format warning

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] css: fix rsid evaluation for 2nd crw
  [S390] nohz/s390: fix arch_needs_cpu() return value on offline cpus

With the recent changes to remove the BKL a mutex was added to the
ioctl entry point for calls to the old ioctl interface. This mutex
needs to be removed because of the need for the expire ioctl to call
back to the daemon to perform a umount and receive a completion
status (via another ioctl).

This should be fine as the new ioctl interface uses much of the same
code and it has been used without a mutex for around a year without
issue, as was the original intention.

Ref: Bugzilla bug 23142
Signed-off-by: NIan Kent <raven@themaw.net>
Acked-by: NArnd Bergmann <arnd@arndb.de>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>