summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * imx/mx25: rename files defining a machine to mach-$mach.cUwe Kleine-König2010-02-022-1/+1
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSETUwe Kleine-König2010-02-0223-38/+44
| | | | | | | | | | | | | | This is a further step in allowing to build a kernel image for more than one imx SOC. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * imx2x: convert serial.c to use soc-prefixed constantsUwe Kleine-König2010-02-022-25/+24
| | | | | | | | | | | | | | This makes the file compilable for a kernel that supports both imx21 and imx27. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * mxc91231: redefine MXC91231_IO_ADDRESS using IMX_IO_ADDRESSUwe Kleine-König2010-02-021-48/+10
| | | | | | | | | | | | | | This simplifies the macro and makes is similar to the other ..._IO_ADDRESS macros defined for imx SOCs. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * mxc91231: use MXC91231_IO_ADDRESS instead of MXC91231_AIPS1_IO_ADDRESSUwe Kleine-König2010-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Apart from MXC91231_IO_ADDRESS itself this was the only usage of MXC91231_AIPS1_IO_ADDRESS. Now MXC91231_IO_ADDRESS can be recoded with IMX_IO_ADDRESS and all helper macros can go away. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Daniel Schaeffer <daniel.schaeffer@timesys.com> Cc: Alberto Panizzo <maramaopercheseimorto@gmail.com> Cc: Ivo Clarysse <ivo.clarysse@gmail.com>
| * imx: WARN in clk_disable if the clock isn't enabledUwe Kleine-König2010-02-021-0/+1
| | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: Russell King <linux@arm.linux.org.uk>
| * mx25: deprecate UART1_BASE_ADDR and UART2_BASE_ADDRUwe Kleine-König2010-01-301-2/+7
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * mx1: prefix SOC specific defines with MX1_ and deprecate old namesUwe Kleine-König2010-01-302-127/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old names are defined only if the cpp symbol IMX_NEEDS_DEPRECATED_SYMBOLS exists, which is defined (for now) for all files below arch/arm/mach-mx1. This was done earlier for mx2 and mx3, too. USBD_INT0 is for now defined unconditionally to prevent breaking drivers/usb/gadget/imx_udc. While at it use IMX_IO_ADDRESS to define MX1_IO_ADDRESS which adds a cast to the IO_ADDRESS macro fixing many warnings like arch/arm/mach-mx1/generic.c:51: warning: passing argument 1 of 'mxc_init_irq' makes pointer from integer without a cast . Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* | 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>
* mx25pdk: platform code for the DryIce RTC moduleBaruch Siach2010-01-291-0/+1
| | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mx25: add support for the DryIce rtcBaruch Siach2010-01-294-0/+24
| | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'mxc-rc' into mxc-masterSascha Hauer2010-01-298-25/+185
|\
| * mx35: add a missing comma in a pad definitionUwe Kleine-König2010-01-291-1/+1
| | | | | | | | | | | | Reported-by: Tim Sander <tstone@vlsi.informatik.tu-darmstadt.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx25: make the FEC AHB clk secondary of the IPGBaruch Siach2010-01-261-2/+2
| | | | | | | | | | | | | | This makes the FEC clock configuration consistent with the UART one. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx25: fix time accountingBaruch Siach2010-01-261-1/+6
| | | | | | | | | | | | | | | | | | The gpt_clk rate function doesn't consider the PER divider. This causes a significant drift in time accounting. Fix this by introducing the correct rate calculation function. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx25: properly initialize clocksBaruch Siach2010-01-261-0/+8
| | | | | | | | | | | | | | | | | | | | This patch disables all unnecessary clock in mx25_clocks_init() to make a clean start, the same as is being done for the rest of the i.MX chips. This patch was tested on i.MX25 PDK. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx25: remove unused mx25_clocks_init() argumentBaruch Siach2010-01-263-3/+3
| | | | | | | | | | | | | | The fref is needless on mx25 since the reference clock is fixed at 24MHz. Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX25: implement secondary clocks for uarts and fecSascha Hauer2010-01-261-6/+8
| | | | | | | | | | | | | | For uarts and fec need two clocks, implement it using the secondary clock field in struct clk. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * i.MX25: Allow secondary clocks in DEFINE_CLOCKSascha Hauer2010-01-261-20/+21
| | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * ARM: MX3: Fixed typo in declared enum type name.Vladimir Zapolskiy2010-01-211-1/+1
| | | | | | | | | | | | | | | | | | To distinguish between mx31lite and mx31lilly boards better to use different enum types. Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com> Acked-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * MXC: Add AUDMUXv2 register decode to debugfsMark Brown2010-01-121-0/+137
| | | | | | | | | | | | | | | | | | | | Since AUDMUX configuration appears to be one of the common stumbling blocks for people setting up i.MX audio try to provide some diagnostic information describing the current setup to assisist people in working out what's going on. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31ads: Provide an IRQ range to the WM835x on the 1133-EV1 moduleMark Brown2010-01-052-0/+6
| | | | | | | | | | | | | | | | The WM8350 core won't actually use the range yet, but it will in future and the platform data to configure it is there now. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31ads: Provide a name for EXPIO interrupt chipMark Brown2010-01-051-0/+1
| | | | | | | | | | | | | | | | This makes it a bit more obvious in genirq diagnostics that they aren't handled by the i.MX interrupt controller. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31ads: Allow enable/disable of switchable suppliesMark Brown2010-01-051-0/+2
| | | | | | | | | | | | | | | | They will be automatically powered off at startup so users will need to enable them for use. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: IMX31: configure pins iomux for SDHC setup on litekit board.Vladimir Zapolskiy2010-01-261-9/+21
| | | | | | | | | | | | | | | | | | | | This patch adds SDHC support, and corrects current pins setup. Added irq handling on card removal. Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com> Cc: Daniel Mack <daniel@caiaq.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx2/mx3: debug-macro.S needs deprecated symbolsUwe Kleine-König2010-01-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: arch/arm/kernel/debug.S:147: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)' arch/arm/kernel/debug.S:163: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)' when compiling for mx2 with CONFIG_DEBUG_LL=y. A similar error exists on mx3 and is fixed by this commit, too. These were introduced by aae7019382896cf1075a93acc564e42601bc44a2. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx25pdk: add NAND device supportBaruch Siach2010-01-141-0/+7
| | | | | | | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | mx25: add NAND supportBaruch Siach2010-01-143-0/+23
| | | | | | | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
OpenPOWER on IntegriCloud