summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2010-03-02123-3235/+7603
|\ | | | | | | | | | | | | devel-stable Conflicts: arch/arm/Makefile
| * Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Uwe Kleine-König2010-02-2554-127/+5074
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-242-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * mx51_babbage: Fix ckih2 parameter in mx51_clocks_init functionFabio Estevam2010-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is to be applied into Sascha's mxc-master branch. Fix ckih2 parameter in mx51_clocks_init funtion. CKIH2 pin is left unconnected on Babbage. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Amit Kucheria <amit.kucheria@canonical.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * mx31ads: Configure SSI5 pins in IOMUX for PMIC module audio supportMark Brown2010-02-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | SSI5 on the CPU is connected to the PMIC module to provide audio support so unconditionally configure the relevant pins on the CPU to route out the signals. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * mx25pdk: add LCD supportBaruch Siach2010-02-182-0/+57
| | | | | | | | | | | | | | | 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-184-0/+38
| | | | | | | | | | | | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * imxfb: add support for i.MX25Baruch Siach2010-02-182-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit also introduces the HAVE_FB_IMX config that is to be selected from the MX25 platform config. Once this commit gets merged, the two other i.MX archs, ARCH_MX1 and ARCH_MX2, should follow this one. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * imx-serial-excessive-status-clearing-on-break.patchAndy Green2010-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc: Sasha Hauer <kernel@pengutronix.de> We noticed that we were only able to communicate once with a GSM module per session, if we powered down the module then the serial driver was broken until reset, no traffic or /proc/interrupts activity could be seen any more. Volker noticed it was provoked by a long "break" seen on the wire when the RX was not driven during powerdown, we discovered we could kill the serial driver just by forcing RX low extenally for a little while. I saw that the processing for BREAK in the driver gets too excited and clears down all set bits in USR2, including that a character is pending. This stops all further characters getting processed. The attached one-liner makes the serial driver immortal against BREAK. Signed-off-by: Andy Green <andy.green@txtr.com> Signed-off-by: Volker Ernst <volker.ernst@txtr.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * mx31moboard: support for the smartbot baseboardValentin Longchamp2010-02-106-34/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This baseboard is used on the handbot and eybot robots. The sel gpios are used as enables and rst signals on smartbot, thus the sel init is moved from mx31moboard file to board files. Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * mx31moboard: make usbh2 enable gpio claim more atomicValentin Longchamp2010-02-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | It is more cosmetic than fixing a real problem, but the code looks more logical like that Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * mx31moboard: change initial reset status for robot microcontollersValentin Longchamp2010-02-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want the microcontrollers to be held in reset during kernel boot. We also set the turretcam as the default camera since it is present on all marxbots. Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * Merge branch 'mx51-baseport-sascha' of ↵Sascha Hauer2010-02-1028-20/+4144
| | |\ | | | | | | | | | | | | git://kernel.ubuntu.com/amitk/mx51-upstream into mxc-master
| | | * mxc: MAINTAINERS: Add maintainer for mach-mx5Amit Kucheria2010-02-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Add self to MAINTAINERS for Freescale i.MX5 SoCs Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
| | | * mxc: Add mx51_defconfigAmit Kucheria2010-02-091-0/+1286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This config is used to test the base support for i.MX51 processors on the Babbage board Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
| | | * mxc: Add support for the Babbage board (i.MX5)Amit Kucheria2010-02-096-0/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Babbage is a reference board from Freescale for their i.MX51 SoC. Add board definition, Kconfig and Makefiles to enable Freescale i.MX51 processor and Babbage board. Boot tested on a Babbage2.5 board Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
| | | * mxc: Core support for Freescale i.MX5 seriesAmit Kucheria2010-02-0910-3/+2433
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic clock support, cpu identification, I/O mapping, interrupt controller, serial port and ethernet. Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
| | | * mxc: changes to common plat-mxc code to add support for i.MX5Amit Kucheria2010-02-096-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare for i.MX5 SoC code by adding the relevant macros to common plat-mxc code. Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
| | | * mxc: refactor timer code to use timer versionsSascha Hauer2010-02-091-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the timer code into version 1 and version 2. Essentially there are 2 versions of the timer hardware on Freescale MXC hardware. Version 1 is found on MX1/MXL, MX21 and MX27. Version 2 is found on MX25, MX31, MX35, MX37, MX51, and future parts. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
| | | * mxc: TrustZone interrupt controller (TZIC) for Freescale i.MX5 familyAmit Kucheria2010-02-096-2/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Freescale i.MX51 processor uses a new interrupt controller. Add driver for TrustZone Interrupt Controller Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
| | * | i.MX pcm043: Add AC97 sound supportSascha Hauer2010-02-101-0/+101
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * | pca100: add sound supportSascha Hauer2010-02-101-0/+48
| | | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * | add ssi header fileSascha Hauer2010-02-101-0/+18
| | |/ | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * i.MX27 pca100: Add USB supportSascha Hauer2010-02-042-0/+54
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * i.MX31 pcm037: Add USB supportSascha Hauer2010-02-042-45/+93
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * i.MX27 pcm038: Add USB supportSascha Hauer2010-02-042-0/+23
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * i.MX27 pca100: Add USB supportSascha Hauer2010-02-042-0/+104
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * i.MX35: Add USB control register access supportSascha Hauer2010-02-042-0/+59
| | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Daniel Mack <daniel@caiaq.de>
| | * i.MX27: Add USB control register access supportSascha Hauer2010-02-041-1/+46
| | | | | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Daniel Mack <daniel@caiaq.de>
| | * i.MX ehci platform support: Some fixesSascha Hauer2010-02-041-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The SIC mask is only 2bits wide, not 4 - MX31_OTG_PM_BIT and MX31_H1_PM_BIT use negative logic - clear MX31_H1_DT_BIT and MX31_H2_DT_BIT so that they can be cleared, not only set. - return -EINVAL if called with an invalid controller number Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Daniel Mack <daniel@caiaq.de>
| | * fsl_mx3_udc: Add i.MX35 supportSascha Hauer2010-02-041-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | The i.MX35 works fine with this driver, but we do not have the usb_ahb clock. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
| | * Merge branch 'imx/master' of git://git.pengutronix.de/git/ukl/linux-2.6 into ↵Sascha Hauer2010-02-0432-242/+349
| | |\ | | | | | | | | | | | | mxc-master
| | * | MX1/MX2: -EINVAL overwritten in second iteration in ↵Roel Kluin2010-02-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mxc_gpio_setup_multiple_pins() Due to the `ret = gpio_request()' below in the loop, the initial -EINVAL value of ret is overwritten. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | arm/imx/iomux-v1: check for invalid modes in mxc_gpio_modeUwe Kleine-König2010-02-244-46/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mxc_gpio_mode checks for invalid pins and so it returns zero for success, -EINVAL for invalid pins. While at it, remove definitions of GPIO_PORT_MAX removed as they are unused now. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx: let platform files include the SoC-specific iomux headerUwe Kleine-König2010-02-2412-12/+12
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/iomux-v1: rename header fileUwe Kleine-König2010-02-247-127/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addionally make iomux-mx*.h headers stand-alone and similar to iomux-v3 platform files should include their platform iomux header from now on. For now iomux.h simply includes all iomux-v1 platform headers and so provides compatibility until all files are converted. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/mx25: don't include iomux.h which is for iomux-v1 machinesUwe Kleine-König2010-02-242-5/+1
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/iomux-mx3.h: unify style and commentsUwe Kleine-König2010-02-241-36/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use __MACH_IOMUX_MX3_H__ as header protector analogous to <mach/mx...h> - use tabs for indention Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/iomux-mx2x: unify styleUwe Kleine-König2010-02-241-212/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use __MACH_IOMUX_MX2x_H__ as header protector analogous to <mach/mx...h> - use tabs for indention Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/iomux-mx27: unify style and commentsUwe Kleine-König2010-02-241-183/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use __MACH_IOMUX_MX27_H__ as header protector analogous to <mach/mx...h> - use tabs for indention - fix sorting Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/iomux-mx25: unify style and comment cleanupUwe Kleine-König2010-02-241-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use __MACH_IOMUX_MX25_H__ as header protector analogous to <mach/mx...h> - remove doxygen comments - remove #error about mach/iomux.h which is unused on mx25 - remove #ifndef __ASSEMBLY__ which is unneeded here Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/iomux-mx21: unify styleUwe Kleine-König2010-02-241-103/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use __MACH_IOMUX_MX21_H__ as header protector analogous to <mach/mx...h> - use tabs for indention Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/iomux-mx1: unify style and comment cleanupUwe Kleine-König2010-02-241-159/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use __MACH_IOMUX_MX1_H__ as header protector analogous to <mach/mx...h> - use tabs for indention Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/iomux-v1: make base address a runtime choiceUwe Kleine-König2010-02-242-67/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it move register modification to static inlines and so make the relevant code more readable. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/iomux-v1: rename source file and reorganize Kconfig stuffUwe Kleine-König2010-02-243-9/+14
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_...Uwe Kleine-König2010-02-241-23/+30
| | | | | | | | | | | | | | | | | | | | | | | | This is necessary for a multi-SoC kernel. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/dma-v1: don't use deprecated symbols DMA_BASE and MXC_INT_DMACH0Uwe Kleine-König2010-02-242-71/+90
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 ↵Uwe Kleine-König2010-02-241-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | and mx3 Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx/irq: order definitions of MXC_GPIO_IRQS numericallyUwe Kleine-König2010-02-241-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | This is important for kernels supporting more than one SoC. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | arm/imx: don't depend on ARCH_MXC twiceUwe Kleine-König2010-02-241-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MXC_IRQ_PRIOR, MXC_PWM and ARCH_HAS_RNGA are all defined in an "if ARCH_MXC" ... "endif" block, so they depend on ARCH_MXC anyhow. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 06:41:26 +0000