summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
Commit message (Collapse)AuthorAgeFilesLines
* ARM: mach-imx/mach-mx25_3ds: Fix section typeFabio Estevam2011-01-241-1/+1
| | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-152-2/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (161 commits) ARM: pxa: fix building issue of missing physmap.h ARM: mmp: PXA910 drive strength FAST using wrong value ARM: mmp: MMP2 drive strength FAST using wrong value ARM: pxa: fix recursive calls in pxa_low_gpio_chip AT91: Support for gsia18s board AT91: Acme Systems FOX Board G20 board files AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h ARM: pxa: fix suspend/resume array index miscalculation ARM: pxa: use cpu_has_ipr() consistently in irq.c ARM: pxa: remove unused variable in clock-pxa3xx.c ARM: pxa: fix warning in zeus.c ARM: sa1111: fix typo in sa1111_retrigger_lowirq() ARM mxs: clkdev related compile fixes ARM i.MX mx31_3ds: Fix MC13783 regulator names ARM: plat-stmp3xxx: irq_data conversion. ARM: plat-spear: irq_data conversion. ARM: plat-orion: irq_data conversion. ARM: plat-omap: irq_data conversion. ARM: plat-nomadik: irq_data conversion. ARM: plat-mxc: irq_data conversion. ... Fix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert Buytenhek's irq_data conversion clashing with some omap irq updates)
| * Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2011-01-142-2/+9
| |\ | | | | | | | | | devel-stable
| | * ARM: imx/mx27_3ds: Add debug board supportFabio Estevam2011-01-112-0/+7
| | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | * ARM i.MX27 3ds: Fix mc13783 regulator namesSascha Hauer2011-01-071-2/+2
| | | | | | | | | | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | Merge branch 'for-linus' of ↵Linus Torvalds2011-01-131-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (45 commits) regulator: missing index in PTR_ERR() in isl6271a_probe() regulator: Assign return value of mc13xxx_reg_rmw to ret regulator: Add initial per-regulator debugfs support regulator: Make regulator_has_full_constraints a bool regulator: Clean up logging a bit regulator: Optimise out noop voltage changes regulator: Add API to re-apply voltage to hardware regulator: Staticise non-exported functions in mc13892 regulator: Only notify voltage changes when they succeed regulator: Provide a selector based set_voltage_sel() operation regulator: Factor out voltage set operation into a separate function regulator: Convert WM8994 to use get_voltage_sel() regulator: Convert WM835x to use get_voltage_sel() regulator: Allow modular build of mc13xxx-core regulator: support PMIC mc13892 make mc13783 regulator code generic Change the register name definitions for mc13783 mach-ux500: Updated and connected ab8500 regulator board configuration regulators: Removed macros for initialization of ab8500 regulators regulators: Added verbose debug messages to ab8500 regulators ...
| * | | Change the register name definitions for mc13783Yong Shen2011-01-121-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make mc13783 and mc13892 share code, the register names should be changed to fit the new macro definitions in the comming patch. Signed-off-by: Yong Shen <yong.shen@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
* | | Merge branch 'for-next' of ↵Linus Torvalds2011-01-131-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
| * | Merge branch 'master' into for-nextJiri Kosina2010-12-221-6/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.
| * | | suspend: constify platform_suspend_opsLionel Debroux2010-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While at it, fix two checkpatch errors. Several non-const struct instances constified by this patch were added after the introduction of platform_suspend_ops in checkpatch.pl's list of "should be const" structs (79404849e90a41ea2109bd0e2f7c7164b0c4ce73). Patch against mainline. Inspired by hunks of the grsecurity patch, updated for newer kernels. Signed-off-by: Lionel Debroux <lionel_debroux@yahoo.fr> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | | | Merge branch 'devel-stable' into develRussell King2011-01-0634-767/+1610
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h
| * | | ARM: imx/mx27_3ds: Add PMIC supportFabio Estevam2011-01-032-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>
| * | | ARM: imx/mx25_3ds: Add USB supportFabio Estevam2011-01-032-1/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: imx/mx27_3ds: Add USB OTG supportFabio Estevam2011-01-032-0/+74
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | ARM: imx/mx27_3ds: Add watchdog supportFabio Estevam2010-12-142-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | watchdog: imx: use clk_get to acquire the watchdog clockFabio Estevam2010-12-143-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>
| * | | Merge commit 'v2.6.37-rc4' into imx-for-2.6.38Sascha Hauer2010-12-062-7/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Done to resolve merge conflict: Conflicts: arch/arm/mach-mx25/devices-imx25.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | arm: dma: check clk_get() resultVasiliy Kulikov2010-12-031-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>
| * | | ARM: imx: Get the silicon version from the IIM moduleDinh Nguyen2010-11-282-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>
| * | | ARM i.MX27 pm: return gracefully on different socsSascha Hauer2010-11-241-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>
| * | | ARM i.MX DMA: return gracefully on different socsSascha Hauer2010-11-241-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>
| * | | ARM i.MX irq: Compile avic irq code only on SoCs that need itSascha Hauer2010-11-241-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>
| * | | ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookieLothar Waßmann2010-11-243-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>
| * | | Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Sascha Hauer2010-11-2429-752/+1408
| |\ \ \ | | |_|/ | |/| | | | | | into imx-for-2.6.38
| | * | ARM: imx: fix name for functions adding sdhci-esdhc-imx devicesUwe Kleine-König2010-11-194-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | and restore alphabetic ordering. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: let the machines select SOC_IMX{21,27}Uwe Kleine-König2010-11-191-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | This prepares multi-SoC kernel support. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: let IMX_HAVE_PLATFORM_IMX_FB select HAVE_FB_IMXUwe Kleine-König2010-11-191-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>
| | * | ARM: imx: move mx25 support to mach-imxUwe Kleine-König2010-11-199-16/+1239
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: move registration of gpios to plat-mxc/gpio.cUwe Kleine-König2010-11-172-126/+0
| | | | | | | | | | | | | | | | | | | | | | | | This finally gets rid of mach-imx/devices.c. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: remove now empty devices.hUwe Kleine-König2010-11-1715-15/+0
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: dynamically allocate imx21-hcd devicesUwe Kleine-König2010-11-173-29/+4
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: dynamically allocate imx-keypad devicesUwe Kleine-König2010-11-177-26/+15
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: dynamically allocate fsl-usb2-udc devicesUwe Kleine-König2010-11-176-35/+10
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: dynamically allocate mxc-ehci devicesUwe Kleine-König2010-11-178-88/+28
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: dynamically register mxc-mmc devicesUwe Kleine-König2010-11-1715-72/+39
| | | | | | | | | | | | | | | | | | | | | | | | ... plus a trivial simplification of mx21ads_sdhc_init() Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: dynamically allocate mxc_pwm devicesUwe Kleine-König2010-11-172-20/+0
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: dynamically register imx-fb devicesUwe Kleine-König2010-11-1711-50/+28
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: dynamically allocate imx2-wdt devicesUwe Kleine-König2010-11-178-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>
| | * | ARM: imx: dynamically allocate mx2-camera deviceUwe Kleine-König2010-11-173-33/+4
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: dynamically allocate mx1-camera deviceUwe Kleine-König2010-11-172-29/+0
| | | | | | | | | | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: imx: dynamically allocate imx_udc deviceUwe Kleine-König2010-11-172-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>
| | * | ARM: imx: remove unused devicesUwe Kleine-König2010-11-172-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>
| | * | ARM: imx: dynamically allocate mxc_w1 devicesUwe Kleine-König2010-11-179-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>
| | * | ARM: imx: remove last explicit users of virtual base address definesUwe Kleine-König2010-11-171-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>
| | * | ARM: imx: use MXxy_IO_P2V macros to setup static mappingsUwe Kleine-König2010-11-173-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>
* | | | Merge branch 'smp' into miscRussell King2011-01-061-6/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c
| * | | ARM i.MX27 eukrea: Fix compilationSascha Hauer2010-11-151-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>
* / / ARM: 6483/1: arm & sh: factorised duplicated clkdev.cJean-Christop PLAGNIOL-VILLARD2010-11-263-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>
* | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-10-301-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 ...
| * Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2010-10-281-0/+38
| |\ | | | | | | | | | devel-stable
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 14:17:45 +0000