summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2009-03-25Merge branch 'highmem' into develRussell King22-79/+557
2009-03-25Merge branch 'devel' of ↵root91-677/+7585
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
2009-03-23MAINTAINERS: update pxa910 maintainersEric Miao1-0/+7
Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23MAINTAINERS: update pxa168 maintainersEric Miao1-0/+9
Signed-off-by: Eric Miao <eric.miao@marvell.com> Acked-by: Jason Chagas <jason.chagas@marvell.com>
2009-03-23[ARM] pxa: add defconfig for pxa910-based platformsEric Miao1-0/+891
Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add defconfig for pxa168-based platformsEric Miao1-0/+891
Instead of having various pieces of defconfig files for different platforms, let's group them into a single one. Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add base support for pxa910-based TTC_DKBEric Miao3-0/+55
Signed-off-by: Bin Yang <bin.yang@marvell.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add base support for pxa910-based TavorEVBEric Miao3-0/+117
Signed-off-by: Bin Yang <bin.yang@marvell.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add base support for Marvell PXA910Eric Miao12-3/+485
Signed-off-by: Bin Yang <bin.yang@marvell.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa/aspenite: add support for debug ethernetEric Miao2-0/+64
Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa/aspenite: add support for console uartEric Miao1-0/+12
Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: allow reuse of serial driver for pxa168Eric Miao1-1/+1
Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add MFP support for pxa168Eric Miao3-0/+310
Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add GPIO support for pxa168Eric Miao3-0/+57
Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add iWMMXt support for pxa168Eric Miao2-2/+3
Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add base support for Marvell's PXA168 processor lineEric Miao40-2/+1669
"""The Marvell® PXA168 processor is the first in a family of application processors targeted at mass market opportunities in computing and consumer devices. It balances high computing and multimedia performance with low power consumption to support extended battery life, and includes a wealth of integrated peripherals to reduce overall BOM cost .... """ See http://www.marvell.com/featured/pxa168.jsp for more information. 1. Marvell Mohawk core is a hybrid of xscale3 and its own ARM core, there are many enhancements like instructions for flushing the whole D-cache, and so on 2. Clock reuses Russell's common clkdev, and added the basic support for UART1/2. 3. Devices are a bit different from the 'mach-pxa' way, the platform devices are now dynamically allocated only when necessary (i.e. when pxa_register_device() is called). Description for each device are stored in an array of 'struct pxa_device_desc'. Now that: a. this array of device description is marked with __initdata and can be freed up system is fully up b. which means board code has to add all needed devices early in his initializing function c. platform specific data can now be marked as __initdata since they are allocated and copied by platform_device_add_data() 4. only the basic UART1/2/3 are added, more devices will come later. Signed-off-by: Jason Chagas <chagas@marvell.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: move common MFP handling code into plat-pxaEric Miao14-317/+680
Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: move common GPIO handling code into plat-pxaEric Miao5-61/+66
1. add common GPIO handling code into [arch/arm/plat-pxa] 2. common code in <mach/gpio.h> moved into <plat/gpio.h>, new processors should implement its own <mach/gpio.h>, provide the following required definitions and '#include <plat/gpio.h>' in the end: - GPIO_REGS_VIRT for mapped virtual address of the GPIO registers' physical I/O memory - macros of GPLR(), GPSR(), GPDR() for constant optimization for functions gpio_{set,get}_value() (so that bit-bang code can still have tolerable performance) - NR_BUILTIN_GPIO for the number of onchip GPIO - definitions of __gpio_is_inverted() and __gpio_is_occupied(), they can be either macros or inlined functions Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: introduce plat-pxa for PXA common code and add DMA supportEric Miao8-86/+105
1. introduce folder of 'arch/arm/plat-pxa' for common code across different PXA processor families 2. initially moved DMA code into plat-pxa 3. common code in <mach/dma.h> moved into <plat/dma.h>, new processors should implement its own <mach/dma.h>, provide the following required definitions and '#include <plat/dma.h>' in the end: - DMAC_REGS_VIRT for mapped virtual address of the DMA registers' physical I/O memory Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: AC97 pin functions for Colibri PXA310/320Daniel Mack2-0/+44
Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Matthias Meier <matthias.j.meier@gmx.net> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: Add Colibri LCD functionsDaniel Mack4-0/+131
This adds LCD functions for Colibri PXA300 and Colibri PXA320 and configures a LQ043T3DX02 panel. Original-code-by: Matthias Meier <matthias.j.meier@gmx.net> Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: Colibri PXA320 module basicsDaniel Mack3-0/+134
This adds basic support for Colibri PXA320 modules. The file colibri-320.c only contains settings specific to this module, such as the Ethernet interface. Cc: Matthias Meier <matthias.j.meier@gmx.net> Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: Refactor Colibri board support codeDaniel Mack5-94/+119
- Move common function for all Colibri PXA3xx boards to the newly added colibri-pxa3xx.c - Drop some unnecessary defines from colibri.h - Make Kconfig reflect the fact that code for colibri 300 module does also work for the 310 model - Give up on the huge pin config table which was messed up with lots of #ifdefs and switch over to locally defined tables for configured functions Cc: Matthias Meier <matthias.j.meier@gmx.net> Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: Fix Colibri AX88796 configurationDaniel Mack1-10/+2
Broaden the AX88796 register mask to allow access to the reset register. Remove unnecessary value definitions and the second resource block. Diagnosed-by: Matthias Meier <matthias.j.meier@gmx.net> Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add colibri PXA300 defconfigDaniel Mack1-0/+1156
Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: rename and update Colibri PXA270 defconfigDaniel Mack1-169/+425
Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add USB support for Colibri PXA300Daniel Mack1-0/+21
This adds support for USB OHCI for Toradex' Colibri PXA300 modules as connected on the evaluation board. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add MMC support for Colibri PXA300Daniel Mack1-0/+58
Added MMC support for Toradex' Colibri PXA300 module. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: add basic support for Colibri PXA300 moduleDaniel Mack4-0/+122
This patch add basic support for Toradex' Colibri PXA300 module. Ethernet is enabled conditionally, depdending on CONFIG_AX88796. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23[ARM] pxa: rename colibri.c to colibri-pxa270.cDaniel Mack4-34/+37
Namespace cleanup: rename colibri.c to colibri-pxa270.c and change some names in colibri.h. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-23Merge branch 'fix' of ↵Eric Miao9-7/+23
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git into devel
2009-03-23[ARM] pxa: add pxa320 missing pin function for CS2 on GPIO3Daniel Mack1-0/+1
Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
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-19[ARM] pxa: fix overlay being un-necessarily initialized on pxa25xEric Miao1-0/+14
pxa25x doesn't support overlay in its LCD controller, this patch adds pxafb_overlay_supported() functions to check the initialization is necessary. Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-19[ARM] pxa: make second argument of clk_add_alias a name instead of the deviceDmitry Eremin-Solenikov6-7/+7
clk_add_alias is commonly called for platform devices that are not yet registered in the device tree. Thus the clock alias is associated with NULL device name. Fix this by passing the device name instead of just device pointer. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
2009-03-19[ARM] pxa: add missing pin function for CS2 on GPIO1Daniel Mack1-0/+1
Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
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