aboutsummaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2010-02-24arm/imx/gpio: remove a BUG_ON in hot pathUwe Kleine-König
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>
2010-02-24arm/imx/gpio: use fls to find set bits in the irq status registerUwe Kleine-König
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>
2010-02-24arm/imx: use generic_handle_irq instead of open-coding itUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24arm/imx/gpio: GPIO_INT_{HIGH,LOW}_LEV are not necessarily constantUwe Kleine-König
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>
2010-02-24arm/mx2: split generic.c into mm-imx2[17].cUwe Kleine-König
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önig
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önig
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önig
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önig
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-08arm/mx2/devices: use SoC-prefixed names where possibleUwe Kleine-König
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önig
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önig
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önig
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önig
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önig
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-02imx/mx25: rename files defining a machine to mach-$mach.cUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-02imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSETUwe Kleine-König
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önig
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-02-02mxc91231: redefine MXC91231_IO_ADDRESS using IMX_IO_ADDRESSUwe Kleine-König
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>
2010-02-02mxc91231: use MXC91231_IO_ADDRESS instead of MXC91231_AIPS1_IO_ADDRESSUwe Kleine-König
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>
2010-02-02imx: WARN in clk_disable if the clock isn't enabledUwe Kleine-König
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>
2010-01-30mx25: deprecate UART1_BASE_ADDR and UART2_BASE_ADDRUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-01-30mx1: prefix SOC specific defines with MX1_ and deprecate old namesUwe Kleine-König
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>
2010-01-29mx25pdk: platform code for the DryIce RTC moduleBaruch Siach
Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-01-29mx25: add support for the DryIce rtcBaruch Siach
Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-01-29Merge branch 'mxc-rc' into mxc-masterSascha Hauer
2010-01-29mx35: add a missing comma in a pad definitionUwe Kleine-König
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>
2010-01-26ARM: IMX31: configure pins iomux for SDHC setup on litekit board.Vladimir Zapolskiy
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>
2010-01-26mx2/mx3: debug-macro.S needs deprecated symbolsUwe Kleine-König
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>
2010-01-26mx25: make the FEC AHB clk secondary of the IPGBaruch Siach
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>
2010-01-26mx25: fix time accountingBaruch Siach
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>
2010-01-26mx25: properly initialize clocksBaruch Siach
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>
2010-01-26mx25: remove unused mx25_clocks_init() argumentBaruch Siach
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>
2010-01-26i.MX25: implement secondary clocks for uarts and fecSascha Hauer
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>
2010-01-26i.MX25: Allow secondary clocks in DEFINE_CLOCKSascha Hauer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-01-21ARM: MX3: Fixed typo in declared enum type name.Vladimir Zapolskiy
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>
2010-01-14mx25pdk: add NAND device supportBaruch Siach
Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-01-14mx25: add NAND supportBaruch Siach
Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-01-14Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-masterSascha Hauer
2010-01-12MXC: Add AUDMUXv2 register decode to debugfsMark Brown
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>
2010-01-08imx: define functions to configure chip selects in the WEIMUwe Kleine-König
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: properly protect mach/mx{1,[25][157x]}.h from multiple inclusionUwe Kleine-König
Some headers have used (now) wrong names or havn't had protection at all. This is needed before adding static inline functions to the headers. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: Magnus Lilja <lilja.magnus@gmail.com> Cc: Holger Schurig <hs4233@mail.mn-solutions.de> Cc: Jiri Kosina <jkosina@suse.cz> Cc: Daniel Mack <daniel@caiaq.de>
2010-01-08imx: remove unneeded include of mach/hardware.hUwe Kleine-König
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>
2010-01-08imx: remove mx1ads defconfigUwe Kleine-König
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>
2010-01-08imx: only define deprecated symbols conditionallyUwe Kleine-König
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önig
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-08mx3/kzm_arm11_01: define and use board specific IO_ADDRESS macroUwe Kleine-König
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>
2010-01-08imx35: define and use MX35_IO_ADDRESSUwe Kleine-König
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>
2010-01-08imx25: redefine MX25_IO_ADDRESS using IMX_IO_ADDRESSUwe Kleine-König
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>
2010-01-08imx31: define and use MX31_IO_ADDRESSUwe Kleine-König
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 07:52:02 +0000