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>
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>
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>
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>
Uwe Kleine-König [Tue, 5 Jan 2010 10:27:42 +0000 (11:27 +0100)]
imx: remove mx1ads defconfig
For some time now the defconfig for mx1ads produces a kernel for
a versatile board. As CONFIG_ARCH_MX1ADS is included in the mx1
defconfig just get rid of mx1ads_defconfig.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <kernel@pengutronix.de>
Uwe Kleine-König [Thu, 17 Dec 2009 16:17:54 +0000 (17:17 +0100)]
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>
Uwe Kleine-König [Thu, 17 Dec 2009 10:56:43 +0000 (11:56 +0100)]
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>
Uwe Kleine-König [Wed, 16 Dec 2009 18:08:09 +0000 (19:08 +0100)]
mx3/kzm_arm11_01: define and use board specific IO_ADDRESS macro
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 [Wed, 16 Dec 2009 18:07:20 +0000 (19:07 +0100)]
imx35: define and use MX35_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: Jürgen Beisert <j.beisert@pengutronix.de>
Cc: Rabin Vincent <rabin@rab.in>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Uwe Kleine-König [Wed, 16 Dec 2009 18:07:04 +0000 (19:07 +0100)]
imx25: redefine MX25_IO_ADDRESS using IMX_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>
Uwe Kleine-König [Wed, 16 Dec 2009 18:06:12 +0000 (19:06 +0100)]
imx31: define and use MX31_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: Daniel Mack <daniel@caiaq.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Magnus Lilja <lilja.magnus@gmail.com>
Uwe Kleine-König [Wed, 16 Dec 2009 16:30:27 +0000 (17:30 +0100)]
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>
Uwe Kleine-König [Wed, 16 Dec 2009 16:29:39 +0000 (17:29 +0100)]
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>
Uwe Kleine-König [Wed, 16 Dec 2009 18:05:04 +0000 (19:05 +0100)]
imx: provide helper macro to define 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: Dmitriy Taychenachev <dimichxp@gmail.com>
Uwe Kleine-König [Thu, 10 Dec 2009 09:41:26 +0000 (10:41 +0100)]
imx/mx3: rename files defining a machine to mach-$mach.c
While at it remove some superfluous parenthesis.
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 Mack <daniel@caiaq.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Mark Brown [Tue, 5 Jan 2010 16:05:16 +0000 (16:05 +0000)]
mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 module
The WM8350 core won't actually use the range yet, but it will in
future and the platform data to configure it is there now.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Mark Brown [Tue, 5 Jan 2010 16:05:15 +0000 (16:05 +0000)]
mx31ads: Provide a name for EXPIO interrupt chip
This makes it a bit more obvious in genirq diagnostics that they
aren't handled by the i.MX interrupt controller.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Mark Brown [Mon, 4 Jan 2010 18:24:50 +0000 (18:24 +0000)]
mx31ads: Allow enable/disable of switchable supplies
They will be automatically powered off at startup so users will
need to enable them for use.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Mark Brown [Mon, 4 Jan 2010 18:24:50 +0000 (18:24 +0000)]
mx31ads: Allow enable/disable of switchable supplies
They will be automatically powered off at startup so users will
need to enable them for use.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Mark Brown [Mon, 4 Jan 2010 18:24:49 +0000 (18:24 +0000)]
mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices
This means we don't need to go running round working out struct
devices at runtime.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Uwe Kleine-König [Thu, 10 Dec 2009 09:34:04 +0000 (10:34 +0100)]
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>
Uwe Kleine-König [Thu, 10 Dec 2009 09:25:07 +0000 (10:25 +0100)]
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>
Uwe Kleine-König [Thu, 10 Dec 2009 09:19:43 +0000 (10:19 +0100)]
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>
Uwe Kleine-König [Wed, 9 Dec 2009 19:12:07 +0000 (20:12 +0100)]
imx/mx1: 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: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Uwe Kleine-König [Wed, 9 Dec 2009 19:09:35 +0000 (20:09 +0100)]
imx/mx1: add newline at end of Makefile
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: Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Uwe Kleine-König [Wed, 9 Dec 2009 18:52:57 +0000 (19:52 +0100)]
imx/mx3: rename clock.c and iomux.c to {clock,iomux}-imx31.c
These files are only used on imx31. This makes the name consistent with
the imx35 files.
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 Mack <daniel@caiaq.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Uwe Kleine-König [Wed, 9 Dec 2009 10:57:21 +0000 (11:57 +0100)]
imx/mach-mx3: use constants namespaced by the corresponding SOC (easy part)
This just leaves cpu.c, devices.c and mm.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: Russell King <linux@arm.linux.org.uk>
Cc: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Cc: Daniel Mack <daniel@caiaq.de>
Cc: Guennadi Liakhovetski <lg@denx.de>
Cc: Yoichi Yuasa <yuasa@linux-mips.org>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Magnus Lilja <lilja.magnus@gmail.com>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Harro Haan <hrhaan@yahoo.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: Luotao Fu <l.fu@pengutronix.de>
Cc: Ilya Yanok <yanok@emcraft.com>
Uwe Kleine-König [Wed, 9 Dec 2009 10:32:11 +0000 (11:32 +0100)]
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>
Uwe Kleine-König [Fri, 11 Dec 2009 08:57:27 +0000 (09:57 +0100)]
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>
Uwe Kleine-König [Fri, 11 Dec 2009 10:04:06 +0000 (11:04 +0100)]
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>
Uwe Kleine-König [Fri, 11 Dec 2009 09:07:15 +0000 (10:07 +0100)]
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>
Uwe Kleine-König [Tue, 22 Dec 2009 16:31:05 +0000 (17:31 +0100)]
imx/mx3: depend on USB_ULPI for otg_ulpi_create
otg_ulpi_create is defined in drivers/usb/otg/ulpi.c which depends on
CONFIG_USB_ULPI. So protect its usage by the same symbol. Moreover
mxc_ulpi_access_ops needs CONFIG_MXC_ULPI.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Valentin Longchamp <valentin.longchamp@epfl.ch>
Cc: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Wolfgang Denk [Mon, 14 Dec 2009 23:27:42 +0000 (00:27 +0100)]
ARM: MX3: make CPU revision number detection work on all boards
Commit
52939c03 (ARM: MX3: fix CPU revision number detection) started
using the CPU's SREV register for revision number detection. This
makes it mandatory to have a valid SPBA0 mapping. Add this to the
global map_io code instead of adding multiple copies for each board.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Daniel Mack <daniel@caiaq.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Tested on Qong (EVB-Lite)
Tested-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Mon, 21 Dec 2009 11:44:32 +0000 (13:44 +0200)]
mx25: pdk: add platform code for FEC support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Mon, 21 Dec 2009 11:44:31 +0000 (13:44 +0200)]
mx25: add support for FEC on i.MX25
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Baruch Siach [Mon, 14 Dec 2009 10:19:39 +0000 (12:19 +0200)]
mx25: s/NO_PAD_CTL/NO_PAD_CTRL/
NO_PAD_CTL is not defined anywhere.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Fri, 4 Dec 2009 15:50:29 +0000 (16:50 +0100)]
mx31moboard: fix usbh device names
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Guennadi Liakhovetski [Fri, 11 Dec 2009 13:29:06 +0000 (14:29 +0100)]
mx3: add support for the mt9v022 camera sensor to pcm037 platform
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Alan Carvalho de Assis [Fri, 4 Dec 2009 17:44:06 +0000 (15:44 -0200)]
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>
Linus Torvalds [Thu, 24 Dec 2009 21:09:41 +0000 (13:09 -0800)]
Linux 2.6.33-rc2
Linus Torvalds [Thu, 24 Dec 2009 21:01:29 +0000 (13:01 -0800)]
Merge branch 'sysctl' of git://git./linux/kernel/git/ak/linux-misc-2.6
* 'sysctl' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-misc-2.6:
SYSCTL: Add a mutex to the page_alloc zone order sysctl
SYSCTL: Print binary sysctl warnings (nearly) only once