summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-03-20Merge branch 'master' of git://git.marvell.com/orion into develRussell King55-263/+1721
Conflicts: arch/arm/mach-mx1/devices.c
2009-03-19[ARM] pass reboot command line to arch_reset()Russell King50-65/+65
OMAP wishes to pass state to the boot loader upon reboot in order to instruct it whether to wait for USB-based reflashing or not. There is already a facility to do this via the reboot() syscall, except we ignore the string passed to machine_restart(). This patch fixes things to pass this string to arch_reset(). This means that we keep the reboot mode limited to telling the kernel _how_ to perform the reboot which should be independent of what we request the boot loader to do. Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-03-19Merge branch 'omap-clks3' into develRussell King60-2598/+3143
Conflicts: arch/arm/mach-omap2/clock.c
2009-03-18Merge branch 'for-russell' of ↵Russell King6-47/+82
git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
2009-03-17IXP4xx: PCI ixp4xx_scan_bus() is __devinit.Krzysztof Hałasa1-1/+1
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
2009-03-17IXP4xx: cpu_is_ixp4*() now recognizes all IXP4xx processors.Krzysztof Hałasa2-25/+52
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
2009-03-17IXP4xx: add Ethernet and NPE support for IXP43x CPU.Krzysztof Hałasa2-10/+16
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
2009-03-17IXP4xx: workaround for PCI prefetch problems near 64 MB boundary.Krzysztof Hałasa2-11/+13
Map unused registers at the end of DMA region at 64 MB to allow PCI masters to cross the boundary when prefetching data from SDRAM. Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
2009-03-17Merge branch 'imx-fb-fix' of ↵Russell King4-1174/+1174
git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into devel Conflicts: drivers/video/mx3fb.c
2009-03-16[ARM] mv78xx0: Add Marvell RD-78x00-mASA Reference Design supportLennert Buytenhek4-0/+96
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Acked-by: Stanislav Samsonov <samsonov@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-03-16[ARM] Kirkwood: update defconfigNicolas Pitre1-62/+163
Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-03-16[ARM] Kirkwood: SheevaPlug LED supportNicolas Pitre1-0/+25
Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-03-16[ARM] Kirkwood: SheevaPlug USB Power Enable setupNicolas Pitre1-0/+13
Ideally, the default should be set to 0 and let the EHCI driver turn it on as needed. This makes USB usable in the mean time. Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-03-16[ARM] Kirkwood: Marvell SheevaPlug supportShadi Ammouri3-0/+105
Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-03-16Merge commit '305b07680f' into orion/masterNicolas Pitre471-2823/+15004
2009-03-15[ARM] 5427/1: h3600: ipaq_model_ops final cleanupDmitry Artamonow2-23/+5
Since now ipaq_model_ops used only for accessing h3600 EGPIOs, drop it completely and use assign_h3600_egpio() directly. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-03-15[ARM] 5426/1: h3600: remove clr_h3600_egpio/set_h3600_egpio helpersDmitry Artamonow3-31/+11
Replace all occurences with assign_h3600_egpio. Also simplify code a bit by replacing couple of if-else statements with one-line equivalents. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-03-15[ARM] 5425/1: h3600: first stage of ipaq_model_ops cleanupDmitry Artamonow2-84/+0
Remove unused fields and associated funtions-accesors. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-03-15[ARM] 5424/1: h3600: clean up mtd partitions tableDmitry Artamonow1-33/+1
Right now iPaq h3600's default MTD partitions table is a mess. It has two #ifdefs with #else, giving total 3 variants, depending on your kernel config. Replace all this with simple two-partitions scheme (bootloader + rootfs), that used by both shipped WindowsCE and most of the linux distributions (Familiar, Angstrom) Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-03-15[ARM] 5423/1: SA1100: remove unused H3600_SLEEVE Kconfig optionDmitry Artamonow2-10/+0
There's no actual code for iPAQ sleeves support in kernel that depends on this config option. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-03-15Merge branch 'devel' of ↵Russell King8-34/+432
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
2009-03-14Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into develRussell King1121-21775/+41535
Conflicts: arch/arm/mach-at91/gpio.c
2009-03-13qong: basic support for Dave/DENX QongEVB-LITE boardIlya Yanok5-0/+346
This patch adds basic support for Dave/DENX QongEVB-LITE i.MX31-based board. It includes support for clocks initialization, UART1, NOR-flash, FPGA-attached NAND flash and DNET ethernet controller (inside FPGA). Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13pcm970 baseboard: Add SDHC supportSascha Hauer1-0/+63
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13pcm037: Add sdhc supportSascha Hauer1-0/+28
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13MX31: Add sdhc resources/platform devicesSascha Hauer2-0/+42
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13MX2: Add SDHC platform_devices and resourcesSascha Hauer2-0/+68
Signed-of-by: Julien Boibessot <julien.boibessot@armadeus.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13MX2/MX3 SDHC driver: rename platform driverSascha Hauer1-1/+1
Rename driver from imx-mmc to mxc-mmc to avoid conflicts with the mx1 mmc driver. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13mxcmmc: Do not pass clock name, we have only one clock for this deviceSascha Hauer1-1/+1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13Use __force in IO_ADDRESS macro to silence sparseSascha Hauer1-1/+1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13MX31 clkdev supportSascha Hauer5-884/+206
This patch adds clkdev support for i.MX31. This is done in a similar way done previously for i.MX27 Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] pcm038: Fix pins for UART3Sascha Hauer1-2/+2
The UART3 had a copy-paste bug. instead of claiming rxd, txd, rts and cts pins, cts and rts were claimed twice Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] MX31: Move static virtual mappings of AIPS1/2 to common fileSascha Hauer6-101/+13
On MX31 we can't do much without mapping the AIPS1/2 register space. Move these mappings from individual boards to plat-mxc/mm.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] MX31/MX35: Add l2x0 cache supportSascha Hauer2-2/+28
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] MX35 devices supportSascha Hauer2-2/+42
The i.MX35 basically features the same peripherals as the i.MX31 with some differences: - The i.MX35 has a FEC ethernet controller - The NAND controller base addresses are different - The i.MX35 has only 3 UARTs Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] MX35: add clock supportSascha Hauer3-0/+489
This patch adds clock support for i.MX35 SoCs. We do not support setting of clock rates yet, but most interesting clock rates should be reported. I couldn't test all clock rates and the datasheet contains some obvious bugs, so expect some bugs in this code. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] add i.MX35 build supportSascha Hauer2-2/+14
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] MXC: add cpu_is_ macrosSascha Hauer7-16/+80
We had hardcoded cpu_is_ macros for mxc architectures till now. As we want to run the same kernel on i.MX31 and i.MX35 this patch adds cpu_is_ macros which expand to 0 or 1 if only one architecture is compiled in and only check for the cpu type if more than one architecture is compiled in. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] MX35: Add register definitions for the i.MX35Sascha Hauer4-323/+329
This patch moves the stuff common to i.MX31 and i.MX35 to mx3x.h and the specifics to mx31.h/mx35.h. We can build a kernel which runs on i.MX31 and i.MX35, so always include mx31.h and mx35.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13imxfb: Fix margin settingsSascha Hauer1-3/+3
The var->hsync_len, var->right_margin and var->left_margin fields should contain the real values, not the hardware dependent values. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13imxfb: add mx27 supportSascha Hauer1-4/+23
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13mx31: add dma and fb devicesValentin Longchamp3-1/+50
This adds the dma (ipu_dma) and fb devices for the mx31 for which drivers now are available. v2: merge the ipu and fb device in the same patch as suggested by Sascha Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13mx31moboard: initial support for various baseboardsValentin Longchamp5-18/+154
This enables our mx31moboard to be used on the different baseboards that we are developping according to the application needs. There are not many differences between the boards for now, but when other peripherals are available for mx31 the differences are going to grow. v2: takes Sascha's comments into account Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13mx31: add pin definition for LCDValentin Longchamp1-0/+27
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13mxc: first set GPIO level, then switch direction to outputGuennadi Liakhovetski1-1/+1
Make sure not to create spurious pulses on GPIOs, when configuring them as output: first set required level, then switch direction. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13arm/imx: Kconfig beautificationHolger Schurig4-14/+12
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] mxc: add missing includeSascha Hauer2-0/+4
include devices.h from devices.c to avoid inconsistencies and to fix sparse warnings Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] Add Synertronixx scb9328 board supportSascha Hauer3-0/+165
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] PCM037 Board: Add I2C supportSascha Hauer1-0/+51
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2009-03-13[ARM] iommux mx3: Add pin definitions for I2CSascha Hauer1-0/+2
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
generated by cgit v1.2.3 (git 2.39.0) at 2025-01-21 07:18:30 +0300