summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-06-1410-343/+880
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (417 commits) MAINTAINERS: EB110ATX is not ebsa110 MAINTAINERS: update Eric Miao's email address and status fb: add support of LCD display controller on pxa168/910 (base layer) [ARM] 5552/1: ep93xx get_uart_rate(): use EP93XX_SYSCON_PWRCNT and EP93XX_SYSCON_PWRCN [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routines [ARM] 5544/1: Trust PrimeCell resource sizes [ARM] pxa/sharpsl_pm: cleanup of gpio-related code. [ARM] pxa/sharpsl_pm: drop set_irq_type calls [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic one [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specific [ARM] sa1100: remove unused collie_pm.c [ARM] pxa: fix the conflicting non-static declarations of global_gpios[] [ARM] 5550/1: Add default configure file for w90p910 platform [ARM] 5549/1: Add clock api for w90p910 platform. [ARM] 5548/1: Add gpio api for w90p910 platform [ARM] 5551/1: Add multi-function pin api for w90p910 platform. [ARM] Make ARM_VIC_NR depend on ARM_VIC [ARM] 5546/1: ARM PL022 SSP/SPI driver v3 ARM: OMAP4: SMP: Update defconfig for OMAP4430 ARM: OMAP4: SMP: Enable SMP support for OMAP4430 ...
| * MXC : update i.MX21 clock support for USB host.Martin Fuzzey2009-06-081-26/+51
| | | | | | | | | | | | | | | | | | * Use correct clkdev style usb clock name * Implement rate setting for USB clock * Introduce _clk_generic_round_rate to factorize the (now 3) uses of rounding code. Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * PATCH] mx27pdk: rename mxc_map_io to mx27_map_ioSimon POLETTE2009-06-051-1/+1
| | | | | | | | | | | | | | | | Hi, Fixed issue in the mxc-master head : Signed-off-by: Simon POLETTE <spolette@adnlysd018.(none)> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mxc: Add i.MX27LITE board supportDaniel Schaeffer2009-06-043-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sascha Hauer wrote: > On Tue, Jun 02, 2009 at 04:18:42PM -0400, Daniel Schaeffer wrote: >> Add basic support for the Logic i.MX27LITE board. >> >> Signed-off-by: Daniel Schaeffer <daniel.schaeffer@timesys.com> > > Besides the comment made by Fabio this looks ok to me. > > Sascha > > Fixed issues pointed out by Fabio and Magnus, and rebased to mxc-master head. Signed-off-by: Daniel Schaeffer <daniel.schaeffer@timesys.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * PCM038: Remove unnecessary ifdefs, reorder includes alphabeticallySascha Hauer2009-05-072-18/+13
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * pcm038: Setup all iomux pins at onceSascha Hauer2009-05-072-156/+124
| | | | | | | | | | | | Also, remove usage of set_irq_type after request_irq. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MX27ADS: Add SDHC supportVladimir Barinov2009-05-071-0/+52
| | | | | | | | | | | | | | Add SDHC support for MX27ADS board Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MX27ADS: Add 1-wire supportVladimir Barinov2009-05-071-0/+3
| | | | | | | | | | | | | | Add 1-wire support for MX27ADS board Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MX27ADS: Add framebuffer supportVladimir Barinov2009-05-071-0/+70
| | | | | | | | | | | | | | Add Sharp-QVGA panel support for MX27ADS board Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MX27ADS: Add I2C supportVladimir Barinov2009-05-071-0/+17
| | | | | | | | | | | | | | Add I2C support for MX27ADS board Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MX27ADS: Add NAND supportVladimir Barinov2009-05-071-0/+7
| | | | | | | | | | | | | | Add NAND support for MX27ADS board Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MX27ADS: setup all pins at once in one tableVladimir Barinov2009-05-071-143/+43
| | | | | | | | | | | | | | Setup all pins at once in one table Signed-off-by: Vladimir Barinov <vbarinov@embeddedalley.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MX27: Add basic support to MX27PDKFabio Estevam2009-05-073-0/+102
| | | | | | | | | | | | | | This patch adds basic support to MX27PDK board http://www.freescale.com/imx27pdk ). Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC: mx21ads base supportIvo Clarysse2009-05-073-0/+294
| | | | | | | | | | | | | | | | | | | | [PATCH v6] MXC: mx21ads base support Base machine support for the Freescale i.MX21ADS (M9328MX21ADSE) Application Development System. Signed-off-by: Ivo Clarysse <ivo.clarysse@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * imx: exit functions can/should be voidHolger Schurig2009-05-073-21/+10
| | | | | | | | | | Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC: rename mxc_map_io to architecture specific versionsSascha Hauer2009-05-073-3/+13
| | | | | | | | | | | | | | | | This allows us to have more mapping functions for more than one i.MX architecture in the kernel. As this is the earliest board specific hook we have, also use it to set the cpu type. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx[23]: don't put clock lookups in __initdataRabin Vincent2009-06-032-2/+2
|/ | | | | | | | | Remove the __initdata annotation for the clock lookups, since they will be needed when loading modules which use clk_get(). Tested-by: Agustín Ferrín Pozuelo <gatoguan-os@yahoo.com> Signed-off-by: Rabin Vincent <rabin@rab.in> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* imx21: activate i2cHolger Schurig2009-04-161-1/+1
| | | | | | | | | | Set the correct clkdev-name for the i2c clock. It also get's rid of the ARCH_NR_GPIOS define on the rationale that isn't an ARCH-wide setting anyway. If a device has two pca953x devices, the reserved number will be wrong. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
* imx21: fixes some clocknamesHolger Schurig2009-04-161-3/+3
| | | | Signed-off-by: <hs4233@mail.mn-solutions.de>
* i.MX21/27: remove ifdef CONFIG_FB_IMXSascha Hauer2009-03-271-2/+0
| | | | | | | Compile in the framebuffer device unconditionally to fix pcm038 compilation without framebuffer support. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mxc: add arch_reset() functionIlya Yanok2009-03-272-64/+1
| | | | | | | | | | | This patch adds arch_reset() function for all mxc platforms. It also removes (unsused) arch/arm/mach-mx2/system.c file. This patch has been tested on i.MX1/27/31/35 Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] pass reboot command line to arch_reset()Russell King2009-03-191-1/+1
| | | | | | | | | | | | | | | OMAP wishes to pass state to the boot loader upon reboot in order to instruct it whether to wait for USB-based reflashing or not. There is already a facility to do this via the reboot() syscall, except we ignore the string passed to machine_restart(). This patch fixes things to pass this string to arch_reset(). This means that we keep the reboot mode limited to telling the kernel _how_ to perform the reboot which should be independent of what we request the boot loader to do. Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* pcm970 baseboard: Add SDHC supportSascha Hauer2009-03-131-0/+63
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* MX2: Add SDHC platform_devices and resourcesSascha Hauer2009-03-132-0/+68
| | | | | Signed-of-by: Julien Boibessot <julien.boibessot@armadeus.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] pcm038: Fix pins for UART3Sascha Hauer2009-03-131-2/+2
| | | | | | | The UART3 had a copy-paste bug. instead of claiming rxd, txd, rts and cts pins, cts and rts were claimed twice Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm/imx: Kconfig beautificationHolger Schurig2009-03-131-8/+5
| | | | | Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] PCM038 board: Add I2C supportSascha Hauer2009-03-131-0/+59
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] MX2: Add I2C devices / resourcesSascha Hauer2009-03-132-0/+44
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] MX2: add pwm device/resourcesSascha Hauer2009-03-132-0/+21
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] pcm038: Add framebuffer supportSascha Hauer2009-03-131-1/+69
| | | | | | Add framebuffer support for PCM038 Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] MX2: Add FEC platform deviceSascha Hauer2009-03-134-0/+23
| | | | | | | The in kernel FEC driver has recently been ported to a platform driver. Add a platform_device for it and register it for pcm038 and mx27ads. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* remove unused static function gpio_fec_inactiveUwe Kleine-König2009-03-132-12/+0
| | | | | | | | | | | ... from both mx27ads.c and pcm038.c Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Holger Schurig <hs4233@mail.mn-solutions.de> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Martin Fuzzey <mfuzzey@gmail.com>
* fix warning "control reaches end of non-void function"Uwe Kleine-König2009-03-131-0/+1
| | | | | | | | | | | Add a return 0 analogous to uart_mxc_port[0-2]_exit. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Holger Schurig <hs4233@mail.mn-solutions.de> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Martin Fuzzey <mfuzzey@gmail.com>
* arm/imx21: Framebuffer support for i.MX21Holger Schurig2009-03-132-1/+34
| | | | | | | | | | | | | This patch mimicks what Martin wrote on the mailing list: * move arch/arm/mach-imx/include/mach/imxfb.h into arch/arm/mach-mxc/include/mach/imxfb.h * changes Kconfig so that CONFIG_FB_IMX is selectable * adds a platform device (copied from some pengutronix patches) Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm/imx21: clock support for i.MX21Holger Schurig2009-03-133-0/+1244
| | | | | | | Based on code from "Martin Fuzzey" <mfuzzey@gmail.com> Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm/imx2x: removes a bunch of sparse-warningsHolger Schurig2009-03-135-9/+14
| | | | | | | | | | | | Here are some of the warnings that get fixed by this: > 200 times: warning: cast adds address space to expression (<asn:2>) twelve times: warning: symbol 'xxx' was not declared. Should it be static two times: warning: symbol 'clock' shadows an earlier one five times: warning: incorrect type in initializer (different address spaces) Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] MX27 Clock reworkSascha Hauer2009-03-133-1504/+386
| | | | | | | This changes MX27 to use common clkdev. It also cleans up MX27 clock support to be more readable. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] MXC: remove _clk suffix from clock namesSascha Hauer2009-03-131-9/+9
| | | | | | | | | The context makes it clear already that these are clocks, so there's no need for such a suffix. This patch only changes the clocks actually used in the tree. The remaining clocks are renamed in the subsequent architecture specific patches. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] MXC: rework timer/clock initialisationSascha Hauer2009-03-133-5/+6
| | | | | | | | | - rename mxc_clocks_init to architecture specific versions. This allows us to have more than one architecture compiled in. - call mxc_timer_init from clock initialisation instead from board code Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] MXC: Use a single function for decoding a PLLSascha Hauer2009-03-131-35/+7
| | | | | | | | | | | | We had 3 versions of this function in clock support for MX1/2/3 Use a single one instead. I picked the one from the MX3 as it seems to calculate more accurate as the other ones. Also, on MX27 and MX31 mfn can be negative, this hasn't been handled correctly on MX27 since now. This patch has been tested on MX27 and MX31 and produces the same clock frequencies for me. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm/imx21: add kbuild support for the Freescale i.MX21Holger Schurig2009-03-133-3/+22
| | | | | | | | | | | | | * adds Kconfig variables * specifies different physical address for i.MX21 because of the different memory layouts * disables support for UART5/UART6 in the i.MX serial driver (the i.MX21 doesn't have those modules) Based on code from "Martin Fuzzey" <mfuzzey@gmail.com> Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm/imx2x: new IOMUX definitionsHolger Schurig2009-03-132-5/+6
| | | | | | | | | | | | | | * removed iomux-mx1-mx2.h completely * distributes the former contents to four different files (iomux-mx1.h, iomux-mx21.h, iomux-mx27.h and the file iomux-mx2x.h, which is common to both i.MX21 and i.MX27). * adds all documented IOMUX definitions for i.MX21 and i.MX27 * fixes a few that were wrong (PD14_AOUT_FEC_CLR, PE16_AF_RTCK). * don't silenly include <linux/io.h> * and fixes all collateral damage from above Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] fix AT91, davinci, h720x, ks8695, msm, mx2, mx3, netx, omap1, omap2, ↵Russell King2009-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | pxa, s3c arch/arm/mach-at91/at91cap9.c:337: error: 'NR_AIC_IRQS' undeclared here (not in a function) arch/arm/mach-at91/at91rm9200.c:301: error: 'NR_AIC_IRQS' undeclared here (not in a function) arch/arm/mach-at91/at91sam9260.c:351: error: 'NR_AIC_IRQS' undeclared here (not in a function) arch/arm/mach-at91/at91sam9261.c:287: error: 'NR_AIC_IRQS' undeclared here (not in a function) arch/arm/mach-at91/at91sam9263.c:312: error: 'NR_AIC_IRQS' undeclared here (not in a function) arch/arm/mach-at91/at91sam9rl.c:304: error: 'NR_AIC_IRQS' undeclared here (not in a function) arch/arm/mach-h720x/h7202-eval.c:38: error: implicit declaration of function 'IRQ_CHAINED_GPIOB' arch/arm/mach-ks8695/devices.c:46: error: 'KS8695_IRQ_WAN_RX_STATUS' undeclared here (not in a function) arch/arm/mach-msm/devices.c:28: error: 'INT_UART1' undeclared here (not in a function) arch/arm/mach-mx2/devices.c:233: error: 'MXC_GPIO_IRQ_START' undeclared here (not in a function) arch/arm/mach-mx3/devices.c:128: error: 'MXC_GPIO_IRQ_START' undeclared here (not in a function) arch/arm/mach-omap1/mcbsp.c:140: error: 'INT_730_McBSP1RX' undeclared here (not in a function) arch/arm/mach-omap1/mcbsp.c:165: error: 'INT_McBSP1RX' undeclared here (not in a function) arch/arm/mach-omap1/mcbsp.c:200: error: 'INT_McBSP1RX' undeclared here (not in a function) arch/arm/mach-omap2/board-apollon.c:286: error: implicit declaration of function 'omap_set_gpio_direction' arch/arm/mach-omap2/mcbsp.c:154: error: 'INT_24XX_MCBSP1_IRQ_RX' undeclared here (not in a function) arch/arm/mach-omap2/mcbsp.c:181: error: 'INT_24XX_MCBSP1_IRQ_RX' undeclared here (not in a function) arch/arm/mach-pxa/e350.c:36: error: 'IRQ_BOARD_START' undeclared here (not in a function) arch/arm/plat-s3c/dev-i2c0.c:32: error: 'IRQ_IIC' undeclared here (not in a function) ... Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] MXC: remove dependency to other include files from irqs.hSascha Hauer2008-12-181-6/+6
| | | | | | | This patch removes the inclusion of mach/hardware.h from mach/irqs.h and switches to more meaningful names for the irq related macros. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] MX27ads: fix function nameSascha Hauer2008-12-181-1/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] pcm038: Add NAND supportSascha Hauer2008-12-161-0/+8
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] MX27: Add NAND resourcesSascha Hauer2008-12-162-0/+20
| | | | | | | This patch adds the platform device and resources for NAND on mx27 boards. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* pcm038: add driver for static ramSascha Hauer2008-12-161-0/+37
| | | | | | | | | The pcm038 module (phyCORE-i.MX27) comes with a 512 KiB static RAM which can be battery buffered. Add mtd_ram support and configure the chip select line, to which the sram is attached. Signed-off-by: Luotao Fu <l.fu@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] MX1/MX2: simplify mxc_gpio_setup_multiple_pinsSascha Hauer2008-12-162-55/+41
| | | | | | | | | mxc_gpio_setup_multiple_pins used to take several ALLOC_MODE flags. Most of them are unused, so simplify the function by removing the flags. Also, instead of using a confusing MXC_GPIO_ALLOC_MODE_RELEASE flag in a function having alloc in its name, add a mxc_gpio_release_multiple_pins function. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] MX2 pcm038: add 1-wire master supportSascha Hauer2008-12-141-0/+2
| | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>