aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2010-07-2927-621/+873
|\ | | | | | | devel-stable
| * 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>
| * pcm043: register flexcan deviceMarc Kleine-Budde2010-07-262-0/+5
| | | | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@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>
| * mx35: adjust flexcan clock definitionMarc Kleine-Budde2010-07-261-2/+2
| | | | | | | | | | Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31_3ds: revert 3ds debug board relate codeJason Wang2010-07-262-165/+5
| | | | | | | | | | | | | | | | Because we add a 3ds debug board support in mxc level, we remove those redundant codes from board level. Signed-off-by: Jason Wang <jason77.wang@gmail.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-2626-460/+372
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: mx3: complement uart init routine with an exit routineUwe Kleine-König2010-06-301-3/+15
| | | | | | | | | | | | | | | | | | | | | moboard_uart0_init requests a gpio. Without an exit function that frees that gpio again binding the uart a second time doesn't work. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: imx: dynamically register imx-uart devices (imx35)Uwe Kleine-König2010-06-306-71/+15
| | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: imx: dynamically register imx-uart devices (imx31)Uwe Kleine-König2010-06-3016-90/+62
| | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: imx: dynamically register spi_imx devices (imx35)Uwe Kleine-König2010-06-305-71/+8
| | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: imx: dynamically register spi_imx devices (imx31)Uwe Kleine-König2010-06-309-19/+30
| | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: imx: dynamically register imx-i2c devices (imx35)Uwe Kleine-König2010-06-305-69/+10
| | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: imx: dynamically register imx-i2c devices (imx31)Uwe Kleine-König2010-06-308-12/+27
| | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: imx: Change the way nand devices are registered (imx35)Uwe Kleine-König2010-06-305-29/+18
| | | | | | | | | | | | | | | | | | Make use of new mechanism to register a nand device. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: imx: Change the way nand devices are registered (imx31)Uwe Kleine-König2010-06-308-14/+42
| | | | | | | | | | | | | | | | | | Make use of new mechanism to register a nand device. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: mx3: remove paragraphs with old address of the FSFUwe Kleine-König2010-06-3016-64/+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: mx3/mx31ads: fold board header in its only userUwe Kleine-König2010-06-241-7/+36
| | | | | | | | | | | | | | | | | | Moreover remove unused definitions. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: mx3/mx31_3ds: fold board header in its only userUwe Kleine-König2010-06-241-7/+35
| | | | | | | | | | | | | | | | | | Moreover remove unused definitions. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: mx3/qong: get rid of nearly empty headerUwe Kleine-König2010-06-241-2/+1
| | | | | | | | | | | | | | | | | | board-qong.h only defined a single symbol that was used only once. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: mx3/kzm_arm11_01: fold board header in its only userUwe Kleine-König2010-06-241-1/+17
| | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: imx: remove empty and unused board headersUwe Kleine-König2010-06-242-2/+0
| | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: mx3: rename mach-mx35pdk.c to mach-mx35_3ds.c matching its arch numberUwe Kleine-König2010-06-022-1/+7
| | | | | | | | | | | | | | | | | | Additional document all known names of that machine. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | mx31_3ds: Handle USB OTG GPIO ErrorsFabio Estevam2010-07-261-3/+20
| | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | i.MX35: add cpuimx35 support and its baseboardEric Bénard2010-07-264-0/+513
| | | | | | | | | | | | | | | | | | | | | | | | | | | * cpuimx35 integrates i.MX35, RAM, NAND, Ethernet, I2C RTC, USB Host, USB OTG and I2C touchscreen controller * 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.MX35: return IPU clock's value for mx3fbEric Bénard2010-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | without this patch, ipu_clk's value is 0 thus preventing mx3fb from calculating the right divisor for pixel clock generator. Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | pcm037/pcm043/pca100: fix ULPI-related build warningsWolfram Sang2010-07-262-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like this one (if CONFIG_USB_ULPI is not set): arch/arm/mach-mx3/mach-pcm043.c:312: warning: 'otg_pdata' defined but not used arch/arm/mach-mx3/mach-pcm043.c:317: warning: 'usbh1_pdata' defined but not used Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mx3: mx31lilly: pass mc13783 SPI IRQ pinDaniel Mack2010-07-261-0/+1
| | | | | | | | | | | | | | | | | | | | | This makes the resistive touch interface work. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | ARM: mx3: pcm037: remove unused variableDaniel Mack2010-05-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | CC arch/arm/mach-mx3/mach-pcm037.o arch/arm/mach-mx3/mach-pcm037.c: In function 'mxc_board_init': arch/arm/mach-mx3/mach-pcm037.c:584: warning: unused variable 'tmp' Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | ARM: mx3: mx31lilly: fix build error for !CONFIG_USB_ULPIDaniel Mack2010-07-011-11/+22
| |/ |/| | | | | | | | | | | | | | | | | | | arch/arm/mach-mx3/built-in.o: In function `mx31lilly_board_init': mach-kzm_arm11_01.c:(.init.text+0x674): undefined reference to `otg_ulpi_create' mach-kzm_arm11_01.c:(.init.text+0x68c): undefined reference to `otg_ulpi_create' mach-kzm_arm11_01.c:(.init.text+0x744): undefined reference to `mxc_ulpi_access_ops' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | leds: Add mx31moboard MC13783 led supportPhilippe Rétornaz2010-05-261-1/+44
|/ | | | | | | Add two RGB led on mx31moboard using MC13783 led subsystem Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-05-2512-73/+379
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits) ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900 ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline ARM: 6140/1: silence a bogus sparse warning in unwind.c ARM: mach-at91: duplicated include ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup ARM: SPEAR6xx: remove duplicated #include ARM: s3c6400_defconfig: Add NAND driver ARM: s3c6400_defconfig: enable sound as modules ARM: s3c6400_defconfig: enable power management ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34 ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34 ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34 ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34 ...
| * mx31_3ds: Support the keypad situated in the personality boardAlberto Panizzo2010-05-191-0/+32
| | | | | | | | | | Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MX3X: Add Keypad device definition for MX3X archAlberto Panizzo2010-05-192-0/+20
| | | | | | | | | | | | | | This patch adds also the pin definition helpers in iomux-mx3.h Signed-off-by: Alberto Panizzo <maramaopercheseimorto@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * arm/mach-mx3: add watchdog device to Phytec-boardsWolfram Sang2010-05-172-0/+2
| | | | | | | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * arm/mach-mx2/3: Fix watchdog-devices to match the current driverWolfram Sang2010-05-171-1/+1
| | | | | | | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC: Add USB OTG (device) for i.MX31 PDK (3DS) board.Magnus Lilja2010-05-171-0/+55
| | | | | | | | | | | | | | Tested on actual hardware using the g_ether and g_serial gadget drivers. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31moboard: OTG host support for smartbot boardPhilippe Rétornaz2010-05-172-3/+39
| | | | | | | | | | | | | | | | | | | | The Eyebot robot needs the OTG port in host mode on the smartbot. Add a new board definition so we can select the usb host/device mode at boot with the mx31moboard_baseboard boot parameter. Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31moboard: Move usb OTG device registrationPhilippe Rétornaz2010-05-174-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | In preparation for a new robot which needs the OTG port as host. This moves the OTG device registration into board initialisation. Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch> Acked-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31moboard: Fix usb PHY resetPhilippe Rétornaz2010-05-171-61/+37
| | | | | | | | | | | | | | | | | | Setup the pad with correct pull-up/down before doing the reset. Assert the PHY enable signal so the reset is really done. Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch> Acked-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31smartbot: change the config of a gpioValentin Longchamp2010-05-061-4/+4
| | | | | | | | | | | | | | | | Since it is finally used on the handbot as a configuration input for the translator. Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: mx3/lilly1131: add USB supportDaniel Mack2010-04-142-0/+146
| | | | | | | | | | | | Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * imx31: add rtc device on litekit board.Vladimir Zapolskiy2010-04-141-0/+1
| | | | | | | | | | | | | | | | This patch adds support for SoC build-in RTC device on litekit board. Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * imx3: Add rtc platform device supportVladimir Zapolskiy2010-04-142-0/+20
| | | | | | | | | | | | | | | | | | This patch adds support for build-in RTC device found on Freescale imx31 and imx35 SoCs. Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | can: sja1000 platform data fixesWolfgang Grandegger2010-05-171-3/+3
|/ | | | | | | | | | | | | | The member "clock" of struct "sja1000_platform_data" is documented as "CAN bus oscillator frequency in Hz" but it's actually used as the CAN clock frequency, which is half of it. To avoid further confusion, this patch fixes it by renaming the member to "osc_freq". That way, also non mainline users will notice the change. The platform code for the relevant boards is updated accordingly. Furthermore, pre-defined values are now used for the members "ocr" and "cdr". Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6Russell King2010-04-088-26/+296
|\ | | | | | | | | Conflicts: arch/arm/mach-mx3/mach-pcm037.c
generated by cgit v1.1 at 2024-08-01 04:36:04 +0000