summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-06-1421-149/+2002
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 ...
| * Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2009-06-089-2/+841
| |\ | | | | | | | | | devel
| | * MX35: Add basic support for MX35PDK boardFabio Estevam2009-06-033-0/+112
| | | | | | | | | | | | | | | | | | | | | Add basic support for MX35PDK board (www.freescale.com/imx35pdk). Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * Support for lilly-1131 modules and baseboards [v2]Daniel Mack2009-06-021-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Thu, May 28, 2009 at 08:42:23PM +0200, Sascha Hauer wrote: > > > Mail-Followup-To: Daniel Mack <daniel@caiaq.de>, > > > linux-arm-kernel@lists.arm.linux.org.uk > > > > ... which causes my mutt to only reply to the list. > > Ah, ok. /me hacking in muttrc... Does it work now? Yep :) > > mxc_register_device(&mxc_uart_device0, &uart_pdata); > > + mxc_register_device(&mxc_uart_device1, &uart_pdata); > > + mxc_register_device(&mxc_uart_device2, &uart_pdata); > > What about the RXD3/TXD3 pins? You're right - I got the IOMUX tables wrong and thought UART0 pins are selected unconditionally. But as it turns out TXD1/RXD1 is for UART0 (mxc_uart_device0), TXD2/RXD2 for UART1 (mxc_uart_device1) etc. Below is a new patch. Thanks, Daniel From e7eb5fa0fed09d667a4b2f168fe466e2cc645abb Mon Sep 17 00:00:00 2001 From: Daniel Mack <daniel@caiaq.de> Date: Wed, 27 May 2009 12:22:51 +0200 Subject: [PATCH] ARM: MX3: add two more UARTs to lilly-1131-db Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * mx31: correct csi_clk parent (v2)Valentin Longchamp2009-05-281-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes since v1: we now check if the parent configuration bit was changed since reset and change the parent when needed. csi_clk parent was defined with ahb_clk. However, according to the m31 reference manual, it should be serial_pll_clk. Guennadi always used a 20 MHz clock that was by chance changed to a 45 MHz that fits in the mt9t031 spec. Now the clocks are computed and output correctly (measured on oscillo). Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * MX3: Add missing entry in devices.hFabio Estevam2009-05-281-0/+2
| | | | | | | | | | | | | | | | | | | | | Add missing mxc_rnga_device entry in devices.h (mxc-master tree). Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM MXC: Atmark Armadillo 500 board support.Alberto Panizzo2009-05-261-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mon, 25 May 2009 18:33:28 +0200 Valentin Longchamp <valentin.longchamp@epfl.ch> wrote: > Hello, > > I have updated my mxc git tree and given a compilation spin to your > board support and I have comments. See below. > > > What's the point of declaring this new function, if all it does is > calling the already existing one ? Furthermore, in the current > mxc-master tree, mxc_map_io() does not exist anymore, it should be > mx31_map_io (this breaks compilation for your board). > This patch solve those two issues. Until now i based my patches to vanilla tree. This evening I cloned the mxc-master tree so i could update the armadillo 500 support within recent platform changes. The patch: From e986a8dc262e5292350d95bf65ead75baf3272d7 Mon Sep 17 00:00:00 2001 From: Alberto Panizzo <maramaopercheseimorto@gmail.com> Date: Mon, 25 May 2009 22:24:03 +0200 Subject: [PATCH] Armadillo 500 removing useless function armadillo5x0_map_io and use machine specific io mapping Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM: MX3: add I2C support for lilly-1131Daniel Mack2009-05-261-0/+3
| | | | | | | | | | | | | | | Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM: MX3: add NOR flash support for lilly-1131Daniel Mack2009-05-261-0/+23
| | | | | | | | | | | | | | | Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM: MX3: add framebuffer support for lilly1131-dbDaniel Mack2009-05-261-0/+71
| | | | | | | | | | | | | | | Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM: MX3: add MMC suuport for lilly1131-dbDaniel Mack2009-05-261-0/+67
| | | | | | | | | | | | | | | Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM: MX3: add lilly-1131 ethernet supportDaniel Mack2009-05-261-0/+45
| | | | | | | | | | | | | | | | | | | | | This adds support for the SMSC911x chip found on the lilly-1131 module. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM: MX3: add skeleton for lilly-1131 development boardDaniel Mack2009-05-263-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | Support code for lilly-1131 is implemented in a module/baseboard fashion. All code specific to peripherals found on the development board will go to this file. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM: MX3: basic support for lilly-1131 boardDaniel Mack2009-05-263-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds basic support for INCO startec's LILLY-1131 iMX31 based modules. The module needs a baseboard support to work which will be added in the next patch. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * i.MX31: Add support for LAN9217 on PDK debug board.Magnus Lilja2009-05-191-1/+37
| | | | | | | | | | | | | | | Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * Atmark Armadillo 500 board support.Alberto Panizzo2009-05-193-0/+317
| | | | | | | | | | | | | | | Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | [ARM] Kconfig: remove 'default n'Russell King2009-05-311-4/+0
| |/ | | | | | | | | | | | | Kconfig entries default to n, so there's no need for this to be explicitly specified. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * i.MX31: Add support for the CPLD on PDK Debug board.Magnus Lilja2009-05-181-2/+148
| | | | | | | | | | | | | | | | | | | | | | The i.MX31 PDK consists of several boards, one of them is a debug board containing a CPLD which controls some debug leds, switch buttons, an interrupt chip and an Ethernet controller. This patch adds support for detecting if the PDK board is present (during boot) and adds the interrupt chip to the kernel. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX31: Restructure UART setup for PDK board.Magnus Lilja2009-05-161-11/+9
| | | | | | | | | | | | | | | | Restructure UART pin setup in preparation for adding other pins in later patches. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM MXC: Make-sure-ipg_per_clk-is-generated-by-ipg_clk-and-not-usb_pllAlberto Panizzo2009-05-161-0/+6
| | | | | | | | | | | | | | | | | | | | From ff1fd9d7015d9b9ad3e0df2016d0415e2719747c Mon Sep 17 00:00:00 2001 From: Alberto Panizzo <maramaopercheseimorto@gmail.com> Date: Fri, 15 May 2009 17:21:21 +0200 Subject: [PATCH] Make sure ipg_per_clk is generated by ipg_clk and not usb_pll Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX31: Add NAND device driver for Litekit board.Magnus Lilja2009-05-161-0/+7
| | | | | | | | | | Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31: add camera deviceValentin Longchamp2009-05-072-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | This adds the camera device based on Guennadi's soc_camera architecture for the mx31. The proposed init by Guennadi was removed and must be implemented in the board init file as it contains a lot of board specific info (memory size, clock speed). Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Reviewed-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31moboard: add support for usb OTG device (v3)Valentin Longchamp2009-05-073-12/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | This is used on all board of our system, so again this is done in the mx31moboard.c file. changes since v2: call to gpio_request added in platform code, and moved device initialization in baseboard files. changes since v1: pins are claimed in another patch Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31: calls to gpio_request moved into platform codeSascha Hauer2009-05-076-13/+129
| | | | | | | | | | | | | | In order to use the gpiolib, we now have to call gpio_request in the plaform code since it is not done in iomux code anymore. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31: remove gpio_request calls from iomux codeValentin Longchamp2009-05-071-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | Since iomux code is not directly related to gpio on mx31, the calls to gpio_request are removed from iomux.c file. These calls have to be done in platform initialization files. The name of the singe pin call for iomux is also changed to mxc_iomux_alloc_pin. Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC qonq: mxc_map_io is now mx31_map_ioSascha Hauer2009-05-071-1/+1
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: add USB device support to pcm037Guennadi Liakhovetski2009-05-073-0/+79
| | | | | | | | | | | | | | | | Add OTG device definition and resources to i.MX31 and a pure USB device mode support to the pcm037 board. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX31: Add ethernet support to i.MX31 Litekit board.Magnus Lilja2009-05-071-0/+39
| | | | | | | | | | | | | | This patch adds the SMSC platform device to the Litekit board. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX31: Add UART1 device to Litekit board.Magnus Lilja2009-05-071-0/+19
| | | | | | | | | | Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31moboard: add sdhc support (v3)Valentin Longchamp2009-05-073-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This support both sdhc1 and sdhc2 with WP and CD for the marxbot and devboard mx31moboard baseboards. sdhc2 is present on both, but is not directly included in the mx31moboard file because a third baseboard (not supported yet) without sdhc2 is planned. Changes since v1: removed pin initialization from init/exit function and taken different comments into account Changes since v2: pin initialiation now is done in another patch for all current mx31moboard pins Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31moboard: add i2c support (v2)Valentin Longchamp2009-05-071-0/+12
| | | | | | | | | | | | | | | | Changes since v1: all the pins needed for the drivers are claimed in another patch Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31moboard: setup all pins (v2)Valentin Longchamp2009-05-073-0/+48
| | | | | | | | | | | | | | | | | | | | As suggested by Sascha, here we setup all the pins that we are using in the current (and currently reviewed) drivers for mx31moboard system. changes since v1: changed I2C1 pin names Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX31: Add hw-random for RNGAAlan Carvalho de Assis2009-05-072-0/+18
| | | | | | | | | | | | | | | | | | This hw-random driver add support to RNGA hardware found on some i.MX processors. Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com> Acked-by: Matt Mackall <mpm@selenic.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31moboard: clean-up of board supportValentin Longchamp2009-05-073-31/+33
| | | | | | | | | | | | | | | | | | | | | | | | Various improvements (includes in alphabetical order, platform devices declaration order change, ...) The pins now are claimed in a single function call from a main table for every board for a better clarity and to adopt the current agreement for mx31 devices. Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: framebuffer support for pcm037Guennadi Liakhovetski2009-05-071-0/+52
| | | | | | | | | | | | | | Add support for a QVGA Sharp LCD on pcm037. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC: rename mxc_map_io to architecture specific versionsSascha Hauer2009-05-079-11/+16
| | | | | | | | | | | | | | | | 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>
| * pcm037: Add support for UART2Sascha Hauer2009-05-071-0/+1
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MX35: Fix IPU/Framebuffer clock namesSascha Hauer2009-05-071-1/+2
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * pcm037: add SDHC card detectionSascha Hauer2009-05-071-3/+30
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * pcm037: setup all pins at once and not in init functionsSascha Hauer2009-05-071-49/+75
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX35 clock support: remove automotive pathSascha Hauer2009-05-071-28/+5
| | | | | | | | | | | | | | | | | | It is no longer present in newer cores. Unfortunately Freescale decided to put the bit which decides between automotive clock path and consumer clock path in the automotive clock path direction. With current code we cannot detect the core revision, so just remove automotive path completely. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * [ARM] MX35: Add PCM043 board supportSascha Hauer2009-05-073-0/+260
| | | | | | | | | | | | | | The PCM043 is a i.MX35 based board from Phytec also known as the phyCORE-i.MX35. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC: Add iomux support for MX35 SoCsSascha Hauer2009-05-071-0/+1
| | | | | | | | | | | | | | | | This iomux is called iomux-v3 in the tree because it is the third known incarnation of MXC iomuxers. It is not only found on the MX35 but also on the MX51 and probably others. 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>
* mx31ads: Mark as having full regulatoion constraints with 1133-EV1 boardMark Brown2009-04-161-0/+2
| | | | | | | This allows the regulator API to power off unused regulators at the end of init. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* mx31ads: Depend on all the WM8350 core dependencies for WM1133-EV1 boardMark Brown2009-04-161-0/+2
| | | | | | Otherwise we'd need massive ifdefs in the code. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* qong: remove AIPS[12] mappings from machine-specific iotableIlya Yanok2009-04-161-27/+1
| | | | | | | AIPS[12] are no mapped from generic MX3 code so we don't need to map them from machine-specific map_io function anymore. Signed-off-by: Ilya Yanok <yanok@emcraft.com>
* mx31ads: imoux pins should be passed in as unsigned intMark Brown2009-04-161-1/+1
| | | | | | To match the mxc_iomux_setup_multiple_pins() prototype. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* pcm037 board support: Fix eth interrupt gpio settingSascha Hauer2009-04-161-2/+2
| | | | | | gpio_direction_input needs the gpio number, not the pin description. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* V4L/DVB (11349): mx3-camera: adapt the clock definition and the driver to ↵Guennadi Liakhovetski2009-04-061-1/+1
| | | | | | | | | | | | | the new clock naming With the i.MX31 transition to clkdev clock names have changed, but mistakenly the "mx3-camera.0" has been registered with a non-NULL connection ID, which is not necessary, since this is the only clock, used by the capture interface driver. Fix the clock definition and the driver to use NULL as a connection ID. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
OpenPOWER on IntegriCloud