summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx25
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6Russell King2010-09-012-3/+3
|\
| * eukrea-baseboards: fix the merge in one fileEric Bénard2010-08-162-3/+3
| | | | | | | | | | | | | | | | | | Last change I did made a big mess in function names and CONFIG names, this patch fixes this so that the baseboard support is really built when selected. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: imx: fix build failure concerning otg/ulpiUwe Kleine-König2010-08-231-1/+1
|/ | | | | | | | | | | | The build failure was introduced by 13dd0c9 (USB: otg/ulpi: extend the generic ulpi driver.) Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Acked-by: Igor Grinberg <grinberg@compulab.co.il> Cc: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* imx: move gpio init after to irq initJason Wang2010-07-261-1/+1
| | | | | | | | | | | | The commit 9a763bf "get rid of mxc_gpio_init" changed gpio_init and irq_init sequence. Usually we will call set_irq_chained_handler in gpio_init functions, this should be called after the irq_init called, otherwise the chained irq can't get propoer irq_chip and this irq will remain masked even we called set_irq_chained_handler. Signed-off-by: Jason Wang <jason77.wang@gmail.com> Tested-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* eukrea-baseboards: merge includes in one fileEric Bénard2010-07-261-1/+1
| | | | | | | | as per suggested by Sascha Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Fix KConfig warningEric Bénard2010-07-262-3/+3
| | | | | | | | | | This patch fixes the following Kconfig warning : "arch/arm/mach-mx25/Kconfig:18:warning: choice value used outside its choice group Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mbimxsd baseboards : remove unnecessary includeEric Bénard2010-07-261-1/+0
| | | | | | Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* imx: dynamically register flexcan devices for mx25 and mx35Marc Kleine-Budde2010-07-261-0/+5
| | | | | | | | | | | | In order to make this patch compile, even if the flexcan driver with it's header defining the platform data isn't merged yet, two ifdefs have been added. They effect that the "imx_add_flexcan" function results in a no-op function if the driver hasn't been activated. These ifdefs can be removed after the flexcan driver has been merged. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mx25: flexcan clock supportSascha Hauer2010-07-261-0/+4
| | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* imx25: fix low level debugEric Bénard2010-07-261-0/+3
| | | | | | | DEBUG_LL is actually broken on i.MX25, this patch fix it. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Uwe Kleine-König2010-07-269-265/+75
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into HEAD There are some more conflicts than detected by git, namely support for the newly added cpuimx machines needed to be converted to dynamic device registration. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Conflicts: arch/arm/mach-imx/Makefile arch/arm/mach-imx/devices.c arch/arm/mach-imx/devices.h arch/arm/mach-imx/eukrea_mbimx27-baseboard.c arch/arm/mach-mx2/Kconfig arch/arm/mach-mx25/Makefile arch/arm/mach-mx25/devices.c arch/arm/plat-mxc/include/mach/mx25.h arch/arm/plat-mxc/include/mach/mxc_nand.h
| * ARM: imx: dynamically register imx-uart devices (imx25)Uwe Kleine-König2010-06-305-103/+14
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: dynamically register spi_imx devices (imx25)Uwe Kleine-König2010-06-303-60/+7
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: dynamically register imx-i2c devices (imx25)Uwe Kleine-König2010-06-303-60/+7
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: Change the way nand devices are registered (imx25)Uwe Kleine-König2010-06-305-25/+20
| | | | | | | | | | | | Make use of new mechanism to register a nand device. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: mx25: remove paragraphs with old address of the FSFUwe Kleine-König2010-06-301-4/+0
| | | | | | | | | | | | | | As the kernel contains a copy of the GPL anyhow just get rid of the address specification instead of fixing it. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: get rid of mxc_gpio_initUwe Kleine-König2010-06-242-1/+4
| | | | | | | | | | | | | | This function is defined once for each imx family and so is in the way when compiling a kernel for more than one SoC. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: mx25: rename mach-mx25pdk.c to mach-mx25_3ds.c matching its arch numberUwe Kleine-König2010-06-022-1/+7
| | | | | | | | | | | | Additionally document all known names of that machine. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* | mx25: add support for the CSI deviceBaruch Siach2010-07-263-2/+35
| | | | | | | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx25: add a comment documenting undocumented IPG clocksBaruch Siach2010-07-261-0/+22
| | | | | | | | | | | | | | | | | | The information in the i.MX25 Reference Manual is lacking. Add information from the Freescale BSP. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx25pdk: register watchdog deviceBaruch Siach2010-07-261-0/+1
| | | | | | | | | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx25: add watchdog clockBaruch Siach2010-07-261-0/+2
| | | | | | | | | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Reviewed-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | i.MX25: add cpuimx25 module and its baseboardEric Bénard2010-07-264-0/+452
| | | | | | | | | | | | | | | | | | * cpuimx25 integrates i.MX25, RAM, NAND, Ethernet, I2C RTC, USB Host and USB OTG * mbimxsd provides access to LCD, Audio, LED, Switch button, UART ... Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | i.MX25: add AUDMUX and SSI supportEric Bénard2010-07-263-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | * add clocks for audmux and ssi 1 & 2 * add irq for ssi 1 & 2 * add devices platform for ssi1 & 2 * update audmux-v2 for i.MX25 * add base addresses for audmux & ssi 1 & 2 * add iomux configuration for GPIO for AUD5 port Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | i.MX25: fix get_rate_otg to return the correct valueEric Bénard2010-07-261-1/+4
| | | | | | | | | | | | | | | | usb drivers need to get the right value for otg clock so calculate and return it Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | MX25: put define for OTG base address in right includeEric Bénard2010-07-261-2/+0
| | | | | | | | | | | | | | the standard place for this define is include/mach/mx25.h Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx25pdk: add keypad supportBaruch Siach2010-07-261-0/+36
| | | | | | | | | | | | | | The keymap is taken from the Freescale supplied kernel. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx25: add platform code for imx-keypadBaruch Siach2010-07-263-1/+22
|/ | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm/mx25: add watchdog deviceWolfram Sang2010-05-182-0/+16
| | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Tested-by: Juergen Beisert <jbe@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'origin' into devel-stableRussell King2010-03-081-4/+1
|\ | | | | | | | | | | | | Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c
| * Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-03-011-4/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| | * ARM: Consolidate clks_register() and similarRussell King2010-02-121-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most machine classes want some way to register a block of clk_lookup structures, and most do it by implementing a clks_register() type function which walks an array, or by open-coding a loop. Consolidate all this into clkdev_add_table(). Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Uwe Kleine-König2010-02-255-1/+91
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | mx25: move ARCH_MXC_IOMUX_V3 to the ARCH levelBaruch Siach2010-02-241-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | mx25pdk: add LCD supportBaruch Siach2010-02-181-0/+55
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | mx25: add platform support for imxfbBaruch Siach2010-02-183-0/+36
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | arm/mx25: don't include iomux.h which is for iomux-v1 machinesUwe Kleine-König2010-02-241-1/+1
|/ / / | | | | | | | | | 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-021-1/+1
| | | | | | | | | | | | | | | | | | | | | 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>
* | | 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-293-0/+22
| | | | | | | | | | | | | | | 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-292-22/+38
|\ \ \ | |/ /
| * | 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>
| * | mx25: fix time accountingBaruch Siach2010-01-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-262-2/+2
| | | | | | | | | | | | | | | | | | | | | 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-261-6/+8
| | | | | | | | | | | | | | | | | | | | | 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-261-20/+21
| |/ | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx25pdk: add NAND device supportBaruch Siach2010-01-141-0/+7
| | | | | | | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx25: add NAND supportBaruch Siach2010-01-142-0/+21
|/ | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
OpenPOWER on IntegriCloud