summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2011-05-20Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King
devel-stable
2011-05-19ARM: imx: move mx3 support to mach-imxUwe Kleine-König
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>
2011-05-19MX1: Add ARMadeus Systems APF9328 board supportGwenhael Goavec-Merou
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>
2011-05-19mx23: register clocks for mmcPeter Korsgaard
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>
2011-05-19arm: mach-imx/mxs: drop 'default' boardsWolfram Sang
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>
2011-05-19ARM: imx: remove some deprecated and unused #definesUwe Kleine-König
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>
2011-05-19ARM: mx3: make ioremap quirk ready for multi-SoC kernelsUwe Kleine-König
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>
2011-05-19ARM: mxc: don't allow to compile together i.MX51 and i.MX53Uwe Kleine-König
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>
2011-05-19ARM: mxc: don't use the symbols in the CPU family choice to select othersUwe Kleine-König
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>
2011-05-19ARM: remove support for mxc91231Uwe Kleine-König
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>
2011-05-19video i.MX: remove mx1 compile time dependenciesSascha Hauer
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>
2011-05-19ARM: mx51: Remove imx51_add_gpio_keysFabio Estevam
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>
2011-05-19ARM: imx51: use platform id 2 for imx51-cspiUwe Kleine-König
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>
2011-05-19ARM: mxs: fix naming of struct holding info for mxs-i2c devicesUwe Kleine-König
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>
2011-05-19ARM: mxs/i.MX23: make i2c defines consistent and match the reference manualWolfram Sang
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>
2011-05-19ARM: mx3: dynamically allocate "ipu-core" devicesUwe Kleine-König
... 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>
2011-05-19ARM: mx3/mx31moboard: properly allocate memory for mx3-cameraUwe Kleine-König
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>
2011-05-19ARM: mx3/pcm037: properly allocate memory for mx3-cameraUwe Kleine-König
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>
2011-05-19ARM: mx3: dynamically allocate "mxc_rtc" devicesUwe Kleine-König
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>
2011-05-19ARM: mx5/mx53_loco: Fix build warning related to gpio_keys_button structureFabio Estevam
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>
2011-05-19ARM: mx5/mx53_smd: Add esdhc supportFabio Estevam
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>
2011-05-19ARM: imx/mx25: add NAND chip select pins to iomuxBaruch Siach
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>
2011-05-19ARM: imx: clean up the section marks of extern dataRichard Zhao
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>
2011-05-19ARM: mxs/mach-mx2[38]evk: Set the initial value on gpio_request_oneFabio Estevam
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>
2011-05-19ARM: mx27: fix gpt4/5 base addressWolfram Sang
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>
2011-05-19ARM: imx: remove #includes already available from devices-common.hUwe Kleine-König
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>
2011-05-19ARM: imx: use imx_add_gpio_keys to register "gpio-keys" devicesUwe Kleine-König
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>
2011-05-19ARM: mach-imx: mx25_3ds: add write-protect and card-detect for SDShawn Guo
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>
2011-05-19ARM: mx5/babbage: Use gpio_request_one in babbage_usbhub_resetFabio Estevam
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>
2011-05-19ARM: mx53: Print silicon revision on bootFabio Estevam
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>
2011-05-16Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stableRussell King
2011-05-16ARM: dove: Consolidate mpp code with platform mpp.Andrew Lunn
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion5x: Refactor mpp code to use common orion platform mpp.Andrew Lunn
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Refactor the MPP code common in the orion platformAndrew Lunn
mv78xx0 and kirkwood use identical mpp code. It should also be possible to rewrite the orion5x mpp to use this platform code. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Consolidate setup of the crypto engine.Andrew Lunn
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Consolidate SATA platform setup.Andrew Lunn
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Consolidate USB platform setup code.Andrew Lunn
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Consolidate the XOR platform setup code.Andrew Lunn
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Consolidate the platform data setup for the watchdog.Andrew Lunn
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Consolidate SPI initialization.Andrew Lunn
This change removes the interrupt resource. The driver does not use it. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Consolidate I2C initialization.Andrew Lunn
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Consolidate ethernet platform dataAndrew Lunn
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: kirkwood: Add support for RTC interrupts which allows RTC alarms.Andrew Lunn
Tested using the test program in Documentation/rtc.txt Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Consolidate the creation of the RTC platform data.Andrew Lunn
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Consolidate the creation of the uart platform data.Andrew Lunn
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16ARM: orion: Rename some constants to macros to make code more identicalAndrew Lunn
Changing eg 0xffffffff to DMA_BIT_MASK(32) etc allows easier side by side comparision of identical code which can be consolidated. Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16arm: orion: Use generic irq chipThomas Gleixner
The core interrupt chip is a straight forward conversion. The gpio chip is implemented with two instances of the irq_chip_type which can be switched with the irq_set_type function. That allows us to use the generic callbacks and avoids the conditionals in them. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
2011-05-16Merge branch 'devel-genirq' of ↵Russell King
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel-stable
2011-05-16arm: omap2/3: Use generic irq chipTony Lindgren
Use generic irq chip for omap2 & 3. Note that this patch also leaves out the spurious IRQ warning for omap3. This warning should no longer be needed as the interrupt handlers for various devices have implemented the necessayr read-back of the posted write. Signed-off-by: Tony Lindgren <tony@atomide.com>
2011-05-11Merge branch 'samsung-irq' of ↵Russell King
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc-2.6 into devel-stable
generated by cgit v0.10.2 at 2024-11-01 19:19:28 (GMT)