aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* arm/imx/iomux-v1: rename source file and reorganize Kconfig stuffUwe Kleine-König2010-02-24
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_...Uwe Kleine-König2010-02-24
| | | | | | This is necessary for a multi-SoC kernel. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx/dma-v1: don't use deprecated symbols DMA_BASE and MXC_INT_DMACH0Uwe Kleine-König2010-02-24
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 ↵Uwe Kleine-König2010-02-24
| | | | | | and mx3 Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx/irq: order definitions of MXC_GPIO_IRQS numericallyUwe Kleine-König2010-02-24
| | | | | | This is important for kernels supporting more than one SoC. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx: don't depend on ARCH_MXC twiceUwe Kleine-König2010-02-24
| | | | | | | 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>
* arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV blockUwe Kleine-König2010-02-24
| | | | | | 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>
* arm/imx: remove MTD_XIP supportUwe Kleine-König2010-02-24
| | | | | | | | | | 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>
* arm/imx: don't explicitly select GENERIC_GPIOUwe Kleine-König2010-02-24
| | | | | | ARCH_REQUIRE_GPIOLIB selects GPIOLIB which in turn selects GENERIC_GPIO Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx: let ARCH_MXC select COMMON_CLKDEV instead of each subfamilyUwe Kleine-König2010-02-24
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx: remove "NO_PAD_CTRL" from Copyright statementsUwe Kleine-König2010-02-24
| | | | | | | | 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>
* arm/imx/audmux-v2: use SoC-prefixed namesUwe Kleine-König2010-02-24
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx/audmux-v1: use SoC-prefixed namesUwe Kleine-König2010-02-24
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx/gpio: remove a BUG_ON in hot pathUwe Kleine-König2010-02-24
| | | | | | | | 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>
* arm/imx/gpio: use fls to find set bits in the irq status registerUwe Kleine-König2010-02-24
| | | | | | | 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>
* arm/imx: use generic_handle_irq instead of open-coding itUwe Kleine-König2010-02-24
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx/gpio: GPIO_INT_{HIGH,LOW}_LEV are not necessarily constantUwe Kleine-König2010-02-24
| | | | | | | | | | | | 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>
* arm/mx2: split generic.c into mm-imx2[17].cUwe Kleine-König2010-02-24
| | | | | | | This removes some #ifdefs and prepares moving the files in a directory with more than imx21 and imx27 support. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2/devices: no need for IMX_NEEDS_DEPRECATED_SYMBOLS any moreUwe Kleine-König2010-02-24
| | | | | | | The previous commits cleaned up arch/arm/mach-mx2/devices.c such that it doesn't rely on deprecated symbols any more. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: define seperate gpio port descriptions for imx21 and imx27Uwe Kleine-König2010-02-24
| | | | | | | | | As the gpio ports have different addresses on imx21 and imx27 there are two different port descriptions needed if not relying on the overloaded cpp macro IO_ADDRESS. So some cpp magic is added to minimize code duplication. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use per-SOC nand deviceUwe Kleine-König2010-02-24
| | | | | | | | | The previous commit introduced one nand device per SoC. Use this directly instead of the compatibility macro that will break for multi-SoC kernels. And while at it remove the compatibility macro now that all in-tree users are fixed. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: define seperate imx_nand devices for imx21 and imx27Uwe Kleine-König2010-02-15
| | | | | | | | | | | | | As the NFC controller has different addresses on imx21 and imx27 there are two different devices needed if not relying on the overloaded cpp macro NFC_BASE_ADDR. So some cpp magic is added to minimize code duplication. As obviously these two defines need different names, the name of the old device is #defined to the new one when building for only one of imx21 or imx27. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2/devices: use SoC-prefixed names where possibleUwe Kleine-König2010-02-08
| | | | | | | There is only NFC_BASE_ADDR left which is defined differently for mx21 and mx27. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use cpp magic to create imx-ssi devicesUwe Kleine-König2010-02-08
| | | | | | | This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use cpp magic to create imx-mmc devicesUwe Kleine-König2010-02-08
| | | | | | | This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use cpp magic to create imx-i2c devicesUwe Kleine-König2010-02-08
| | | | | | | This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use cpp magic to create imx_gpt devicesUwe Kleine-König2010-02-08
| | | | | | | This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use cpp magic to create spi_imx devicesUwe Kleine-König2010-02-08
| | | | | | | This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* imx/mx25: rename files defining a machine to mach-$mach.cUwe Kleine-König2010-02-02
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSETUwe Kleine-König2010-02-02
| | | | | | | This is a further step in allowing to build a kernel image for more than one imx SOC. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* imx2x: convert serial.c to use soc-prefixed constantsUwe Kleine-König2010-02-02
| | | | | | | 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>
* mxc91231: redefine MXC91231_IO_ADDRESS using IMX_IO_ADDRESSUwe Kleine-König2010-02-02
| | | | | | | 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>
* mxc91231: use MXC91231_IO_ADDRESS instead of MXC91231_AIPS1_IO_ADDRESSUwe Kleine-König2010-02-02
| | | | | | | | | | | | | | 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>
* imx: WARN in clk_disable if the clock isn't enabledUwe Kleine-König2010-02-02
| | | | | | 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>
* mx25: deprecate UART1_BASE_ADDR and UART2_BASE_ADDRUwe Kleine-König2010-01-30
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* mx1: prefix SOC specific defines with MX1_ and deprecate old namesUwe Kleine-König2010-01-30
| | | | | | | | | | | | | | | | | | | | 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>
* mx25pdk: platform code for the DryIce RTC moduleBaruch Siach2010-01-29
| | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mx25: add support for the DryIce rtcBaruch Siach2010-01-29
| | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'mxc-rc' into mxc-masterSascha Hauer2010-01-29
|\
| * mx35: add a missing comma in a pad definitionUwe Kleine-König2010-01-29
| | | | | | | | | | | | 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>
| * mx25: make the FEC AHB clk secondary of the IPGBaruch Siach2010-01-26
| | | | | | | | | | | | | | 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>
| * mx25: fix time accountingBaruch Siach2010-01-26
| | | | | | | | | | | | | | | | | | 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>
| * mx25: properly initialize clocksBaruch Siach2010-01-26
| | | | | | | | | | | | | | | | | | | | 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>
| * mx25: remove unused mx25_clocks_init() argumentBaruch Siach2010-01-26
| | | | | | | | | | | | | | 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>
| * i.MX25: implement secondary clocks for uarts and fecSascha Hauer2010-01-26
| | | | | | | | | | | | | | 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>
| * i.MX25: Allow secondary clocks in DEFINE_CLOCKSascha Hauer2010-01-26
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: MX3: Fixed typo in declared enum type name.Vladimir Zapolskiy2010-01-21
| | | | | | | | | | | | | | | | | | 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>
| * MXC: Add AUDMUXv2 register decode to debugfsMark Brown2010-01-12
| | | | | | | | | | | | | | | | | | | | 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>
| * mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 moduleMark Brown2010-01-05
| | | | | | | | | | | | | | | | 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>
| * mx31ads: Provide a name for EXPIO interrupt chipMark Brown2010-01-05
| | | | | | | | | | | | | | | | 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>