summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into develRussell King2009-09-124-12/+3
|\
| * mx31moboard: invert sdhc ro signal senseValentin Longchamp2009-08-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | Small confusion with our hardware engineer, the WP signal (RO) is active low on our boards, the signal has to inverted. This is a pretty straightforward patch, it could even go to -rc, but if not, then push it for 2.6.32. Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx3: Fix double pin allocation in pcm037_eet.cGuennadi Liakhovetski2009-07-311-9/+0
| | | | | | | | | | | | | | SPI pins are now allocated in pcm037.c, remove them from EET. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx31moboard: two GPIOS are used to reset other microcontrolers on the robotValentin Longchamp2009-08-141-0/+20
| | | | | | | | | | Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx31moboard: initialize 4 input gpios for mx31moboardValentin Longchamp2009-08-141-0/+33
| | | | | | | | | | | | | | | | These gpios are exported to userspace and are here to be used as a selector Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx31moboard: support for the 4 leds used on mx31moboardValentin Longchamp2009-08-141-0/+35
| | | | | | | | | | Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | pcm037: mux configuration for predefined gpio lineLuotao Fu2009-08-141-0/+2
| | | | | | | | Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
* | pcm043: mux configuration for predefined gpio lineLuotao Fu2009-08-141-1/+2
| | | | | | | | Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
* | MX31 Fix spi clock namesSascha Hauer2009-08-141-3/+3
| | | | | | | | | | | | Fix the SPI clock names to match the device names. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx3x: Fixup USB base addressesSascha Hauer2009-08-141-6/+14
| | | | | | | | | | | | | | The i.MX31 and the i.MX35 have different USB base addresses. Adjust the resources accordingly. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | i.MX35 clock support: Add USB clocksSascha Hauer2009-08-141-2/+18
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | MX31: add spi controller devices/resourcesSascha Hauer2009-08-142-0/+64
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx31moboard: move usb otg support back to moboard common fileValentin Longchamp2009-08-143-90/+45
| | | | | | | | | | | | | | since all boards finally have this device Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx31moboard: added usb xcvr reset for mx31moboardValentin Longchamp2009-08-143-27/+49
| | | | | | | | | | Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | fix mx35 wrong clockSascha Hauer2009-08-141-1/+1
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | iomux-v3: Allow for a runtime base addressSascha Hauer2009-08-141-0/+2
| | | | | | | | | | | | | | also, check for a valid pad_ctrl_ofs before changing the pad control register. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: MX3: add ckil clockDaniel Mack2009-08-141-0/+7
| | | | | | | | | | | | | | | | The CKIL clock source is used by the upcoming RTC driver, so we need to export it. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: mxc: Fix i2c_board_info definitionsSascha Hauer2009-08-142-4/+2
| | | | | | | | | | | | | | | | | | Fix i2c_board_info definitions - we were defining the 'type' field of these structures twice since the first argument of I2C_BOARD_INFO sets this field. Move the second definition into I2C_BOARD_INFO(). Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Jean Delvare <khali@linux-fr.org>
* | ehci mxc: Fix clocksSascha Hauer2009-08-071-0/+6
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | MX3: Add USB platform devices and resourcesDaniel Mack2009-08-072-0/+68
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | pcm037: Add support for SJA1000 on baseboardSascha Hauer2009-08-071-0/+30
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx3: Codingstyle: Let the compiler count arraysSascha Hauer2009-08-074-24/+16
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mxc: turn to soc specific init_irq functionsSascha Hauer2009-08-0711-10/+21
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | system.c: runtime base addressSascha Hauer2009-08-071-0/+2
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | MXC: pass base/irq to mxc_timer_initSascha Hauer2009-08-072-2/+3
|/ | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: add support for the EET board, based on the i.MX31 pcm037 moduleGuennadi Liakhovetski2009-06-235-6/+283
| | | | | | | | | | | | | The "EET" variant of the pcm037 board has an OLED display, using a S6E63D6 display controller on the first SPI interface, using GPIO57 as a chip-select for it. S6E63D6 is initialised in the boot-loader, so we only have to take care of the LCD. EET also adds several buttons and LEDs on GPIOs. This patch adds a "pcm037_variant=" kernel command line parameter to specify at boot-time which board the kernel is running on, default is "pcm970", specify "eet" for the EET board. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* pcm037: add MT9T031 camera supportGuennadi Liakhovetski2009-06-231-12/+106
| | | | | | | | | Add support for the MT9T031 CMOS camera sensor from Aptina to the PCM037 board. Also add two I2C iomux pin definitions, needed for pcm037. Also remove now unneeded #ifdef CONFIG_I2C_IMX. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Armadillo 500 add NAND flash device support (resend).Alberto Panizzo2009-06-231-0/+16
| | | | | | | | | Since recent mxc_nand driver fixes from linux-mtd this patch add support for ST NAND02GW3B2CN6 (2k pages flash) placed on the armadillo 500 motherboard. Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM MXC: Armadillo 500 add NOR flash device support (resend).Alberto Panizzo2009-06-231-0/+47
| | | | | | | | This patch add support for NOR flash mapping through the physmap driver. The purpose is to maintain the original Atmark partition model. Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mx31: remove duplicated #includeHuang Weiyi2009-06-231-1/+0
| | | | | | | Remove duplicated #include in arch/arm/mach-mx3/devices.c. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* 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>
OpenPOWER on IntegriCloud