summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into ↵Russell King2010-03-0244-229/+11517
|\ | | | | | | | | | | | | devel-stable Conflicts: arch/arm/Kconfig
| * ARM: mach-shmobile: ap4evb: Add KEYSC supportKuninori Morimoto2010-02-251-0/+61
| | | | | | | | | | | | | | | | Because AP4 board has capacitor for KEYSC, we need much time for waiting. Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: pfc-sh7377: modify KEYIN settingsKuninori Morimoto2010-02-231-8/+9
| | | | | | | | | | Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: ap4evb: Add S6 debug switch supportKuninori Morimoto2010-02-221-0/+14
| | | | | | | | | | Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: ap4evb: Add LED supportKuninori Morimoto2010-02-221-0/+14
| | | | | | | | | | Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: ap4evb: Add tiny documentKuninori Morimoto2010-02-181-0/+42
| | | | | | | | | | Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: ap4evb: Add SCIFA0 supportKuninori Morimoto2010-02-181-0/+4
| | | | | | | | | | Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: SMSC 9220 support for AP4EVB.Kuninori Morimoto2010-02-181-0/+38
| | | | | | | | | | Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: Add sh7372 pinmux supportKuninori Morimoto2010-02-185-0/+2074
| | | | | | | | | | Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: intc-sh7372 tidyupKuninori Morimoto2010-02-151-44/+46
| | | | | | | | | | | | | | This patch is based on Rev 0.5 manual Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: G4EVM USBHS supportNISHIMOTO Hiroki2010-02-151-0/+59
| | | | | | | | | | | | | | | | Add G4EVM platform data and a magic setup sequence to initialize the r8a66597 block aka USBHS in sh7377. Signed-off-by: NISHIMOTO Hiroki <nishimoto.hiroki@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: sh7377 and G4EVM pinmux supportNISHIMOTO Hiroki2010-02-156-0/+2153
| | | | | | | | | | | | | | | | Add support for the sh 7377 pinmux using drivers/sh/pfc.c and some LEDs on G4EVM. Signed-off-by: NISHIMOTO Hiroki <nishimoto.hiroki@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: G3EVM USBHS supportMagnus Damm2010-02-122-0/+65
| | | | | | | | | | | | | | | | Add G3EVM platform data and a magic setup sequence to initialize the r8a66597 block aka USBHS in sh7367. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: sh7367 and G3EVM pinmux supportMagnus Damm2010-02-127-1/+2212
| | | | | | | | | | | | | | | | Add support for the sh7367 pinmux using drivers/sh/pfc.c and select serial console pins and some LEDs on G3EVM. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: sh7372 INTCA supportMagnus Damm2010-02-093-43/+368
| | | | | | | | | | | | | | Add support for the sh7372 INTCA hardware block. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: sh7377 INTCA supportMagnus Damm2010-02-093-46/+351
| | | | | | | | | | | | | | Add support for the sh7377 INTCA hardware block. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: sh7367 INTCA supportMagnus Damm2010-02-093-44/+271
| | | | | | | | | | | | | | Add support for the sh7367 INTCA hardware block. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: early console support using earlyprintkMagnus Damm2010-02-099-7/+42
| | | | | | | | | | | | | | | | | | | | Add support for early console to the SH-Mobile boards. Simply perform an early platform probe for "earlyprintk" to trigger the early serial console code in sh-sci.c. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: optimize get_irqnr_preamble/and_base macrosMagnus Damm2010-02-091-1/+1
| | | | | | | | | | | | | | | | | | Optimize the SH-Mobile interrupt assembly macros to avoid reloading the INTFLGA register address in case of multiple pending interrupts. Kindly pointed out by Russell King. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: G3EVM, G4EVM and AP4EVB defconfigsMagnus Damm2010-02-083-0/+2332
| | | | | | | | | | | | | | Add defconfigs for G3EVM, G4EVM and AP4EVB. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * MAINTAINERS: Add entry for ARM-based SH-Mobile architecture.Paul Mundt2010-02-081-0/+10
| | | | | | | | Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * serial: sh-sci: Support ARM-based SH-Mobile CPUs.Magnus Damm2010-02-082-9/+15
| | | | | | | | | | | | | | | | | | | | Add support for ARM-based SH-Mobile CPUs to the sh-sci driver. Also remove the SCLSR register that is missing on sh772x, sh7705 and SH-Mobile. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Let INTC set IRQF_VALID on ARM platforms.Magnus Damm2010-02-081-1/+9
| | | | | | | | | | | | | | | | Reuse the SuperH INTC code on ARM by using set_irq_flags() to set IRQF_VALID on ARM platforms. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * sh: Build drivers/sh for ARM-based SH-Mobile CPUs.Magnus Damm2010-02-081-0/+1
| | | | | | | | | | | | | | | | | | Build drivers/sh in the case of ARM-based SH-Mobile CPUs. Shared code for the interrupt controller (INTC) and the gpio/pinmux (PFC) is located there. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: SH-Mobile AP4 support.Magnus Damm2010-02-085-0/+388
| | | | | | | | | | | | | | | | | | | | | | | | This adds preliminary support for the SH7372 (SH-Mobile AP4) CPU and the AP4EVB reference board. Only timer, serial console and NOR flash are supported at this point. Support for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: SH-Mobile G4 support.Magnus Damm2010-02-085-0/+407
| | | | | | | | | | | | | | | | | | | | | | | | This adds preliminary support for the SH7377 (SH-Mobile G4) CPU and the G4EVM reference board. Only timer, serial console and NOR flash are supported at this point. Support for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * ARM: mach-shmobile: SH-Mobile G3 support.Magnus Damm2010-02-0822-0/+724
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds preliminary support for the SH-Mobile G-series. The SH-Mobile G-series is a series of ARM/SH multi-core CPUs that aside from the ARM MPU are primarily composed of existing SH IP blocks. This includes initial support for the SH7367 (SH-Mobile G3) CPU and the G3EVM reference board. Only timer, serial console, and NOR flash are supported at this point. Patches for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| * serial: sh-sci: remove SCIF code in sci_rxd_in()Magnus Damm2010-02-081-219/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since sci_rxd_in() is used by SCI only, clean up the header file by killing off code dealing with SCIF ports and their register definitions. Also introduce a default sci_rxd_in() function which can be shared by all SCIF-only processors. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
* | 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>
OpenPOWER on IntegriCloud