Commit Graph

125 Commits

Author SHA1 Message Date
Russell King 988addf82e Merge branch 'origin' into devel-stable
Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c
2010-03-08 20:21:04 +00:00
Martin Fuzzey 4e0fa90d1d USB: MXC: add platform resources for i.MX21 USB host controller.
Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-03-02 14:52:57 -08:00
Martin Fuzzey 3eb352c73c USB: MXC: use DMA_BIT_MASK macro rather than hardcoded constants.
Also fixes tab/space issue causing checkpatch to complain.

Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-03-02 14:52:56 -08:00
Uwe Kleine-König 9b1489e989 Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master
Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5.  This is handled
in 03e09cd890.

arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to
arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520
and got bug fixed in 5c17ef878f.  The bug
in arch/arm/plat-mxc/iomux-v1.c isn't present any more since
bac3fcfad5, so
arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted.

Conflicts:
	arch/arm/plat-mxc/Kconfig
	arch/arm/plat-mxc/Makefile
	arch/arm/plat-mxc/iomux-mx1-mx2.c

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-25 14:01:49 +01:00
Uwe Kleine-König e835d88e71 arm/imx: let platform files include the SoC-specific iomux header
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24 10:07:15 +01:00
Uwe Kleine-König 4a50d00cb9 arm/mx2: split generic.c into mm-imx2[17].c
This removes some #ifdefs and prepares moving the files in a directory
with more than imx21 and imx27 support.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24 10:06:55 +01:00
Uwe Kleine-König 621b0e53b5 arm/mx2/devices: no need for IMX_NEEDS_DEPRECATED_SYMBOLS any more
The previous commits cleaned up arch/arm/mach-mx2/devices.c such that it
doesn't rely on deprecated symbols any more.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24 10:06:52 +01:00
Uwe Kleine-König 897359d596 arm/mx2: define seperate gpio port descriptions for imx21 and imx27
As the gpio ports have different addresses on imx21 and imx27 there are
two different port descriptions needed if not relying on the overloaded
cpp macro IO_ADDRESS.  So some cpp magic is added to minimize code
duplication.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24 10:06:51 +01:00
Uwe Kleine-König 3636a14532 arm/mx2: use per-SOC nand device
The previous commit introduced one nand device per SoC.  Use this
directly instead of the compatibility macro that will break for
multi-SoC kernels.  And while at it remove the compatibility macro now
that all in-tree users are fixed.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24 10:05:38 +01:00
Uwe Kleine-König f0d3ab4911 arm/mx2: define seperate imx_nand devices for imx21 and imx27
As the NFC controller has different addresses on imx21 and imx27 there
are two different devices needed if not relying on the overloaded cpp
macro NFC_BASE_ADDR.  So some cpp magic is added to minimize code
duplication.

As obviously these two defines need different names, the name of the old
device is #defined to the new one when building for only one of imx21 or
imx27.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-15 17:03:55 +01:00
Russell King 0a0300dc8c ARM: Consolidate clks_register() and similar
Most machine classes want some way to register a block of clk_lookup
structures, and most do it by implementing a clks_register() type
function which walks an array, or by open-coding a loop.

Consolidate all this into clkdev_add_table().

Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-02-12 17:32:36 +00:00
Sascha Hauer c8a6885f21 pca100: add sound support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-02-10 11:05:18 +01:00
Uwe Kleine-König 58152a1690 arm/mx2/devices: use SoC-prefixed names where possible
There is only NFC_BASE_ADDR left which is defined differently for mx21
and mx27.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-08 11:47:03 +01:00
Uwe Kleine-König 69ddb48803 arm/mx2: use cpp magic to create imx-ssi devices
This makes the source shorter and easier to verify.  While at it switch
to use the SoC-prefixed constants.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-08 11:47:03 +01:00
Uwe Kleine-König ccd0e42c82 arm/mx2: use cpp magic to create imx-mmc devices
This makes the source shorter and easier to verify.  While at it switch
to use the SoC-prefixed constants.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-08 11:47:02 +01:00
Uwe Kleine-König 9309b2ba54 arm/mx2: use cpp magic to create imx-i2c devices
This makes the source shorter and easier to verify.  While at it switch
to use the SoC-prefixed constants.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-08 11:47:01 +01:00
Uwe Kleine-König 2b84a3640f arm/mx2: use cpp magic to create imx_gpt devices
This makes the source shorter and easier to verify.  While at it switch
to use the SoC-prefixed constants.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-08 11:47:00 +01:00
Uwe Kleine-König 68c94b40b3 arm/mx2: use cpp magic to create spi_imx devices
This makes the source shorter and easier to verify.  While at it switch
to use the SoC-prefixed constants.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-08 11:47:00 +01:00
Sascha Hauer 773f206b2f i.MX27 pcm038: Add USB support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-02-04 17:29:35 +01:00
Sascha Hauer eee7c497d2 i.MX27 pca100: Add USB support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-02-04 17:29:34 +01:00
Uwe Kleine-König 34101237d9 imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSET
This is a further step in allowing to build a kernel image for more
than one imx SOC.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-02 09:07:59 +01:00
Uwe Kleine-König 7fc06d8c24 imx2x: convert serial.c to use soc-prefixed constants
This makes the file compilable for a kernel that supports both imx21 and
imx27.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-02 09:07:58 +01:00
Uwe Kleine-König a8dfb6462a imx: define functions to configure chip selects in the WEIM
This has the addional effect that the macros CSCR_U, CSCR_L and CSCR_A
are not used anymore in mach-pcm038.c and mach-qong.c.  These still use
the deprecated IO_ADDRESS macro and shouldn't be used in new code.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Dmitriy Taychenachev <dimichxp@gmail.com>
2010-01-08 16:45:24 +01:00
Uwe Kleine-König aae7019382 imx: only define deprecated symbols conditionally
Define deprecated symbols in an #ifdef IMX_NEEDS_DEPRECATED_SYMBOLS ...

All files that still depend on the old definitions get
-DIMX_NEEDS_DEPRECATED_SYMBOLS passed to the compiler.

When all remaining users are fixed this allows including the soc
specific headers unconditionally.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Eric Benard <eric@eukrea.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Alan Carvalho de Assis <acassis@gmail.com>
Cc: Daniel Mack <daniel@caiaq.de>
Cc: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Cc: Ilya Yanok <yanok@emcraft.com>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Magnus Lilja <lilja.magnus@gmail.com>
2010-01-08 16:45:20 +01:00
Uwe Kleine-König a9b7a2dd21 imx: mangle addresses after adding the offset
don't use

	IO_ADDRESS($base) + $offset

but

	IO_ADDRESS($base + $offset)

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Rabin Vincent <rabin@rab.in>
Cc: "Agustín Ferrín Pozuelo" <gatoguan-os@yahoo.com>
Cc: Javier Martin <javier.martin@vista-silicon.com>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Cc: Daniel Mack <daniel@caiaq.de>
Cc: Dmitriy Taychenachev <dimichxp@gmail.com>
2010-01-08 16:45:20 +01:00
Uwe Kleine-König bc9ea6c7f5 imx27: define and use MX27_IO_ADDRESS
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Rabin Vincent <rabin@rab.in>
Cc: Javier Martin <javier.martin@vista-silicon.com>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
2010-01-08 16:41:25 +01:00
Uwe Kleine-König a3f5ac7838 imx21: define and use MX21_IO_ADDRESS
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Rabin Vincent <rabin@rab.in>
Cc: Agustín Ferrín Pozuelo <gatoguan-os@yahoo.com>
2010-01-08 16:41:24 +01:00
Uwe Kleine-König 386c5cf7a9 imx/mx2: rename files defining a machine to mach-$mach.c
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Eric Benard <eric@eukrea.com>
2010-01-05 10:10:09 +01:00
Uwe Kleine-König f747f93543 imx: rename Kconfig symbol for "LogicPD MX27 LITEKIT platform"
Not using MACH_IMX27LITE makes machine_is_imx27lite always return 0
independent of building support for this machine.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Daniel Schaeffer <daniel.schaeffer@timesys.com>
2010-01-05 10:10:08 +01:00
Uwe Kleine-König bc727390f0 imx: rename Kconfig symbol for "Eukrea CPUIMX27 module"
Not using MACH_CPUIMX27 makes machine_is_cpuimx27 always return 0
independent of building support for this machine.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Eric Benard <eric@eukrea.com>
2010-01-05 10:10:08 +01:00
Uwe Kleine-König 3f35d1f5e4 imx/mach-mx2: use constants namespaced by the corresponding SOC (easy part)
This just leaves devices.c, generic.c and serial.c to clean up.  As
these files are used on more than one SOC they need some more work.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Rabin Vincent <rabin@rab.in>
Cc: Javier Martin <javier.martin@vista-silicon.com>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Eric Benard <eric@eukrea.com>
Cc: Ivo Clarysse <ivo.clarysse@gmail.com>
Cc: Vladimir Barinov <vbarinov@embeddedalley.com>
Cc: Daniel Schaeffer <daniel.schaeffer@timesys.com>
Cc: Simon POLETTE <spolette@adnlysd018.(none)>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Alan Carvalho de Assis <acassis@gmail.com>
Cc: Luotao Fu <l.fu@pengutronix.de>
2010-01-05 10:10:07 +01:00
Uwe Kleine-König b70564686a imx/clock-imx27: use a macro to define registers
This way the base address isn't hard coded in each register definition

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Rabin Vincent <rabin@rab.in>
Cc: Javier Martin <javier.martin@vista-silicon.com>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
2010-01-05 10:10:07 +01:00
Uwe Kleine-König 318859fdff imx/clock-imx21: use a macro to define registers
This way the base address isn't hard coded in each register definition

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Rabin Vincent <rabin@rab.in>
2010-01-05 10:10:06 +01:00
Uwe Kleine-König 5113f81520 imx/mx2: fold crm_regs.h into its only consumer
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Rabin Vincent <rabin@rab.in>
2010-01-05 10:10:06 +01:00
Alan Carvalho de Assis 2243b649aa mx27: mxt_td60: Remove not used UART pins
Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-01-04 11:47:43 +01:00
Alan Carvalho de Assis 9e3e7afe9b mx27: mxt_td60: Add support to SD/MMC
This patch configures iomux and i2c io expander in order to add
support to SD/MMC cards on i-MXT TD60.

Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-12-02 12:06:14 +01:00
Alan Carvalho de Assis 143a179d6c mx27: Add basic support for Maxtrack i-MXT TD60
Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-11-27 09:01:56 +01:00
Uwe Kleine-König 97adeda043 IMX: don't disable the uart clock if DEBUG_LL uses it
Before the clock was left enabled only for DEBUG_LL_CONSOLE which
requires an additional patch to exist at all.  With this patch applied
DEBUG_LL_CONSOLE depends on DEBUG_LL, so this doesn't break.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-11-27 08:32:37 +01:00
Sascha Hauer 9eedbdf1b4 MXC: Add a digital audio multiplexer driver
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-11-14 10:30:39 +01:00
Sascha Hauer 23291df423 i.MX2: Add sound (ssi) resources
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-11-14 10:30:19 +01:00
Sascha Hauer f6f1bc64f0 pca100: use correct irq initialisation function
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-11-14 10:30:19 +01:00
Valentin Longchamp 679bfef0e3 MXC: fix reset for mx31, mx35 and mx27 SoCs
The clock name for the watchdog devices was not set consistently
with mx21 on these platforms, resulting in the reset not to work.

Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-10-13 10:24:10 +02:00
Sascha Hauer a90c31a3b7 pcm970 mmc: Fix ro switch
We have to use mxc_gpio_mode() for the card detection pin
instead of mxc_gpio_setup_multiple_pins() because the latter
does a gpio_request() and thus a later gpio_request() fails.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-10-13 10:24:07 +02:00
Sascha Hauer 6153384161 pcm038: Add SPI/MC13783 support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-10-13 10:24:02 +02:00
Sascha Hauer 5cf3bcdada i.MX27 clock: rename spi clocks to match device
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-10-02 09:03:47 +02:00
Sascha Hauer c35d3a4181 mx21ads: Fix framebuffer platform data
struct imx_fb_platform_data has changed and the mx21ads was
forgotten to change. Fix it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-08-14 12:41:16 +02:00
Sascha Hauer f6d2fa7dcb MX21: Compilation fix for devices.c
The OTG devices are only available on i.MX27, so ifdef
them out for i.MX21.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-08-14 12:41:15 +02:00
Luotao Fu 0160651a65 pcm038: mux configuration for predefined gpio line
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
2009-08-14 12:41:04 +02:00
Luotao Fu 337316986f mx27: add support for phytec pca100 (phyCARD-s) board
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-08-14 12:40:59 +02:00
Sascha Hauer f420db843b MX2: Add SPI devices/resources
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-08-14 12:40:52 +02:00