summaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* ARM: imx: move mx3 support to mach-imxUwe Kleine-König2011-05-1944-507/+559
| | | | | | | | | Fixing a few "please, no space before tabs" and "empty line at end of file" warnings on the way. LAKML-Reference: 1299271882-2130-6-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* MX1: Add ARMadeus Systems APF9328 board supportGwenhael Goavec-Merou2011-05-194-0/+153
| | | | | | | | | | | | | APF9328 is an i.MXL based SOM (System On Module) that can be plugged on several docking/development boards. Here only basic module support is added (Ethernet, Serial, NOR Flash). Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@armadeus.com> Signed-off-by: Eric Jarrige <eric.jarrige@armadeus.org> Signed-off-by: Nicolas Colombain <nicolas.colombain@armadeus.com> Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* mx23: register clocks for mmcPeter Korsgaard2011-05-191-0/+2
| | | | | | | | | | Commit 47babe69 (mxs: dynamically allocate mmc device) added the ssp setup and mmc clocks for mx23/28, but forgot to register the mmc clocks on mx23. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Acked-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* arm: mach-imx/mxs: drop 'default' boardsWolfram Sang2011-05-191-2/+0
| | | | | | | No boards should be compiled in by default. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx: remove some deprecated and unused #definesUwe Kleine-König2011-05-191-7/+0
| | | | | | LAKML-Reference: 1302464943-20721-6-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx3: make ioremap quirk ready for multi-SoC kernelsUwe Kleine-König2011-05-192-10/+17
| | | | | | | | | | | | | | | | | | To be able to compile e.g. i.MX31 and i.MX51 in a single kernel image the ioremap quirk needs a runtime check. While touching this code make the comment more understandable by adding a sentence from the commit log that introduced it (eadefef ([ARM] MX3: Use ioremap wrapper to map SoC devices nonshared)). As mach/io.h now uses cpu_is_ some header reshuffling in mach/hardware.h was necessary. (mach/mx27.h and mach/mx31.h #include <linux/io.h> which #includes <mach/io.h>. So mach/mxc.h which provides the cpu_is_ macros needs to be included before mach/mx27.h and mach/mx31.h.) LAKML-Reference: 1302464943-20721-5-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mxc: don't allow to compile together i.MX51 and i.MX53Uwe Kleine-König2011-05-193-21/+51
| | | | | | | | | The two SoCs have different PHYS_OFFSETs so it's not (yet) possible to compile a single (working) kernel for these. LAKML-Reference: 1302464943-20721-4-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mxc: don't use the symbols in the CPU family choice to select othersUwe Kleine-König2011-05-194-4/+9
| | | | | | | | | | | | | The symbols in this choice should only be used to select between the available machines that can be built into a single kernel. As these sets (will) differ e.g. depending on ARM_PATCH_PHYS_VIRT and AUTO_ZRELADDR letting them select other symbols makes the logic more complex and needs to duplicate some things. So let the machines select the corresponding symbols (indirectly via SOC_XYZ). LAKML-Reference: 1302464943-20721-2-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: remove support for mxc91231Uwe Kleine-König2011-05-1925-2275/+2
| | | | | | | | | | | Since support for mxc91231 was introduced 2009 it only saw patches that were part of (mxc or arm) global cleanups. The only supported machine only had 4 devices (2x UART, sdhc, watchdog). Cc: Dmitriy Taychenachev <dimichxp@gmail.com> LAKML-Reference: 1302211482-17926-1-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* video i.MX: remove mx1 compile time dependenciesSascha Hauer2011-05-191-1/+0
| | | | | | | | | | | remove usage of CONFIG_ARCH_MX1. It's mostly unused anyway, replace it with cpu_is_mx1() where necessary. Also, depend on IMX_HAVE_PLATFORM_IMX_FB instead of the architectures directly. LAKML-Reference: 20110303141244.GQ29521@pengutronix.de Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx51: Remove imx51_add_gpio_keysFabio Estevam2011-05-194-5/+3
| | | | | | | | | | | There is no need for using a MX51-specific version of imx_add_gpio_keys. Remove imx51_add_gpio_keys and use imx_add_gpio_keys instead. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> LAKML-Reference: 1302105926-20574-1-git-send-email-fabio.estevam@freescale.com Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx51: use platform id 2 for imx51-cspiUwe Kleine-König2011-05-191-1/+1
| | | | | | | | | | | | | | | The platform id is used to determine the spi bus number, so it should better be different to the ids used for imx51-ecspi. Otherwise it's not possible to use both devices "imx51-cspi.0" and "imx51-ecspi.0". Alternative approaches are to use dynamic bus numbering as offered by the spi framework or let the machine code set the bus number. The downside of both possibilities is that the bus number isn't fixed for the same busses on different machines using i.MX51. LAKML-Reference: 1302100716-21034-1-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mxs: fix naming of struct holding info for mxs-i2c devicesUwe Kleine-König2011-05-193-5/+7
| | | | | | | | | For consistency mxs has to be repeated, one for the name space and another one for the device name. LAKML-Reference: 1300308028-8922-1-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mxs/i.MX23: make i2c defines consistent and match the reference manualWolfram Sang2011-05-191-1/+1
| | | | | | | | | | | The defines for the i2c related irqs (MX23_INT_I2C_DMA and MX23_INT_I2C_ERROR) already match the reference manual. So make the base address consistent. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> LAKML-Reference: 1298049507-6987-2-git-send-email-w.sang@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx3: dynamically allocate "ipu-core" devicesUwe Kleine-König2011-05-1930-208/+263
| | | | | | | | | | | | | | | | | ... together with the related devices "mx3_camera" and "mx3_sdc_fb". "mx3_camera" doesn't fit the scheme of the other devices that just are allocated and registered in a single function because it needs additional care to get some dmaable memory. So currently imx31_alloc_mx3_camera duplicates most of imx_add_platform_device_dmamask, but I'm not sure it's worth to split the latter to be able to reuse more code. This gets rid of mach-mx3/devices.[ch] and so several files need to be adapted not to #include devices.h anymore. LAKML-Reference: 1299271882-2130-5-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx3/mx31moboard: properly allocate memory for mx3-cameraUwe Kleine-König2011-05-191-16/+17
| | | | | | | | | | | | | | | It's not allowed to create an alias of system RAM for DMA. So the memory used must not be allocated using dma_alloc_coherent but has to be reserved before using memblock routines. There is no need to memzero the buffer because dma_alloc_coherent zeros the memory for us. LAKML-Reference: 1299271882-2130-4-git-send-email-u.kleine-koenig@pengutronix.de Tested-by: Philippe Retornaz <philippe.retornaz@epfl.ch> Acked-by: Philippe Retornaz <philippe.retornaz@epfl.ch> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx3/pcm037: properly allocate memory for mx3-cameraUwe Kleine-König2011-05-191-16/+18
| | | | | | | | | | | | | | | | There is no need to memzero the buffer because dma_alloc_coherent zeros the memory for us. This fixes: BUG: Your driver calls ioremap() on system memory. This leads <4>to architecturally unpredictable behaviour on ARMv6+, and ioremap() <4>will fail in the next kernel release. Please fix your driver. Tested-by: Michael Grzeschik <mgr@pengutronix.de> LAKML-Reference: 1299271882-2130-3-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx3: dynamically allocate "mxc_rtc" devicesUwe Kleine-König2011-05-199-21/+59
| | | | | | LAKML-Reference: 1299271882-2130-2-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5/mx53_loco: Fix build warning related to gpio_keys_button structureFabio Estevam2011-05-191-1/+1
| | | | | | | | | | | | Fix the following warning: CC arch/arm/mach-mx5/board-mx53_loco.o arch/arm/mach-mx5/board-mx53_loco.c:203: warning: initialization discards qualifiers from pointer target type Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> LAKML-Reference: 1301881643-26040-1-git-send-email-festevam@gmail.com Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5/mx53_smd: Add esdhc supportFabio Estevam2011-05-192-0/+29
| | | | | | | | Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> LAKML-Reference: 1301921449-32194-1-git-send-email-fabio.estevam@freescale.com Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx/mx25: add NAND chip select pins to iomuxBaruch Siach2011-05-191-0/+3
| | | | | | | Signed-off-by: Baruch Siach <baruch@tkos.co.il> LAKML-Reference: cae1d71db47204ee2654eca7391cb656ed53566b.1300095569.git.baruch@tkos.co.il Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx: clean up the section marks of extern dataRichard Zhao2011-05-199-97/+93
| | | | | | | Signed-off-by: Richard Zhao <richard.zhao@linaro.org> LAKML-Reference: 1301566583-18947-1-git-send-email-richard.zhao@freescale.com Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mxs/mach-mx2[38]evk: Set the initial value on gpio_request_oneFabio Estevam2011-05-192-3/+3
| | | | | | | | | | | | Current code does not set the GPIO value to zero as mentioned in the comment. Fix it by setting the initial GPIO value to zero. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> LAKML-Reference: 1301427910-31726-1-git-send-email-fabio.estevam@freescale.com [ukleinek: squashed two patches together fixing both boards at once] Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx27: fix gpt4/5 base addressWolfram Sang2011-05-191-2/+2
| | | | | | | | Reported-by: Igor Trevisan <igt1972@gmail.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> LAKML-Reference: 1299786904-5494-1-git-send-email-w.sang@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx: remove #includes already available from devices-common.hUwe Kleine-König2011-05-1932-50/+0
| | | | | | | | | | | | | | | | | Most machine files include "devices-imxXX.h" which in turn includes <mach/devices-common.h>. The latter already includes many headers that the machine files don't need to include again. These were found by: $ grep \#include arch/arm/plat-mxc/include/mach/devices-common.h > tmpfile $ git grep -l 'devices-imx' arch/arm | xargs grep -f tmpfile -F (but I kept linux/init.h, linux/kernel.h and linux/platform_device.h) LAKML-Reference: 1298912674-15153-2-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx: use imx_add_gpio_keys to register "gpio-keys" devicesUwe Kleine-König2011-05-199-80/+27
| | | | | | LAKML-Reference: 1302207841-12450-1-git-send-email-u.kleine-koenig@pengutronix.de Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mach-imx: mx25_3ds: add write-protect and card-detect for SDShawn Guo2011-05-191-1/+11
| | | | | | | | | | Signed-off-by: Shawn Guo <shawn.guo@freescale.com> LAKML-Reference: 1298733544-24659-1-git-send-email-shawn.guo@freescale.com Acked-by: Wolfram Sang <w.sang@pengutronix.de> [ukl: fixup conflict with ff86452 (ARM: mx25_3ds: Add I2C support) and drop #inclusion of <mach/esdhc.h>] Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx5/babbage: Use gpio_request_one in babbage_usbhub_resetFabio Estevam2011-05-191-7/+5
| | | | | | | | | | | | Current code inside babbage_usbhub_reset uses gpio_direction_output with initial value of the GPIO and also sets the GPIO value via gpio_set_value to the same level right after. This is not needed. By using gpio_request_one it is possible to set the direction and initial value in one shot. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> LAKML-Reference: 1300377359-23212-2-git-send-email-fabio.estevam@freescale.com Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mx53: Print silicon revision on bootFabio Estevam2011-05-194-13/+25
| | | | | | | | | | | | | | | | | Having the silicon revision to appear on the boot log is a useful information. MX31, MX35 and MX51 already show the silicon revision on boot. Add support for displaying such information for MX53 as well. Tested on a mx53loco board, where it shows: CPU identified as i.MX53, silicon rev 2.0 Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> LAKML-Reference: 1301068367-18937-1-git-send-email-fabio.estevam@freescale.com Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mxc: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNELDave Martin2011-04-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directives such as .long and .word do not magically cause the assembler location counter to become aligned in gas. As a result, using these directives in code sections can result in misaligned data words when building a Thumb-2 kernel (CONFIG_THUMB2_KERNEL). This is a Bad Thing, since the ABI permits the compiler to assume that fundamental types of word size or above are word- aligned when accessing them from C. If the data is not really word-aligned, this can cause impaired performance and stray alignment faults in some circumstances. In general, the following rules should be applied when using data word declaration directives inside code sections: * .quad and .double: .align 3 * .long, .word, .single, .float: .align (or .align 2) * .short: No explicit alignment required, since Thumb-2 instructions are always 2 or 4 bytes in size. immediately after an instruction. Signed-off-by: Dave Martin <dave.martin@linaro.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> LAKML-Reference: 1289913217-8672-1-git-send-email-dave.martin@linaro.org Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: mxs/clock-mx28: fix up name##_set_rateUwe Kleine-König2011-04-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the lcdif clock get_rate looks as follows: read div from HW_CLKCTRL_DIS_LCDIF.DIV return clk_get_rate(clk->parent) / div with clk->parent being ref_pix_clk on my system. ref_pix_clk's rate depends on HW_CLKCTRL_FRAC1.PIXFRAC. The set_rate function for lcdif does: parent_rate = clk_get_rate(clk->parent); based on that calculate frac and div such that parent_rate * 18 / frac / div is near the requested rate. HW_CLKCTRL_FRAC1.PIXFRAC is updated with frac HW_CLKCTRL_DIS_LCDIF.DIV is updated with div For this calculation to be correct parent_rate needs to be initialized not with the clock rate of lcdif's parent (i.e. ref_pix) but that of its grandparent (i.e. ref_pix' parent == pll0_clk). The obvious downside of this patch is that now set_rate(lcdif) changes its parent's rate, too. Still this is better than a wrong rate. Acked-by: Shawn Guo <shawn.guo@freescale.com> LAKML-Reference: 20110225084950.GA13684@S2101-09.ap.freescale.net Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* ARM: imx: fix usb related build failure for mach-vpr200Uwe Kleine-König2011-04-121-3/+8
| | | | | | | | | | | | | | | | | | | | This was broken by 4bd597b (ARM i.MX ehci: do ehci init in board specific functions) and fixes: CC arch/arm/mach-mx3/mach-vpr200.o arch/arm/mach-mx3/mach-vpr200.c:263: error: unknown field 'flags' specified in initializer arch/arm/mach-mx3/mach-vpr200.c:264: warning: initialization makes pointer from integer without a cast by just applying the change to mach-vpr200.c that the other machine files got by 4bd597b. LAKML-Reference: 1302257029-17397-1-git-send-email-u.kleine-koenig@pengutronix.de Acked-by: Marc Reilly <marc@cpdesign.com.au> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'irq-fixes-for-linus' of ↵Linus Torvalds2011-03-301-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: avr32: Fix missing irq namespace conversion powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip genirq: Remove the now obsolete config options and select statements arm: versatile : Fix typo introduced in irq namespace cleanup sound: Fixup the last user of the old irq functions genirq: Remove obsolete comment genirq: Remove now obsolete set_irq_wake() sh: Fix irq cleanup fallout x86: apb_timer: Fixup genirq fallout genirq: Fix misnamed label in handle_edge_eoi_irq Fix up crazy conflict in arch/powerpc/include/asm/qe_ic.h: - commit eead4d5c63ff ("powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip") made the helper functions use irq_desc_get_handler_data() instead of the legacy (and no longer existing) get_irq_desc_data. - commit d4db35e8dc96 ("powerpc/qe_ic: Fix another breakage from the irq_data conversion") used irq_desc_get_chip_data() instead. According to Thomas, the former is the correct direct conversion, but it does look like both should work (arch/powerpc/sysdev/qe_lib/qe_ic.c seems to initialize both to the same thing), and the chip data in some ways is the more logical. Somebody should really decide on one of the other. This merge picks irq_desc_get_handler_data() as the straightforward pure conversion to new names, as per Thomas.
| * arm: versatile : Fix typo introduced in irq namespace cleanupGrant Likely2011-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6845664(arm: Cleanup the irq namespace) introduces a typo causing a build failure for the versatile platform. [ tglx: Sorry, my bad. Have no idea how I fatfingered that ] Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: linux-arm-kernel@lists.infradead.org LKML-Reference: <20110330060229.27397.7628.stgit@ponder> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
* | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-03-3092-248/+962
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (65 commits) ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support ARM: 6838/1: etm: fix section mismatch warning ARM: 6837/1: remove unused pci_fixup_prpmc1100 ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn == PC Fix the broken build for Marvell Dove platform. ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency ARM: 6834/1: perf: reset counters on all CPUs during initialisation ARM: 6833/1: perf: add required isbs() to ARMv7 backend ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile arm: mach-mx3: pcm043: add write-protect and card-detect for SD1 eukrea_mbimxsd51: add SD Card detect eukrea_mbimxsd25-baseboard: add SD card detect mx3/eukrea_mbimxsd-baseboard: add SD card detect support mx3/eukrea_mbimxsd-baseboard: fix gpio request ARM: mxs/mx28evk: add mmc device ARM: mxs/mx23evk: add mmc device ARM: mxs: dynamically allocate mmc device ARM: mx51_efika: update platform data for new mfd changes mx2/iomux: Set direction for CSPI2 pins ...
| * Merge branches 'fixes' and 'devel-stable' into for-linusRussell King2011-03-2979-175/+880
| |\
| | * Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2011-03-2837-34/+600
| | |\ | | | | | | | | | | | | devel-stable
| | | * arm: mach-mx3: pcm043: add write-protect and card-detect for SD1Wolfram Sang2011-03-251-1/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * eukrea_mbimxsd51: add SD Card detectEric Bénard2011-03-251-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * eukrea_mbimxsd25-baseboard: add SD card detectEric Bénard2011-03-251-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * mx3/eukrea_mbimxsd-baseboard: add SD card detect supportEric Bénard2011-03-251-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * mx3/eukrea_mbimxsd-baseboard: fix gpio requestEric Bénard2011-03-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without this patch, we get : ------------[ cut here ]------------ WARNING: at drivers/gpio/gpiolib.c:99 gpio_ensure_requested+0x4c/0x104() autorequest GPIO-4 .../... [<c01bcfb0>] (platform_lcd_set_power+0x34/0x40) from [<c033954c>] (platform_lcd_probe+0xb8/0xd8) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: mxs/mx28evk: add mmc deviceShawn Guo2011-03-252-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Tested-by: Marc Kleine-Budde <mkl@pengutronix.de> [sha: updated to Uwes v4 version] Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: mxs/mx23evk: add mmc deviceShawn Guo2011-03-252-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> [sha: updated to Uwes v4 version] Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: mxs: dynamically allocate mmc deviceShawn Guo2011-03-258-0/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Shawn Guo <shawn.guo@freescale.com> [ukleinek: fix naming to include complete device name in functions] Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: mx51_efika: update platform data for new mfd changesAndres Salomon2011-03-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this relies on stuff currently in mfd's next tree, but this is also a newer driver. I'm not sure which tree it should go through, as it's a problem that shows up in next. From: Andres Salomon <dilinger@queued.net> MFD changes in c738892f cause the mc13xxx_platform_data struct to change. This changes one more (new) user of it, fixing a build error. Signed-off-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * mx2/iomux: Set direction for CSPI2 pinsJulien Boibessot2011-03-251-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: mx51: Implement code to allow mx51 to enter WFIDinh Nguyen2011-03-234-2/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement code for MX51 that allows the SoC to enter WFI when arch_idle is called. This patch is also necessary for correctly suspending the system. Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: mx51: Add entry for gpc_dvfs_clkDinh Nguyen2011-03-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For MX51 SRPG, we need to turn on the GPC clock in order to set the SRPG registers. Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| | | * ARM: mx50: Add support to get the silicon revisionDinh Nguyen2011-03-232-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For MX50, the HW_ADADIG_DIGPROG register in the ANATOP module will have the correct silicon revision: Major Minor Description 0x50 0x0 TO1.0 0x50 0x1 TO1.1 Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
OpenPOWER on IntegriCloud