Commits · 25cf0398bdf365d027e171116aa4a281e9cd3c1c · Kirill Smelkov / linux

22 Dec, 2010 1 commit

Russell King authored Dec 22, 2010

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

25cf0398

20 Dec, 2010 16 commits

ARM: pxa: Add Balloon3 NAND ready check · 59bdd133

Marek Vasut authored Oct 19, 2010

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

59bdd133

ARM: pxa: Update Balloon3 for new FPGA firmware · 1b9169d8

Marek Vasut authored Oct 19, 2010

The new FPGA firmware in Balloon3 uses different methods to control it's bus
control lines. In the new version, there are separate registers to set/clear
bus control lines. This patch updates affected places.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

1b9169d8

ARM: pxa: Fix number of IRQs on Balloon3 · e60f137b

Marek Vasut authored Oct 19, 2010

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

e60f137b

ARM: pxa/colibri: setup pins for USB host port 3 · 3534cccd

Bjorn Forsman authored Nov 03, 2010

Tested on a Colibri Evaluation Board Rev.2.1 with a Colibri PXA310 module.
Signed-off-by: Bjorn Forsman <bjorn.forsman@gmail.com>
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>

3534cccd

ARM: mmp: refactored 5V regulator support using fixed-regulator · e97d0fac

Mark F. Brown authored Dec 13, 2010

Signed-off-by: Mark F. Brown <mark.brown314@gmail.com>
Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

e97d0fac

ARM: mmp: correct the naming of GPIOxx_GPIO definitions · a8fb0b55
Eric Miao authored Dec 18, 2010
```
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
```
a8fb0b55

ARM: pxa: Add gpio-leds and vibrator support to PalmTC · 5fe2acce

Marek Vasut authored Aug 09, 2010

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

5fe2acce

ARM: pxa: Modularize Palm Tungsten|C · 4c6a832d

Marek Vasut authored Aug 09, 2010

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

4c6a832d

ARM: pxa: Colibri PXA320 PCMCIA driver · fd62999b

Marek Vasut authored Aug 11, 2010

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

fd62999b

ARM: pxa: add clock for static memory controller · c085052b
Eric Miao authored Nov 29, 2010
```
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
```
c085052b

ARM: pxa: Rename Colibri evalboard · a3172e54

Marek Vasut authored Aug 12, 2010

Rename colibri-pxa270-evalboard to colibri-evalboard as this board is used with
all Colibri modules.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

a3172e54

ARM: pxa: Add M41T00 RTC support into Colibri evalboard · 072e1ae7

Marek Vasut authored Aug 12, 2010

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

072e1ae7

ARM: pxa: Push Colibri evalboard MFP into module files · 9b6956f4

Marek Vasut authored Aug 12, 2010

This change -- pushing the MFP configuration back into Module files -- is
necessary because some evalboards can be used with multiple modules, where MFP
differs from module to module. Therefore MFP isn't board-specific, but
module-specific and the module should preconfigure itself for the board.

(And there is also the C preprocesor limitation and conflicting #define-s)
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

9b6956f4

ARM: pxa: Toradex Colibri PXA270 CF support · 960c0aca

Marek Vasut authored Aug 11, 2010

This driver also contains structures to eventually support PXA320. This is
planned to be added in a later patch.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

960c0aca

ARM: pxa: Add pxa320 PCMCIA check · a4257af5

Marek Vasut authored Nov 03, 2010

On PXA320, there's only one PCMCIA slot available. Check for cases where the
user would want to register multiple. Also, rework failpath.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

a4257af5

ARM: pxa: add iwmmx support for PJ4 · ef6c8445

Haojian Zhuang authored Nov 24, 2010

iwmmxt is used in XScale, XScale3, Mohawk and PJ4 core. But the instructions
of accessing CP0 and CP1 is changed in PJ4. Append more files to support
iwmmxt in PJ4 core.
Signed-off-by: Zhou Zhu <zzhu3@marvell.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

ef6c8445

18 Dec, 2010 7 commits

Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable · 9326845f
Russell King authored Dec 18, 2010

9326845f
Merge branch 'hw-breakpoint' of git://repo.or.cz/linux-2.6/linux-wd into devel-stable · 2f841ed1
Russell King authored Dec 18, 2010

2f841ed1

ARM: pxa: sanitize IRQ registers access based on offset · a79a9ad9

Haojian Zhuang authored Nov 24, 2010

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>

a79a9ad9

ARM: mmp: select CPU_PJ4 · 3f408fa0

Haojian Zhuang authored Nov 24, 2010

Since CPU_PJ4 is shared between PXA95x and MMP2, select CPU_PJ4 in MMP2
configuration.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

3f408fa0

ARM: pxa: support saarb platform · c9b5ef47

Haojian Zhuang authored Nov 24, 2010

Saarb platform is a handheld platform that supports Marvell PXA955 silicon.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

c9b5ef47

ARM: pxa: support pxa95x · a4553358

Haojian Zhuang authored Nov 24, 2010

The core of PXA955 is PJ4. Add new PJ4 support. And add new macro
CONFIG_PXA95x.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

a4553358

ARM: pxa: introduce pxa3xx_clock_sysclass for clock suspend/resume · aae8224d
Eric Miao authored Nov 23, 2010
```
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
```
aae8224d

16 Dec, 2010 16 commits

ARM: pxa: introduce pxa2xx_clock_sysclass for clock suspend/resume · f113fe4e
Eric Miao authored Nov 23, 2010
```
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
```
f113fe4e

ARM: pxa: remove get_memclk_frequency_10khz() · 2a125dd5

Eric Miao authored Nov 22, 2010

Introduce 'struct clk' for memory and remove
get_memclk_frequency_10khz().
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

2a125dd5

ARM: pxa: separate the clock support into clock-{pxa2xx,pxa3xx}.c · 4029813c
Eric Miao authored Nov 22, 2010
```
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
```
4029813c
ARM: pxa: replace duplicated macro DEFINE_PXA3_CK() with DEFINE_CK() · 2e8581e7
Eric Miao authored Nov 22, 2010
```
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
```
2e8581e7

ARM: pxa: redefine irqs.h · bb71bdd3

Haojian Zhuang authored Nov 17, 2010

Define all IRQs in irqs.h. If some IRQs are sharing one IRQ number, define
them together. If some IRQs are sharing same name with different IRQ number,
define different IRQ.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

bb71bdd3

ARM: pxa: redefine the cpu_is_pxa3xx · d04e67cd

Haojian Zhuang authored Nov 17, 2010

After introducing pxa930/pxa935 and new silicons, original cpuid rules
of XScale generation 3 can't fit new silicons. Now redefine the rule
of PXA3xx.

Only PXA300/PXA310/PXA320/PXA930/PXA935 are family members of PXA3xx.
PXA930/PXA935 are family members of PXA93x. PXA93x can be considered
as PXA3xx + CP.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

d04e67cd

ARM: mmp: fix the typo - MMP2 is compatible with ARMv7 · d38bdf48

Haojian Zhuang authored Nov 25, 2010

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

d38bdf48

ARM: mmp: append brownstone support · 13dee960

Haojian Zhuang authored Nov 25, 2010

Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

13dee960

ARM: mmp: add usb clock for pxa168/pxa910 · 7bdba92d

cxie4 authored Nov 23, 2010

Signed-off-by: Chao Xie <chao.xie@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

7bdba92d

ARM: pxa/raumfeld: enable PXA3XX_GCU driver · aa117816

Daniel Mack authored Nov 04, 2010

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

aa117816

video: add driver for PXA3xx 2D graphics accelerator · 364dbdf3

Daniel Mack authored Nov 04, 2010

This adds a driver for the the 2D graphics accelerator found on PXA3xx
processors. Only resource mapping, interrupt handling and a simple ioctl
handler is done by the kernel part, the rest of the logic is implemented
in DirectFB userspace.

Graphic applications greatly benefit for line drawing, blend, and
rectangle and triangle filling operations.

Benchmarks done on a PXA303 using the df_dok benchmarking tool follow,
where the value in square brackets show the CPU usage during that test.

Without accelerator (benchmarking 256x252 on 480x262 RGB16 (16bit)):

Anti-aliased Text 3.016 secs ( 65.649 KChars/sec) [ 99.6%]
Fill Rectangle 3.021 secs ( 175.107 MPixel/sec) [ 98.0%]
Fill Rectangle (blend) 3.582 secs ( 3.602 MPixel/sec) [ 99.7%]
Fill Rectangles [10] 3.177 secs ( 182.753 MPixel/sec) [ 98.1%]
Fill Rectangles [10] (blend) 18.020 secs ( 3.580 MPixel/sec) [ 98.7%]
Fill Spans 3.019 secs ( 145.306 MPixel/sec) [ 98.0%]
Fill Spans (blend) 3.616 secs ( 3.568 MPixel/sec) [ 99.4%]
Blit 3.074 secs ( 39.874 MPixel/sec) [ 98.0%]
Blit 180 3.020 secs ( 32.042 MPixel/sec) [ 98.0%]
Blit with format conversion 3.005 secs ( 19.321 MPixel/sec) [ 99.6%]
Blit from 32bit (blend) 4.792 secs ( 2.692 MPixel/sec) [ 98.7%]

With accelerator:

Anti-aliased Text 3.056 secs (* 36.518 KChars/sec) [ 21.3%]
Fill Rectangle 3.015 secs (* 115.543 MPixel/sec) [ 8.9%]
Fill Rectangle (blend) 3.180 secs (* 20.286 MPixel/sec) [ 1.8%]
Fill Rectangles [10] 3.251 secs (* 119.062 MPixel/sec) [ 1.2%]
Fill Rectangles [10] (blend) 6.293 secs (* 20.502 MPixel/sec) [ 0.3%]
Fill Spans 3.051 secs (* 97.264 MPixel/sec) [ 35.7%]
Fill Spans (blend) 3.377 secs (* 15.282 MPixel/sec) [ 17.8%]
Blit 3.046 secs (* 27.533 MPixel/sec) [ 2.6%]
Blit 180 3.098 secs (* 27.070 MPixel/sec) [ 2.2%]
Blit with format conversion 3.131 secs (* 39.148 MPixel/sec) [ 2.8%]
Blit from 32bit (blend) 3.346 secs (* 11.568 MPixel/sec) [ 0.8%]
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Tested-by: Sven Neumann <s.neumann@raumfeld.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Denis Oliver Kropp <dok@directfb.org>
Cc: Sven Neumann <s.neumann@raumfeld.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

364dbdf3

ARM: mmp: add sd card to jasper · fe805986

Zhangfei Gao authored Nov 03, 2010

Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
Acked-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

fe805986

ARM: mmp: add mmc resource · 5382f419

Zhangfei Gao authored Sep 29, 2010

Signed-off-by: Zhangfei Gao <zhangfei.gao@marvell.com>
Acked-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

5382f419

ARM: pxa: Access SMEMC via virtual addresses · ad68bb9f

Marek Vasut authored Nov 03, 2010

This is important because on PXA3xx, the physical mapping of SMEMC registers
differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx
and PXA320, the PCMCIA driver was adjusted accordingly as well.

Also, various places in the kernel had to be patched to use
__raw_read/__raw_write.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

ad68bb9f

ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() · 851982c1

Marek Vasut authored Oct 11, 2010

This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish
between PXA25x/PXA27x and PXA3xx memory mapping.

Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io()
and pxa3xx_map_io() is included.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

851982c1

ARM: pxa: introduce addr-map.h for large bus addresses and ranges · 64ed267b
Eric Miao authored Oct 13, 2010
```
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
```
64ed267b