summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc
AgeCommit message (Collapse)Author
2010-04-08Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6Russell King
Conflicts: arch/arm/mach-mx3/mach-pcm037.c
2010-03-30include cleanup: Update gfp.h and slab.h includes to prepare for breaking ↵Tejun Heo
implicit slab.h inclusion from percpu.h percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-25Merge branch 'mx51' into mxc-rcSascha Hauer
2010-03-25MXC: mach-mx31_3ds: Update variable names over recent mach name modification.Alberto Panizzo
Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-03-19i.MX51: remove NFC AXI static mappingSascha Hauer
This area contains the Nand Flash controller registers. There is no need to map them statically as the Nand driver uses ioremap(). Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-03-19i.MX51: determine silicon revision dynamicallySascha Hauer
Freescale redboot passes the silicon revision via ATAG_REVISION. Remove this bootloader dependency by doing the same as redboot does in the Kernel. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-03-19i.MX51: map TZIC dynamicallySascha Hauer
This looks cleaner and allows us to call mx51_revision later when we can use ioremap to determine the silicon revision dynamically. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-03-19i.MX51 Babbage: Add uncompress outputSascha Hauer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-03-08Merge branch 'origin' into devel-stableRussell King
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c
2010-03-02Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King
devel-stable Conflicts: arch/arm/Makefile
2010-03-02USB: MXC: Add i.MX21 specific USB host controller driver.Martin Fuzzey
This driver is a Full / Low speed only USB host for the i.MX21. Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-03-01Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits) ARM: Eliminate decompressor -Dstatic= PIC hack ARM: 5958/1: ARM: U300: fix inverted clk round rate ARM: 5956/1: misplaced parentheses ARM: 5955/1: ep93xx: move timer defines into core.c and document ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c ARM: 5953/1: ep93xx: fix broken build of clock.c ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig ARM: 5949/1: NUC900 add gpio virtual memory map ARM: 5948/1: Enable timer0 to time4 clock support for nuc910 ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk ARM: make_coherent(): fix problems with highpte, part 2 MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself ARM: 5945/1: ep93xx: include correct irq.h in core.c ARM: 5933/1: amba-pl011: support hardware flow control ARM: 5930/1: Add PKMAP area description to memory.txt. ARM: 5929/1: Add checks to detect overlap of memory regions. ARM: 5928/1: Change type of VMALLOC_END to unsigned long. ARM: 5927/1: Make delimiters of DMA area globally visibly. ARM: 5926/1: Add "Virtual kernel memory..." printout. ARM: 5920/1: OMAP4: Enable L2 Cache ... Fix up trivial conflict in arch/arm/mach-mx25/clock.c
2010-03-01Merge branch 'topic/asoc' into for-linusTakashi Iwai
2010-02-25Merge branch 'misc2' into develRussell King
2010-02-25Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Uwe Kleine-König
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>
2010-02-24mx25: move ARCH_MXC_IOMUX_V3 to the ARCH levelBaruch Siach
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>
2010-02-24arm/imx/iomux-v1: check for invalid modes in mxc_gpio_modeUwe Kleine-König
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>
2010-02-24arm/imx/iomux-v1: rename header fileUwe Kleine-König
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>
2010-02-24arm/mx25: don't include iomux.h which is for iomux-v1 machinesUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24arm/imx/iomux-mx3.h: unify style and commentsUwe Kleine-König
- 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>
2010-02-24arm/imx/iomux-mx2x: unify styleUwe Kleine-König
- 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>
2010-02-24arm/imx/iomux-mx27: unify style and commentsUwe Kleine-König
- 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>
2010-02-24arm/imx/iomux-mx25: unify style and comment cleanupUwe Kleine-König
- 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>
2010-02-24arm/imx/iomux-mx21: unify styleUwe Kleine-König
- 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>
2010-02-24arm/imx/iomux-mx1: unify style and comment cleanupUwe Kleine-König
- 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>
2010-02-24arm/imx/iomux-v1: make base address a runtime choiceUwe Kleine-König
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>
2010-02-24arm/imx/iomux-v1: rename source file and reorganize Kconfig stuffUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_...Uwe Kleine-König
This is necessary for a multi-SoC kernel. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24arm/imx/dma-v1: don't use deprecated symbols DMA_BASE and MXC_INT_DMACH0Uwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 ↵Uwe Kleine-König
and mx3 Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24arm/imx/irq: order definitions of MXC_GPIO_IRQS numericallyUwe Kleine-König
This is important for kernels supporting more than one SoC. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24arm/imx: don't depend on ARCH_MXC twiceUwe Kleine-König
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>
2010-02-24arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV blockUwe Kleine-König
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>
2010-02-24arm/imx: remove MTD_XIP supportUwe Kleine-König
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>
2010-02-24arm/imx: let ARCH_MXC select COMMON_CLKDEV instead of each subfamilyUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24arm/imx: remove "NO_PAD_CTRL" from Copyright statementsUwe Kleine-König
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>
2010-02-24arm/imx/audmux-v2: use SoC-prefixed namesUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-02-24arm/imx/audmux-v1: use SoC-prefixed namesUwe Kleine-König
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
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-18mx25pdk: add LCD supportBaruch Siach
Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-02-18mx25: add platform support for imxfbBaruch Siach
Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-02-18imxfb: add support for i.MX25Baruch Siach
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>
2010-02-15ARM: 5928/1: Change type of VMALLOC_END to unsigned long.Fenkart/Bostandzhyan
Makes it consistent with VMALLOC_START Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Andreas Fenkart <andreas.fenkart@streamunlimited.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-02-12ARM: 5910/1: ARM: Add tmp register for addruart and loadspTony Lindgren
Otherwise more complicated uart configuration won't be possible. We can use r1 for tmp register for both head.S and debug.S. NOTE: This patch depends on another patch to add the the tmp register into all debug-macro.S files. That can be done with: $ sed -i -e "s/addruart,rx|addruart, rx/addruart, rx, tmp/" arch/arm/*/include/*/debug-macro.S Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-02-10mx31moboard: support for the smartbot baseboardValentin Longchamp
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>
2010-02-10Merge branch 'mx51-baseport-sascha' of ↵Sascha Hauer
git://kernel.ubuntu.com/amitk/mx51-upstream into mxc-master
2010-02-10add ssi header fileSascha Hauer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-09 22:49:25 +0000