Commit Graph

26 Commits

Author SHA1 Message Date
Uwe Kleine-König
d485c7e716 ARM: mx25: move registration of gpios to plat-mxc/gpio.c
To use common macros to define the gpio ports for imx{1,21,25,27} the
existing ones had to made more general and a few more base address defines
were necessary.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17 10:01:38 +01:00
Uwe Kleine-König
2eb42d5c28 ARM: imx: dynamically allocate mxc-ehci devices
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17 10:01:31 +01:00
Uwe Kleine-König
b2997cb12b ARM: imx: dynamically allocate mx2-camera device
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17 10:01:24 +01:00
Uwe Kleine-König
d96801b2ca ARM: imx: remove deprecated symbols as all users are gone now
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17 08:58:12 +01:00
Uwe Kleine-König
a99631489b ARM: imx: change static io mapping to use a function
Now only the virtual addresses [0xf4000000, 0xf5ffffff] are used for
static per-SoC mappings.  The few mappings of whole chip selects are
moved accordingly.

The now wrong defines for virtual base addresses are removed.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17 08:58:11 +01:00
Uwe Kleine-König
f5d7a13b18 ARM: imx: refactor the io mapping macro
This makes it more assembler friendly and allows it to be used in situation
that need an unsigned long and not a pointer.  Also the naming is
clearer.  IOMEM is introduced without IMX_ prefix as it is used this way
in more than one ARM subarch and it might become globally available
soon.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17 08:58:08 +01:00
Uwe Kleine-König
00b57bf978 ARM: imx: reorganize nand registration to use a struct
Addiontionally make the interrupt #defines match the base address
defines MX.._NFC_BASE_ADDR.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-10-01 09:33:02 +02:00
Uwe Kleine-König
c69871597d ARM: imx: dynamically register imx-i2c devices (imx27)
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-30 09:00:41 +02: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
3cdd54417d imx: properly protect mach/mx{1,[25][157x]}.h from multiple inclusion
Some headers have used (now) wrong names or havn't had protection at
all.  This is needed before adding static inline functions to the
headers.

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: Magnus Lilja <lilja.magnus@gmail.com>
Cc: Holger Schurig <hs4233@mail.mn-solutions.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Daniel Mack <daniel@caiaq.de>
2010-01-08 16:45:23 +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
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
2ae959f420 imx: copy constants from mx2x.h to mx27.h using the appropriate namespace
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2009-11-18 10:41:44 +01:00
Uwe Kleine-König
26b10e7443 imx: add namespace prefixes for symbols in mx27.h
The old names are still defined using the new names.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2009-11-18 10:41:03 +01:00
Uwe Kleine-König
f73a42f705 imx: reorder mx27.h
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2009-11-18 10:40:38 +01:00
Sascha Hauer
12308dfe37 mxc: remove do not include directly
Everyone should be free to include the files he actually needs.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-08-07 12:10:54 +02:00
Sascha Hauer
abae613056 mxc: remove ARCH_NR_GPIOS
Use the default value of 256 which is enough for all i.MX SoCs.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-08-07 12:10:52 +02:00
Sascha Hauer
198016e1b1 [ARM] MXC: add cpu_is_ macros
We had hardcoded cpu_is_ macros for mxc architectures till now. As we
want to run the same kernel on i.MX31 and i.MX35 this patch adds cpu_is_
macros which expand to 0 or 1 if only one architecture is compiled in and
only check for the cpu type if more than one architecture is compiled
in.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13 10:34:26 +01:00
Holger Schurig
260a1fd26c arm/imx2x: split i.MX21/i.MX27 register definitions
* define new CONFIG_ARCH_MX21 (this one is currently mutually exclusive to
  CONFIG_ARCH_MX27, but this might change)
* splits one header file. Memory definitions, interrupt sources,
  DMA channels are split into common part, i.MX27 specific and i.MX21
  specific.
* guard access to UART5/UART6, which don't exist on i.MX21

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13 10:33:53 +01:00
Holger Schurig
058b7a6f46 arm/imx2x: removes a bunch of sparse-warnings
Here are some of the warnings that get fixed by this:

> 200 times: warning: cast adds address space to expression (<asn:2>)
twelve times: warning: symbol 'xxx' was not declared. Should it be static
two times: warning: symbol 'clock' shadows an earlier one
five times: warning: incorrect type in initializer (different address spaces)

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13 10:33:52 +01:00
Sascha Hauer
a244909152 [ARM] MXC: do not include mach/hardware.h from mach/memory.h
Instead of including other header files, define PHYS_OFFSET directly

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-18 16:40:14 +01:00
Sascha Hauer
44421e4258 [ARM] MXC: do not include mach/hardware.h from mach/timex.h
Instead of including other header files, define CLOCK_TICK_RATE directly

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-18 16:40:12 +01:00
Sascha Hauer
9d631b835f [ARM] MXC: remove dependency to other include files from irqs.h
This patch removes the inclusion of mach/hardware.h from mach/irqs.h and
switches to more meaningful names for the irq related macros.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-18 16:40:11 +01:00
Sascha Hauer
619e15508b MX27: Fix EMMA Base addresses
The EMMA (Enhanced Multimedia Engine) is divided into two parts, the
postprocessor and the preprocessor. Fix the base addresses.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-12-16 14:44:17 +01:00
Luotao Fu
defa8c309d i.MX3: Fix compiler warnings
Fix some base address declaration by adding a cast.

Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2008-09-09 12:13:53 +02:00
Russell King
a09e64fbc0 [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-08-07 09:55:48 +01:00