aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2 (follow)
AgeCommit message (Collapse)AuthorFilesLines
2010-06-24ARM: imx: rename mach dir for mx21 and mx27 to mach-imxUwe Kleine-König21-5726/+0
Finally all imx code should end up there, start with mach-mx2. While touching all files rename some files to use a hyphen instead of an underscore. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-24ARM: mx2/mx27ads: fold board header in its only userUwe Kleine-König1-2/+30
Moreover remove unused definitions. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-24ARM: mx2/mx21ads: fold board header in its only userUwe Kleine-König1-1/+35
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-24ARM: imx: remove empty and unused board headersUwe Kleine-König1-1/+0
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-24ARM: mx2/mx27_3ds: document alternative names and remove empty headerUwe Kleine-König1-1/+6
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-05-25Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds3-9/+6
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits) ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900 ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline ARM: 6140/1: silence a bogus sparse warning in unwind.c ARM: mach-at91: duplicated include ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup ARM: SPEAR6xx: remove duplicated #include ARM: s3c6400_defconfig: Add NAND driver ARM: s3c6400_defconfig: enable sound as modules ARM: s3c6400_defconfig: enable power management ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34 ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34 ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34 ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34 ...
2010-05-24Merge branch 'master' into develRussell King1-2/+2
2010-05-20ARM: 6135/1: mx21/devices: fix USBOTG resourceWolfram Sang1-2/+2
It got a typo from 988addf82e4c03739375279de73929580a2d4a6a. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: <stable@kernel.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-17can: sja1000 platform data fixesWolfgang Grandegger1-3/+3
The member "clock" of struct "sja1000_platform_data" is documented as "CAN bus oscillator frequency in Hz" but it's actually used as the CAN clock frequency, which is half of it. To avoid further confusion, this patch fixes it by renaming the member to "osc_freq". That way, also non mainline users will notice the change. The platform code for the relevant boards is updated accordingly. Furthermore, pre-defined values are now used for the members "ocr" and "cdr". Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
2010-05-17arm/mach-mx2: add watchdog device to Phytec-boardsWolfram Sang2-0/+2
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-05-17arm/mach-mx2/3: Fix watchdog-devices to match the current driverWolfram Sang1-7/+2
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-03-08Merge branch 'origin' into devel-stableRussell King4-25/+47
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c
2010-03-02USB: MXC: add platform resources for i.MX21 USB host controller.Martin Fuzzey2-0/+28
Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-03-02USB: MXC: use DMA_BIT_MASK macro rather than hardcoded constants.Martin Fuzzey1-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>
2010-02-25Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/masterUwe Kleine-König3-0/+175
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>
2010-02-24arm/imx: let platform files include the SoC-specific iomux headerUwe Kleine-König10-10/+10
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24arm/mx2: split generic.c into mm-imx2[17].cUwe Kleine-König3-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>
2010-02-24arm/mx2/devices: no need for IMX_NEEDS_DEPRECATED_SYMBOLS any moreUwe Kleine-König1-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>
2010-02-24arm/mx2: define seperate gpio port descriptions for imx21 and imx27Uwe Kleine-König1-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>
2010-02-24arm/mx2: use per-SOC nand deviceUwe Kleine-König7-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>
2010-02-15arm/mx2: define seperate imx_nand devices for imx21 and imx27Uwe Kleine-König2-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>
2010-02-12ARM: Consolidate clks_register() and similarRussell King2-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>
2010-02-10pca100: add sound supportSascha Hauer1-0/+48
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-02-08arm/mx2/devices: use SoC-prefixed names where possibleUwe Kleine-König1-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>
2010-02-08arm/mx2: use cpp magic to create imx-ssi devicesUwe Kleine-König1-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>
2010-02-08arm/mx2: use cpp magic to create imx-mmc devicesUwe Kleine-König1-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>
2010-02-08arm/mx2: use cpp magic to create imx-i2c devicesUwe Kleine-König2-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>
2010-02-08arm/mx2: use cpp magic to create imx_gpt devicesUwe Kleine-König2-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>
2010-02-08arm/mx2: use cpp magic to create spi_imx devicesUwe Kleine-König2-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>
2010-02-04i.MX27 pcm038: Add USB supportSascha Hauer2-0/+23
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-02-04i.MX27 pca100: Add USB supportSascha Hauer2-0/+104
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-02-02imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSETUwe Kleine-König8-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>
2010-02-02imx2x: convert serial.c to use soc-prefixed constantsUwe Kleine-König2-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>
2010-01-08imx: define functions to configure chip selects in the WEIMUwe Kleine-König1-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>
2010-01-08imx: only define deprecated symbols conditionallyUwe Kleine-König1-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>
2010-01-08imx: mangle addresses after adding the offsetUwe Kleine-König2-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>
2010-01-08imx27: define and use MX27_IO_ADDRESSUwe Kleine-König2-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>
2010-01-08imx21: define and use MX21_IO_ADDRESSUwe Kleine-König1-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>
2010-01-05imx/mx2: rename files defining a machine to mach-$mach.cUwe Kleine-König9-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>
2010-01-05imx: rename Kconfig symbol for "LogicPD MX27 LITEKIT platform"Uwe Kleine-König2-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>
2010-01-05imx: rename Kconfig symbol for "Eukrea CPUIMX27 module"Uwe Kleine-König2-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>
2010-01-05imx/mach-mx2: use constants namespaced by the corresponding SOC (easy part)Uwe Kleine-König12-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>
2010-01-05imx/clock-imx27: use a macro to define registersUwe Kleine-König1-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>
2010-01-05imx/clock-imx21: use a macro to define registersUwe Kleine-König1-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>
2010-01-05imx/mx2: fold crm_regs.h into its only consumerUwe Kleine-König2-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>
2010-01-04mx27: mxt_td60: Remove not used UART pinsAlan Carvalho de Assis1-24/+0
Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-12-02mx27: mxt_td60: Add support to SD/MMCAlan Carvalho de Assis1-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>
2009-11-27mx27: Add basic support for Maxtrack i-MXT TD60Alan Carvalho de Assis3-0/+292
Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-11-27IMX: don't disable the uart clock if DEBUG_LL uses itUwe Kleine-König2-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>
2009-11-14MXC: Add a digital audio multiplexer driverSascha Hauer1-0/+2
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.