aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'origin' into devel-stableRussell King2010-03-084-25/+47
|\ | | | | | | | | | | | | Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c
| * USB: MXC: add platform resources for i.MX21 USB host controller.Martin Fuzzey2010-03-022-0/+28
| | | | | | | | | | | | Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * USB: MXC: use DMA_BIT_MASK macro rather than hardcoded constants.Martin Fuzzey2010-03-021-26/+27
| | | | | | | | | | | | | | | | | | 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>
| * ARM: Consolidate clks_register() and similarRussell King2010-02-122-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Uwe Kleine-König2010-02-253-0/+175
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imx/master Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5. This is handled in 03e09cd8902717b66f940357257d8ad76114d9f2. arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520538e095d10456acd28d9107317aa32 and got bug fixed in 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c. The bug in arch/arm/plat-mxc/iomux-v1.c isn't present any more since bac3fcfad565c9bbceeed8b607f140c29df97355, 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>
| * | pca100: add sound supportSascha Hauer2010-02-101-0/+48
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX27 pcm038: Add USB supportSascha Hauer2010-02-042-0/+23
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX27 pca100: Add USB supportSascha Hauer2010-02-042-0/+104
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | arm/imx: let platform files include the SoC-specific iomux headerUwe Kleine-König2010-02-2410-10/+10
| | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* | | arm/mx2: split generic.c into mm-imx2[17].cUwe Kleine-König2010-02-243-33/+101
| | | | | | | | | | | | | | | | | | | | | 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>
* | | arm/mx2/devices: no need for IMX_NEEDS_DEPRECATED_SYMBOLS any moreUwe Kleine-König2010-02-241-1/+0
| | | | | | | | | | | | | | | | | | | | | 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>
* | | arm/mx2: define seperate gpio port descriptions for imx21 and imx27Uwe Kleine-König2010-02-241-28/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | arm/mx2: use per-SOC nand deviceUwe Kleine-König2010-02-247-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | arm/mx2: define seperate imx_nand devices for imx21 and imx27Uwe Kleine-König2010-02-152-18/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | arm/mx2/devices: use SoC-prefixed names where possibleUwe Kleine-König2010-02-081-55/+55
| | | | | | | | | | | | | | | | | | | | | 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>
* | | arm/mx2: use cpp magic to create imx-ssi devicesUwe Kleine-König2010-02-081-75/+32
| | | | | | | | | | | | | | | | | | | | | 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>
* | | arm/mx2: use cpp magic to create imx-mmc devicesUwe Kleine-König2010-02-081-56/+31
| | | | | | | | | | | | | | | | | | | | | 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>
* | | arm/mx2: use cpp magic to create imx-i2c devicesUwe Kleine-König2010-02-082-34/+22
| | | | | | | | | | | | | | | | | | | | | 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>
* | | arm/mx2: use cpp magic to create imx_gpt devicesUwe Kleine-König2010-02-082-94/+26
| | | | | | | | | | | | | | | | | | | | | 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>
* | | arm/mx2: use cpp magic to create spi_imx devicesUwe Kleine-König2010-02-082-56/+24
|/ / | | | | | | | | | | | | 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>
* | imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSETUwe Kleine-König2010-02-028-8/+8
| | | | | | | | | | | | | | 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>
* | imx2x: convert serial.c to use soc-prefixed constantsUwe Kleine-König2010-02-022-25/+24
| | | | | | | | | | | | | | 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>
* | imx: define functions to configure chip selects in the WEIMUwe Kleine-König2010-01-081-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | imx: only define deprecated symbols conditionallyUwe Kleine-König2010-01-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | imx: mangle addresses after adding the offsetUwe Kleine-König2010-01-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | imx27: define and use MX27_IO_ADDRESSUwe Kleine-König2010-01-082-3/+4
| | | | | | | | | | | | | | | | | | | | 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>
* | imx21: define and use MX21_IO_ADDRESSUwe Kleine-König2010-01-081-2/+2
| | | | | | | | | | | | | | | | | | 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>
* | imx/mx2: rename files defining a machine to mach-$mach.cUwe Kleine-König2010-01-059-9/+8
| | | | | | | | | | | | | | 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>
* | imx: rename Kconfig symbol for "LogicPD MX27 LITEKIT platform"Uwe Kleine-König2010-01-052-2/+2
| | | | | | | | | | | | | | | | | | | | 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>
* | imx: rename Kconfig symbol for "Eukrea CPUIMX27 module"Uwe Kleine-König2010-01-052-4/+4
| | | | | | | | | | | | | | | | | | | | | | 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>
* | imx/mach-mx2: use constants namespaced by the corresponding SOC (easy part)Uwe Kleine-König2010-01-0512-33/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | imx/clock-imx27: use a macro to define registersUwe Kleine-König2010-01-051-14/+16
| | | | | | | | | | | | | | | | | | | | | | 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>
* | imx/clock-imx21: use a macro to define registersUwe Kleine-König2010-01-051-14/+16
| | | | | | | | | | | | | | | | | | | | 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>
* | imx/mx2: fold crm_regs.h into its only consumerUwe Kleine-König2010-01-052-259/+230
|/ | | | | | | | 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>
* mx27: mxt_td60: Remove not used UART pinsAlan Carvalho de Assis2010-01-041-24/+0
| | | | | Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mx27: mxt_td60: Add support to SD/MMCAlan Carvalho de Assis2009-12-021-2/+37
| | | | | | | | 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>
* mx27: Add basic support for Maxtrack i-MXT TD60Alan Carvalho de Assis2009-11-273-0/+292
| | | | | Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* IMX: don't disable the uart clock if DEBUG_LL uses itUwe Kleine-König2009-11-272-2/+2
| | | | | | | | | | 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>
* MXC: Add a digital audio multiplexer driverSascha Hauer2009-11-141-0/+2
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* i.MX2: Add sound (ssi) resourcesSascha Hauer2009-11-143-3/+82
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* pca100: use correct irq initialisation functionSascha Hauer2009-11-141-1/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* MXC: fix reset for mx31, mx35 and mx27 SoCsValentin Longchamp2009-10-131-1/+1
| | | | | | | | 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>
* pcm970 mmc: Fix ro switchSascha Hauer2009-10-131-1/+1
| | | | | | | | 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>
* pcm038: Add SPI/MC13783 supportSascha Hauer2009-10-131-2/+94
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* i.MX27 clock: rename spi clocks to match deviceSascha Hauer2009-10-021-3/+3
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mx21ads: Fix framebuffer platform dataSascha Hauer2009-08-141-18/+26
| | | | | | | 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>
* MX21: Compilation fix for devices.cSascha Hauer2009-08-141-1/+2
| | | | | | | 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>
* pcm038: mux configuration for predefined gpio lineLuotao Fu2009-08-141-0/+3
| | | | Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
* mx27: add support for phytec pca100 (phyCARD-s) boardLuotao Fu2009-08-143-0/+253
| | | | | Signed-off-by: Luotao Fu <l.fu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* MX2: Add SPI devices/resourcesSascha Hauer2009-08-142-0/+72
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.1 at 2024-12-28 04:16:37 +0000