Uwe Kleine-König [Thu, 25 Feb 2010 13:01:49 +0000 (14:01 +0100)]
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
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>
Baruch Siach [Wed, 24 Feb 2010 09:31:31 +0000 (11:31 +0200)]
mx25: move ARCH_MXC_IOMUX_V3 to the ARCH level
ARCH_MXC_IOMUX_V3 is not specific to the i.MX25 PDK platform. Thus,
ARCH_MXC_IOMUX_V3 should be selected by ARCH_MX25.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Fabio Estevam [Wed, 17 Feb 2010 20:02:56 +0000 (12:02 -0800)]
mx51_babbage: Fix ckih2 parameter in mx51_clocks_init function
This patch is to be applied into Sascha's mxc-master branch.
Fix ckih2 parameter in mx51_clocks_init funtion. CKIH2 pin is left unconnected on Babbage.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Amit Kucheria <amit.kucheria@canonical.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Mark Brown [Tue, 23 Feb 2010 11:05:11 +0000 (11:05 +0000)]
mx31ads: Configure SSI5 pins in IOMUX for PMIC module audio support
SSI5 on the CPU is connected to the PMIC module to provide audio support
so unconditionally configure the relevant pins on the CPU to route out
the signals.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 08:47:55 +0000 (09:47 +0100)]
arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode
mxc_gpio_mode checks for invalid pins and so it returns zero for
success, -EINVAL for invalid pins.
While at it, remove definitions of GPIO_PORT_MAX removed as they are
unused now.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Tue, 16 Feb 2010 10:07:49 +0000 (11:07 +0100)]
arm/imx: let platform files include the SoC-specific iomux header
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 20:52:34 +0000 (21:52 +0100)]
arm/imx/iomux-v1: rename header file
Addionally make iomux-mx*.h headers stand-alone and similar to iomux-v3
platform files should include their platform iomux header from now on.
For now iomux.h simply includes all iomux-v1 platform headers and so
provides compatibility until all files are converted.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 20:18:43 +0000 (21:18 +0100)]
arm/mx25: don't include iomux.h which is for iomux-v1 machines
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 20:10:39 +0000 (21:10 +0100)]
arm/imx/iomux-mx3.h: unify style and comments
- use __MACH_IOMUX_MX3_H__ as header protector analogous to
<mach/mx...h>
- use tabs for indention
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 20:04:17 +0000 (21:04 +0100)]
arm/imx/iomux-mx2x: unify style
- use __MACH_IOMUX_MX2x_H__ as header protector analogous to
<mach/mx...h>
- use tabs for indention
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 19:56:03 +0000 (20:56 +0100)]
arm/imx/iomux-mx27: unify style and comments
- use __MACH_IOMUX_MX27_H__ as header protector analogous to
<mach/mx...h>
- use tabs for indention
- fix sorting
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 19:50:57 +0000 (20:50 +0100)]
arm/imx/iomux-mx25: unify style and comment cleanup
- use __MACH_IOMUX_MX25_H__ as header protector analogous to
<mach/mx...h>
- remove doxygen comments
- remove #error about mach/iomux.h which is unused on mx25
- remove #ifndef __ASSEMBLY__ which is unneeded here
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 19:46:47 +0000 (20:46 +0100)]
arm/imx/iomux-mx21: unify style
- use __MACH_IOMUX_MX21_H__ as header protector analogous to
<mach/mx...h>
- use tabs for indention
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 19:39:59 +0000 (20:39 +0100)]
arm/imx/iomux-mx1: unify style and comment cleanup
- use __MACH_IOMUX_MX1_H__ as header protector analogous to
<mach/mx...h>
- use tabs for indention
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 15:57:09 +0000 (16:57 +0100)]
arm/imx/iomux-v1: make base address a runtime choice
While at it move register modification to static inlines and
so make the relevant code more readable.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 08:42:59 +0000 (09:42 +0100)]
arm/imx/iomux-v1: rename source file and reorganize Kconfig stuff
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Wed, 17 Feb 2010 21:17:43 +0000 (22:17 +0100)]
arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_...
This is necessary for a multi-SoC kernel.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Wed, 17 Feb 2010 18:37:05 +0000 (19:37 +0100)]
arm/imx/dma-v1: don't use deprecated symbols DMA_BASE and MXC_INT_DMACH0
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Wed, 17 Feb 2010 20:05:27 +0000 (21:05 +0100)]
arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 and mx3
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Wed, 17 Feb 2010 20:08:00 +0000 (21:08 +0100)]
arm/imx/irq: order definitions of MXC_GPIO_IRQS numerically
This is important for kernels supporting more than one SoC.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 16:11:17 +0000 (17:11 +0100)]
arm/imx: don't depend on ARCH_MXC twice
MXC_IRQ_PRIOR, MXC_PWM and ARCH_HAS_RNGA are all defined in an "if
ARCH_MXC" ... "endif" block, so they depend on ARCH_MXC anyhow.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Fri, 19 Feb 2010 14:29:26 +0000 (15:29 +0100)]
arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV block
COMMON_CLKDEV is used on all imx platforms, so this isn't used.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Fri, 19 Feb 2010 16:08:42 +0000 (17:08 +0100)]
arm/imx: remove MTD_XIP support
This is broken since at least one year when
ec996ba (mxc timer: make compile time independent)
removed the symbol MXC_TCN.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Fri, 19 Feb 2010 15:16:09 +0000 (16:16 +0100)]
arm/imx: don't explicitly select GENERIC_GPIO
ARCH_REQUIRE_GPIOLIB selects GPIOLIB which in turn selects GENERIC_GPIO
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 16:10:42 +0000 (17:10 +0100)]
arm/imx: let ARCH_MXC select COMMON_CLKDEV instead of each subfamily
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 15 Feb 2010 08:54:46 +0000 (09:54 +0100)]
arm/imx: remove "NO_PAD_CTRL" from Copyright statements
I assume this was introduced by something like
sed -i -e 's/)/, NO_PAD_CTRL)'
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Fri, 12 Feb 2010 21:38:31 +0000 (22:38 +0100)]
arm/imx/audmux-v2: use SoC-prefixed names
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Fri, 12 Feb 2010 21:38:31 +0000 (22:38 +0100)]
arm/imx/audmux-v1: use SoC-prefixed names
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 8 Feb 2010 20:07:16 +0000 (21:07 +0100)]
arm/imx/gpio: remove a BUG_ON in hot path
Now if the problem occurs that triggered the BUG_ON before, the machine
runs in a NULL pointer dereference. So it wouldn't be much harder now
to debug the situation if it occured.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 8 Feb 2010 20:02:30 +0000 (21:02 +0100)]
arm/imx/gpio: use fls to find set bits in the irq status register
As in most cases only few irqs are pending using fls is more effective
than looping over all bits.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 8 Feb 2010 19:34:27 +0000 (20:34 +0100)]
arm/imx: use generic_handle_irq instead of open-coding it
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Fri, 5 Feb 2010 21:14:37 +0000 (22:14 +0100)]
arm/imx/gpio: GPIO_INT_{HIGH,LOW}_LEV are not necessarily constant
GPIO_INT_LOW_LEV is defined as
(cpu_is_mx1_mx2() ? 0x3 : 0x0)
so depending on compiler optimisation and enabled SoCs this doesn't
qualify as a constant expression as needed by a switch statement.
Ditto for GPIO_INT_HIGH_LEV.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Fri, 5 Feb 2010 21:00:11 +0000 (22:00 +0100)]
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>
Uwe Kleine-König [Fri, 5 Feb 2010 16:44:33 +0000 (17:44 +0100)]
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>
Uwe Kleine-König [Fri, 5 Feb 2010 16:40:28 +0000 (17:40 +0100)]
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>
Uwe Kleine-König [Thu, 11 Feb 2010 15:31:49 +0000 (16:31 +0100)]
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>
Baruch Siach [Wed, 17 Feb 2010 10:33:25 +0000 (12:33 +0200)]
mx25pdk: add LCD support
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Wed, 17 Feb 2010 10:33:24 +0000 (12:33 +0200)]
mx25: add platform support for imxfb
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Wed, 17 Feb 2010 10:33:23 +0000 (12:33 +0200)]
imxfb: add support for i.MX25
The commit also introduces the HAVE_FB_IMX config that is to be selected from
the MX25 platform config. Once this commit gets merged, the two other i.MX
archs, ARCH_MX1 and ARCH_MX2, should follow this one.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Andy Green [Mon, 1 Feb 2010 12:28:54 +0000 (13:28 +0100)]
imx-serial-excessive-status-clearing-on-break.patch
cc: Sasha Hauer <kernel@pengutronix.de>
We noticed that we were only able to communicate once with a GSM module
per session, if we powered down the module then the serial driver was
broken until reset, no traffic or /proc/interrupts activity could be
seen any more.
Volker noticed it was provoked by a long "break" seen on the wire when
the RX was not driven during powerdown, we discovered we could kill the
serial driver just by forcing RX low extenally for a little while.
I saw that the processing for BREAK in the driver gets too excited and
clears down all set bits in USR2, including that a character is pending.
This stops all further characters getting processed.
The attached one-liner makes the serial driver immortal against BREAK.
Signed-off-by: Andy Green <andy.green@txtr.com>
Signed-off-by: Volker Ernst <volker.ernst@txtr.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Uwe Kleine-König [Fri, 5 Feb 2010 15:57:59 +0000 (16:57 +0100)]
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>
Valentin Longchamp [Tue, 9 Feb 2010 17:13:36 +0000 (18:13 +0100)]
mx31moboard: support for the smartbot baseboard
This baseboard is used on the handbot and eybot robots.
The sel gpios are used as enables and rst signals on smartbot, thus the
sel init is moved from mx31moboard file to board files.
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Tue, 9 Feb 2010 17:13:35 +0000 (18:13 +0100)]
mx31moboard: make usbh2 enable gpio claim more atomic
It is more cosmetic than fixing a real problem, but the code looks
more logical like that
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Tue, 9 Feb 2010 17:13:34 +0000 (18:13 +0100)]
mx31moboard: change initial reset status for robot microcontollers
We want the microcontrollers to be held in reset during kernel boot.
We also set the turretcam as the default camera since it is present on all
marxbots.
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 10 Feb 2010 10:11:37 +0000 (11:11 +0100)]
Merge branch 'mx51-baseport-sascha' of git://kernel.ubuntu.com/amitk/mx51-upstream into mxc-master
Sascha Hauer [Tue, 9 Feb 2010 10:04:36 +0000 (11:04 +0100)]
i.MX pcm043: Add AC97 sound support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Mon, 8 Feb 2010 15:42:28 +0000 (16:42 +0100)]
pca100: add sound support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Tue, 9 Feb 2010 09:48:16 +0000 (10:48 +0100)]
add ssi header file
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Amit Kucheria [Thu, 4 Feb 2010 23:57:29 +0000 (15:57 -0800)]
mxc: MAINTAINERS: Add maintainer for mach-mx5
Add self to MAINTAINERS for Freescale i.MX5 SoCs
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Amit Kucheria [Thu, 3 Dec 2009 22:57:20 +0000 (00:57 +0200)]
mxc: Add mx51_defconfig
This config is used to test the base support for i.MX51 processors on the
Babbage board
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Amit Kucheria [Tue, 2 Feb 2010 19:57:53 +0000 (11:57 -0800)]
mxc: Add support for the Babbage board (i.MX5)
Babbage is a reference board from Freescale for their i.MX51 SoC.
Add board definition, Kconfig and Makefiles to enable Freescale i.MX51
processor and Babbage board.
Boot tested on a Babbage2.5 board
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Amit Kucheria [Thu, 4 Feb 2010 20:21:53 +0000 (12:21 -0800)]
mxc: Core support for Freescale i.MX5 series
Add basic clock support, cpu identification, I/O mapping, interrupt
controller, serial port and ethernet.
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Amit Kucheria [Thu, 4 Feb 2010 20:09:40 +0000 (12:09 -0800)]
mxc: changes to common plat-mxc code to add support for i.MX5
Prepare for i.MX5 SoC code by adding the relevant macros to common plat-mxc
code.
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Sascha Hauer [Fri, 4 Dec 2009 08:34:51 +0000 (09:34 +0100)]
mxc: refactor timer code to use timer versions
Refactor the timer code into version 1 and version 2.
Essentially there are 2 versions of the timer hardware on Freescale MXC
hardware. Version 1 is found on MX1/MXL, MX21 and MX27. Version 2 is found on
MX25, MX31, MX35, MX37, MX51, and future parts.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Amit Kucheria [Thu, 3 Dec 2009 20:36:41 +0000 (22:36 +0200)]
mxc: TrustZone interrupt controller (TZIC) for Freescale i.MX5 family
Freescale i.MX51 processor uses a new interrupt controller. Add
driver for TrustZone Interrupt Controller
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Uwe Kleine-König [Fri, 5 Feb 2010 10:42:54 +0000 (11:42 +0100)]
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>
Uwe Kleine-König [Fri, 5 Feb 2010 11:03:37 +0000 (12:03 +0100)]
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>
Uwe Kleine-König [Fri, 5 Feb 2010 09:46:56 +0000 (10:46 +0100)]
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>
Uwe Kleine-König [Thu, 4 Feb 2010 21:13:52 +0000 (22:13 +0100)]
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>
Uwe Kleine-König [Thu, 4 Feb 2010 13:11:02 +0000 (14:11 +0100)]
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>
Uwe Kleine-König [Thu, 4 Feb 2010 21:04:32 +0000 (22:04 +0100)]
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>
Sascha Hauer [Thu, 4 Feb 2010 13:32:53 +0000 (14:32 +0100)]
i.MX27 pca100: Add USB support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Feb 2010 08:32:44 +0000 (09:32 +0100)]
i.MX31 pcm037: Add USB support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 3 Feb 2010 16:13:41 +0000 (17:13 +0100)]
i.MX27 pcm038: Add USB support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 3 Feb 2010 16:13:29 +0000 (17:13 +0100)]
i.MX27 pca100: Add USB support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Feb 2010 13:34:48 +0000 (14:34 +0100)]
i.MX35: Add USB control register access support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Daniel Mack <daniel@caiaq.de>
Sascha Hauer [Thu, 4 Feb 2010 13:45:41 +0000 (14:45 +0100)]
i.MX27: Add USB control register access support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Daniel Mack <daniel@caiaq.de>
Sascha Hauer [Thu, 4 Feb 2010 13:45:11 +0000 (14:45 +0100)]
i.MX ehci platform support: Some fixes
- The SIC mask is only 2bits wide, not 4
- MX31_OTG_PM_BIT and MX31_H1_PM_BIT use negative logic
- clear MX31_H1_DT_BIT and MX31_H2_DT_BIT so that they can be cleared,
not only set.
- return -EINVAL if called with an invalid controller number
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Daniel Mack <daniel@caiaq.de>
Sascha Hauer [Thu, 4 Feb 2010 13:40:59 +0000 (14:40 +0100)]
fsl_mx3_udc: Add i.MX35 support
The i.MX35 works fine with this driver, but we do not have
the usb_ahb clock.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Sascha Hauer [Thu, 4 Feb 2010 10:18:09 +0000 (11:18 +0100)]
Merge branch 'imx/master' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
Roel Kluin [Wed, 3 Feb 2010 19:19:00 +0000 (20:19 +0100)]
MX1/MX2: -EINVAL overwritten in second iteration in mxc_gpio_setup_multiple_pins()
Due to the `ret = gpio_request()' below in the loop, the initial -EINVAL value
of ret is overwritten.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Uwe Kleine-König [Sat, 30 Jan 2010 15:23:51 +0000 (16:23 +0100)]
imx/mx25: rename files defining a machine to mach-$mach.c
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Fri, 29 Jan 2010 16:36:05 +0000 (17:36 +0100)]
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>
Uwe Kleine-König [Fri, 15 Jan 2010 09:13:30 +0000 (10:13 +0100)]
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>
Uwe Kleine-König [Thu, 14 Jan 2010 21:04:49 +0000 (22:04 +0100)]
mxc91231: redefine MXC91231_IO_ADDRESS using IMX_IO_ADDRESS
This simplifies the macro and makes is similar to the other
..._IO_ADDRESS macros defined for imx SOCs.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Wed, 13 Jan 2010 17:07:11 +0000 (18:07 +0100)]
mxc91231: use MXC91231_IO_ADDRESS instead of MXC91231_AIPS1_IO_ADDRESS
Apart from MXC91231_IO_ADDRESS itself this was the only usage of
MXC91231_AIPS1_IO_ADDRESS. Now MXC91231_IO_ADDRESS can be recoded with
IMX_IO_ADDRESS and all helper macros can go away.
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: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Daniel Schaeffer <daniel.schaeffer@timesys.com>
Cc: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Cc: Ivo Clarysse <ivo.clarysse@gmail.com>
Uwe Kleine-König [Wed, 13 Jan 2010 16:58:04 +0000 (17:58 +0100)]
imx: WARN in clk_disable if the clock isn't enabled
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>
Uwe Kleine-König [Mon, 25 Jan 2010 16:55:16 +0000 (17:55 +0100)]
mx25: deprecate UART1_BASE_ADDR and UART2_BASE_ADDR
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Uwe Kleine-König [Mon, 11 Jan 2010 10:37:24 +0000 (11:37 +0100)]
mx1: prefix SOC specific defines with MX1_ and deprecate old names
The old names are defined only if the cpp symbol
IMX_NEEDS_DEPRECATED_SYMBOLS exists, which is defined (for now) for all
files below arch/arm/mach-mx1.
This was done earlier for mx2 and mx3, too.
USBD_INT0 is for now defined unconditionally to prevent breaking
drivers/usb/gadget/imx_udc.
While at it use IMX_IO_ADDRESS to define MX1_IO_ADDRESS which
adds a cast to the IO_ADDRESS macro fixing many warnings like
arch/arm/mach-mx1/generic.c:51: warning: passing argument 1 of 'mxc_init_irq' makes pointer from integer without a cast
.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Baruch Siach [Wed, 27 Jan 2010 13:00:49 +0000 (15:00 +0200)]
mx25pdk: platform code for the DryIce RTC module
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Wed, 27 Jan 2010 13:00:48 +0000 (15:00 +0200)]
mx25: add support for the DryIce rtc
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 29 Jan 2010 09:43:17 +0000 (10:43 +0100)]
Merge branch 'mxc-rc' into mxc-master
Uwe Kleine-König [Thu, 28 Jan 2010 19:50:39 +0000 (20:50 +0100)]
mx35: add a missing comma in a pad definition
Reported-by: Tim Sander <tstone@vlsi.informatik.tu-darmstadt.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Vladimir Zapolskiy [Tue, 26 Jan 2010 11:00:40 +0000 (14:00 +0300)]
ARM: IMX31: configure pins iomux for SDHC setup on litekit board.
This patch adds SDHC support, and corrects current pins setup.
Added irq handling on card removal.
Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
Cc: Daniel Mack <daniel@caiaq.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Uwe Kleine-König [Mon, 25 Jan 2010 17:23:04 +0000 (18:23 +0100)]
mx2/mx3: debug-macro.S needs deprecated symbols
This fixes:
arch/arm/kernel/debug.S:147: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)'
arch/arm/kernel/debug.S:163: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)'
when compiling for mx2 with CONFIG_DEBUG_LL=y. A similar error exists
on mx3 and is fixed by this commit, too.
These were introduced by
aae7019382896cf1075a93acc564e42601bc44a2.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Mon, 25 Jan 2010 10:58:22 +0000 (12:58 +0200)]
mx25: make the FEC AHB clk secondary of the IPG
This makes the FEC clock configuration consistent with the UART one.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Mon, 25 Jan 2010 10:58:21 +0000 (12:58 +0200)]
mx25: fix time accounting
The gpt_clk rate function doesn't consider the PER divider. This causes a
significant drift in time accounting. Fix this by introducing the correct rate
calculation function.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Mon, 25 Jan 2010 10:58:20 +0000 (12:58 +0200)]
mx25: properly initialize clocks
This patch disables all unnecessary clock in mx25_clocks_init() to make a clean
start, the same as is being done for the rest of the i.MX chips.
This patch was tested on i.MX25 PDK.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Mon, 25 Jan 2010 10:58:19 +0000 (12:58 +0200)]
mx25: remove unused mx25_clocks_init() argument
The fref is needless on mx25 since the reference clock is fixed at 24MHz.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 22 Jan 2010 07:47:06 +0000 (08:47 +0100)]
i.MX25: implement secondary clocks for uarts and fec
For uarts and fec need two clocks, implement it using the secondary clock
field in struct clk.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 22 Jan 2010 07:46:13 +0000 (08:46 +0100)]
i.MX25: Allow secondary clocks in DEFINE_CLOCK
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Vladimir Zapolskiy [Thu, 21 Jan 2010 09:12:52 +0000 (12:12 +0300)]
ARM: MX3: Fixed typo in declared enum type name.
To distinguish between mx31lite and mx31lilly boards better to use
different enum types.
Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Thu, 14 Jan 2010 09:24:15 +0000 (11:24 +0200)]
mx25pdk: add NAND device support
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Thu, 14 Jan 2010 09:24:14 +0000 (11:24 +0200)]
mx25: add NAND support
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Thu, 14 Jan 2010 09:24:13 +0000 (11:24 +0200)]
mtd: mxc_nand: add MX25 to Kconfig
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 14 Jan 2010 09:58:10 +0000 (10:58 +0100)]
Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master
Mark Brown [Mon, 11 Jan 2010 16:33:18 +0000 (16:33 +0000)]
MXC: Add AUDMUXv2 register decode to debugfs
Since AUDMUX configuration appears to be one of the common stumbling
blocks for people setting up i.MX audio try to provide some diagnostic
information describing the current setup to assisist people in working
out what's going on.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Uwe Kleine-König [Thu, 7 Jan 2010 10:27:17 +0000 (11:27 +0100)]
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>
Uwe Kleine-König [Fri, 8 Jan 2010 15:02:30 +0000 (16:02 +0100)]
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>
Uwe Kleine-König [Fri, 8 Jan 2010 11:29:11 +0000 (12:29 +0100)]
imx: remove unneeded include of mach/hardware.h
This include isn't needed and hurts when defining static inline
functions in mach/hardware.h (or files included by mach/hardware.h).
The reason is that the consumers of mach/uncompress.h are compiled using
-Dstatic= so the code for all inline function is included in e.g.
arch/arm/boot/compressed/misc.o.
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: Jörg Knobloch <knobloch@incostartec.com>
Cc: Alan Carvalho de Assis <acassis@gmail.com>
Cc: Daniel Mack <daniel@caiaq.de>
Cc: Dmitriy Taychenachev <dimichxp@gmail.com>