summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx
AgeCommit message (Collapse)AuthorFilesLines
2011-01-07Merge branch 'devel-stable' into develRussell King34-767/+1610
Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h
2011-01-07Merge branch 'smp' into miscRussell King1-6/+0
Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c
2011-01-03ARM: imx/mx27_3ds: Add PMIC supportFabio Estevam2-0/+78
MX27_3DS board has a MC13783 PMIC connected to the CSPI2 port. Add support for the PMIC. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-03ARM: imx/mx25_3ds: Add USB supportFabio Estevam2-1/+14
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-01-03ARM: imx/mx27_3ds: Add USB OTG supportFabio Estevam2-0/+74
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-14ARM: imx/mx27_3ds: Add watchdog supportFabio Estevam2-0/+2
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-14watchdog: imx: use clk_get to acquire the watchdog clockFabio Estevam3-3/+3
Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-06Merge commit 'v2.6.37-rc4' into imx-for-2.6.38Sascha Hauer2-7/+1
Done to resolve merge conflict: Conflicts: arch/arm/mach-mx25/devices-imx25.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-12-03arm: dma: check clk_get() resultVasiliy Kulikov1-0/+2
clk_get() may return ERR_PTR(), if so propagate return code as imx_dma_init() return code. Signed-off-by: Vasiliy Kulikov <segoon@openwall.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-28ARM: imx: Get the silicon version from the IIM moduleDinh Nguyen2-12/+24
Instead of reading the silicon version from ROM, we should read the SREV register from the IIM. Freescale has dropped all support for MX51 REV1.0, only MX51 REV 2.0 and 3.0 are valid. Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-26ARM: 6483/1: arm & sh: factorised duplicated clkdev.cJean-Christop PLAGNIOL-VILLARD3-4/+3
factorise some generic infrastructure to assist looking up struct clks for the ARM & SH architecture. as the code is identical at 99% put the arch specific code for allocation as example in asm/clkdev.h Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-11-24ARM i.MX27 pm: return gracefully on different socsSascha Hauer1-0/+3
Code called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24ARM i.MX DMA: return gracefully on different socsSascha Hauer1-1/+1
Code called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24ARM i.MX irq: Compile avic irq code only on SoCs that need itSascha Hauer1-0/+4
This patch adds a Kconfig option for the avic irq controller and lets the SoCs that need it select this option. Also, as we have two irq controllers for i.MX, irq.c is not appropriate anymore, so rename it to avic.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookieLothar Waßmann3-3/+3
The following patch is a first step to convert the 'struct pad_desc' to a bitmapped cookie to facilitate adding platform specific pullup or drive strength definitions to existing pad definitions without need to rewrite the complete pad def. The patch wraps 'struct pad_desc' in an opaque data type and introduces macros to access the individual members. This patch does not constitute any functional change! Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-11-24Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Sascha Hauer29-752/+1408
into imx-for-2.6.38
2010-11-19ARM: imx: fix name for functions adding sdhci-esdhc-imx devicesUwe Kleine-König4-8/+9
and restore alphabetic ordering. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: imx: let the machines select SOC_IMX{21,27}Uwe Kleine-König1-2/+9
This prepares multi-SoC kernel support. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: imx: let IMX_HAVE_PLATFORM_IMX_FB select HAVE_FB_IMXUwe Kleine-König1-2/+1
This way FB_IMX can just depend on HAVE_FB_IMX and machines just need to select IMX_HAVE_PLATFORM_IMX_FB without bothering about HAVE_FB_IMX. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: imx: move mx25 support to mach-imxUwe Kleine-König9-16/+1239
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: move registration of gpios to plat-mxc/gpio.cUwe Kleine-König2-126/+0
This finally gets rid of mach-imx/devices.c. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: remove now empty devices.hUwe Kleine-König15-15/+0
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically allocate imx21-hcd devicesUwe Kleine-König3-29/+4
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically allocate imx-keypad devicesUwe Kleine-König7-26/+15
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically allocate fsl-usb2-udc devicesUwe Kleine-König6-35/+10
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically allocate mxc-ehci devicesUwe Kleine-König8-88/+28
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically register mxc-mmc devicesUwe Kleine-König15-72/+39
... plus a trivial simplification of mx21ads_sdhc_init() Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically allocate mxc_pwm devicesUwe Kleine-König2-20/+0
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically register imx-fb devicesUwe Kleine-König11-50/+28
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically allocate imx2-wdt devicesUwe Kleine-König8-24/+14
Currently there is no platform data used in the driver. In case this changes and for consistency NULL is passed unused to the soc specific functions. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically allocate mx2-camera deviceUwe Kleine-König3-33/+4
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically allocate mx1-camera deviceUwe Kleine-König2-29/+0
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically allocate imx_udc deviceUwe Kleine-König2-44/+0
This is only available for mx1 machines with no in-tree user. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: remove unused devicesUwe Kleine-König2-86/+0
all these don't have a driver and are not added in any machine file. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: dynamically allocate mxc_w1 devicesUwe Kleine-König9-20/+16
Currently there is no platform data used in the driver. In case this changes NULL is passed unused to the soc specific functions. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: remove last explicit users of virtual base address definesUwe Kleine-König1-4/+4
This allows changing the mapping without the need to adapt all users. While at it remove some unneeded casts to void __iomem *, this is already taken care for in the IO_ADDRESS macros Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-17ARM: imx: use MXxy_IO_P2V macros to setup static mappingsUwe Kleine-König3-42/+7
This makes less code rely on the virtual constants. To further simplify code and reduce the needed boilerplate when defining the static mappings a new helper macro is defined in mach/hardware.h. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-15ARM i.MX27 eukrea: Fix compilationSascha Hauer1-6/+0
Currently compilation breaks for the eukrea mbimx27 baseboard when CONFIG_SPI_IMX is selected and CONFIG_TOUCHSCREEN_ADS7846 is not selected. Fix this by removing the ifdefs altogether. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Cc: Eric Benard <eric@eukrea.com>
2010-10-30Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds1-0/+38
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (215 commits) ARM: memblock: setup lowmem mappings using memblock ARM: memblock: move meminfo into find_limits directly ARM: memblock: convert free_highpages() to use memblock ARM: move freeing of highmem pages out of mem_init() ARM: memblock: convert memory detail printing to use memblock ARM: memblock: use memblock to free memory into arm_bootmem_init() ARM: memblock: use memblock when initializing memory allocators ARM: ensure membank array is always sorted ARM: 6466/1: implement flush_icache_all for the rest of the CPUs ARM: 6464/2: fix spinlock recursion in adjust_pte() ARM: fix memblock breakage ARM: 6465/1: Fix data abort accessing proc_info from __lookup_processor_type ARM: 6460/1: ixp2000: fix type of ixp2000_timer_interrupt ARM: 6449/1: Fix for compiler warning of uninitialized variable. ARM: 6445/1: fixup TCM memory types ARM: imx: Add wake functionality to GPIO ARM: mx5: Add gpio-keys to mx51 babbage board ARM: imx: Add gpio-keys to plat-mxc mx31_3ds: Fix spi registration mx31_3ds: Fix the logic for detecting the debug board ...
2010-10-28Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King1-0/+38
devel-stable
2010-10-28Merge branch 'next' of ↵Linus Torvalds1-6/+2
git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (48 commits) DMAENGINE: move COH901318 to arch_initcall dma: imx-dma: fix signedness bug dma/timberdale: simplify conditional ste_dma40: remove channel_type ste_dma40: remove enum for endianess ste_dma40: remove TIM_FOR_LINK option ste_dma40: move mode_opt to separate config ste_dma40: move channel mode to a separate field ste_dma40: move priority to separate field ste_dma40: add variable to indicate valid dma_cfg async_tx: make async_tx channel switching opt-in move async raid6 test to lib/Kconfig.debug dmaengine: Add Freescale i.MX1/21/27 DMA driver intel_mid_dma: change the slave interface intel_mid_dma: fix the WARN_ONs intel_mid_dma: Add sg list support to DMA driver intel_mid_dma: Allow DMAC2 to share interrupt intel_mid_dma: Allow IRQ sharing intel_mid_dma: Add runtime PM support DMAENGINE: define a dummy filter function for ste_dma40 ...
2010-10-22MX27 3ds: Add SDHC1 support to mx27 3dsRogerio Pimentel1-0/+38
Add SDHC1 support to MX27 3ds Signed-off-by: Rogerio Pimentel <rpimentel.silva@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-10-20arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre11-24/+0
Since we're now using addruart to establish the debug mapping, we can remove the io_pg_offst and phys_io members of struct machine_desc. The various declarations were removed using the following script: grep -rl MACHINE_START arch/arm | xargs \ sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }' [ Initial patch was from Jeremy Kerr, example script from Russell King ] Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Eric Miao <eric.miao at canonical.com>
2010-10-19Merge branch 'for-rmk' of ↵Russell King2-1/+2
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/mach-at91/include/mach/system.h arch/arm/mach-imx/mach-cpuimx27.c AT91 conflict resolution: Acked-by: Anders Larsen <al@alarsen.net> IMX conflict resolution confirmed by Uwe Kleine-König.
2010-10-19cpuimx27: fix compile when ULPI is selectedEric Bénard1-0/+1
without this patch we get : arch/arm/mach-imx/built-in.o: In function `eukrea_cpuimx27_init': eukrea_mbimx27-baseboard.c:(.init.text+0x44c): undefined reference to `mxc_ulpi_access_ops' Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-10-13Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6Russell King2-1/+2
2010-10-11ARM: imx: dynamically register fec devicesUwe Kleine-König11-43/+12
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-10-08cpuimx27: fix i2c bus selectionEric Bénard1-1/+1
Recent clean of i.MX devices registration changed the i2C bus number selected for our platform (Freescale start peripheral ID at 1, kernel now start it at 0 so i.MX27's i2c 1 is kernel's i2c 0). Without this fix, i2c is unusable on this platform. 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>
2010-10-08cpuimx27: fix compile when ULPI is selectedEric Bénard1-0/+1
without this patch we get : arch/arm/mach-imx/built-in.o: In function `eukrea_cpuimx27_init': eukrea_mbimx27-baseboard.c:(.init.text+0x44c): undefined reference to `mxc_ulpi_access_ops' Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2010-10-06dmaengine: Add Freescale i.MX SDMA supportSascha Hauer1-6/+2
This patch adds support for the Freescale i.MX SDMA engine. The SDMA engine is a scatter/gather DMA engine which is implemented as a seperate coprocessor. SDMA needs its own firmware which is requested using the standard request_firmware mechanism. The firmware has different entry points for each peripheral type, so drivers have to pass the peripheral type to the DMA engine which in turn picks the correct firmware entry point from a table contained in the firmware image itself. The original Freescale code also supports support for transfering data to the internal SRAM which needs different entry points to the firmware. Support for this is currently not implemented. Also, support for the ASRC (asymmetric sample rate converter) is skipped. I took a very simple approach to implement dmaengine support. Only a single descriptor is statically assigned to a each channel. This means that transfers can't be queued up but only a single transfer is in progress. This simplifies implementation a lot and is sufficient for the usual device/memory transfers. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Linus Walleij <linus.ml.walleij@gmail.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>