summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* arm/imx/iomux-v1: rename header fileUwe Kleine-König2010-02-247-127/+126
| | | | | | | | | 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>
* arm/mx25: don't include iomux.h which is for iomux-v1 machinesUwe Kleine-König2010-02-242-5/+1
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx/iomux-mx3.h: unify style and commentsUwe Kleine-König2010-02-241-36/+35
| | | | | | | | - 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>
* arm/imx/iomux-mx2x: unify styleUwe Kleine-König2010-02-241-212/+209
| | | | | | | | - 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>
* arm/imx/iomux-mx27: unify style and commentsUwe Kleine-König2010-02-241-183/+182
| | | | | | | | | - 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>
* arm/imx/iomux-mx25: unify style and comment cleanupUwe Kleine-König2010-02-241-17/+3
| | | | | | | | | | - 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>
* arm/imx/iomux-mx21: unify styleUwe Kleine-König2010-02-241-103/+100
| | | | | | | | - 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>
* arm/imx/iomux-mx1: unify style and comment cleanupUwe Kleine-König2010-02-241-159/+150
| | | | | | | | - 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>
* arm/imx/iomux-v1: make base address a runtime choiceUwe Kleine-König2010-02-242-67/+127
| | | | | | | 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>
* arm/imx/iomux-v1: rename source file and reorganize Kconfig stuffUwe Kleine-König2010-02-243-9/+14
| | | | 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-241-23/+30
| | | | | | 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-242-71/+90
| | | | 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-241-8/+7
| | | | | | 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-241-5/+6
| | | | | | 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-241-3/+0
| | | | | | | 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-241-7/+0
| | | | | | 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-242-35/+0
| | | | | | | | | | 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-241-1/+0
| | | | | | 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-242-5/+1
| | | | 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-242-2/+2
| | | | | | | | 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-242-5/+5
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/imx/audmux-v1: use SoC-prefixed namesUwe Kleine-König2010-02-242-3/+12
| | | | 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-241-2/+0
| | | | | | | | 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-241-11/+9
| | | | | | | 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-241-2/+1
| | | | 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-241-6/+3
| | | | | | | | | | | | 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-243-33/+101
| | | | | | | This removes some #ifdefs and prepares moving the files in a directory with more than imx21 and imx27 support. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2/devices: no need for IMX_NEEDS_DEPRECATED_SYMBOLS any moreUwe Kleine-König2010-02-241-1/+0
| | | | | | | The previous commits cleaned up arch/arm/mach-mx2/devices.c such that it doesn't rely on deprecated symbols any more. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: define seperate gpio port descriptions for imx21 and imx27Uwe Kleine-König2010-02-241-28/+44
| | | | | | | | | As the gpio ports have different addresses on imx21 and imx27 there are two different port descriptions needed if not relying on the overloaded cpp macro IO_ADDRESS. So some cpp magic is added to minimize code duplication. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use per-SOC nand deviceUwe Kleine-König2010-02-247-10/+7
| | | | | | | | | The previous commit introduced one nand device per SoC. Use this directly instead of the compatibility macro that will break for multi-SoC kernels. And while at it remove the compatibility macro now that all in-tree users are fixed. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: define seperate imx_nand devices for imx21 and imx27Uwe Kleine-König2010-02-152-18/+36
| | | | | | | | | | | | | As the NFC controller has different addresses on imx21 and imx27 there are two different devices needed if not relying on the overloaded cpp macro NFC_BASE_ADDR. So some cpp magic is added to minimize code duplication. As obviously these two defines need different names, the name of the old device is #defined to the new one when building for only one of imx21 or imx27. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2/devices: use SoC-prefixed names where possibleUwe Kleine-König2010-02-081-55/+55
| | | | | | | There is only NFC_BASE_ADDR left which is defined differently for mx21 and mx27. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use cpp magic to create imx-ssi devicesUwe Kleine-König2010-02-081-75/+32
| | | | | | | This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use cpp magic to create imx-mmc devicesUwe Kleine-König2010-02-081-56/+31
| | | | | | | This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use cpp magic to create imx-i2c devicesUwe Kleine-König2010-02-082-34/+22
| | | | | | | This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use cpp magic to create imx_gpt devicesUwe Kleine-König2010-02-082-94/+26
| | | | | | | This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* arm/mx2: use cpp magic to create spi_imx devicesUwe Kleine-König2010-02-082-56/+24
| | | | | | | This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* imx/mx25: rename files defining a machine to mach-$mach.cUwe Kleine-König2010-02-022-1/+1
| | | | 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-0223-38/+44
| | | | | | | 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-022-25/+24
| | | | | | | This makes the file compilable for a kernel that supports both imx21 and imx27. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* mxc91231: redefine MXC91231_IO_ADDRESS using IMX_IO_ADDRESSUwe Kleine-König2010-02-021-48/+10
| | | | | | | 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-021-1/+1
| | | | | | | | | | | | | | 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-021-0/+1
| | | | | | 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-301-2/+7
| | | | 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-302-127/+261
| | | | | | | | | | | | | | | | | | | | 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-291-0/+1
| | | | | 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-294-0/+24
| | | | | 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-298-25/+185
|\
| * mx35: add a missing comma in a pad definitionUwe Kleine-König2010-01-291-1/+1
| | | | | | | | | | | | 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-261-2/+2
| | | | | | | | | | | | | | 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>
OpenPOWER on IntegriCloud