|
|
|
[GIT PULL REQUEST] pxa: devel | |
| [Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] | |
Russell,
The remaining colibri patches are merged and preliminary building test
shows they are quite OK. And the long waiting pxa168/pxa910 patches
are also merged into 'devel' and you can pull them in a whole now.
You might want to pull 'fix' first into your master and update mach-types
before pulling this branch. Thanks.
The following changes since commit fa12868e59f5f49bc42b8befd94c531bb07ec120:
Eric Miao (1):
Merge branch 'fix' of
git://git.kernel.org/.../ycmiao/pxa-linux-2.6.git into devel
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git devel
Daniel Mack (11):
[ARM] pxa: rename colibri.c to colibri-pxa270.c
[ARM] pxa: add basic support for Colibri PXA300 module
[ARM] pxa: add MMC support for Colibri PXA300
[ARM] pxa: add USB support for Colibri PXA300
[ARM] pxa: rename and update Colibri PXA270 defconfig
[ARM] pxa: add colibri PXA300 defconfig
[ARM] pxa: Fix Colibri AX88796 configuration
[ARM] pxa: Refactor Colibri board support code
[ARM] pxa: Colibri PXA320 module basics
[ARM] pxa: Add Colibri LCD functions
[ARM] pxa: AC97 pin functions for Colibri PXA310/320
Eric Miao (17):
[ARM] pxa: introduce plat-pxa for PXA common code and add DMA support
[ARM] pxa: move common GPIO handling code into plat-pxa
[ARM] pxa: move common MFP handling code into plat-pxa
[ARM] pxa: add base support for Marvell's PXA168 processor line
[ARM] pxa: add iWMMXt support for pxa168
[ARM] pxa: add GPIO support for pxa168
[ARM] pxa: add MFP support for pxa168
[ARM] pxa: allow reuse of serial driver for pxa168
[ARM] pxa/aspenite: add support for console uart
[ARM] pxa/aspenite: add support for debug ethernet
[ARM] pxa: add base support for Marvell PXA910
[ARM] pxa: add base support for pxa910-based TavorEVB
[ARM] pxa: add base support for pxa910-based TTC_DKB
[ARM] pxa: add defconfig for pxa168-based platforms
[ARM] pxa: add defconfig for pxa910-based platforms
MAINTAINERS: update pxa168 maintainers
MAINTAINERS: update pxa910 maintainers
MAINTAINERS | 16 +
arch/arm/Kconfig | 27 +-
arch/arm/Makefile | 2 +
arch/arm/boot/compressed/head.S | 12 +
...{colibri_defconfig => colibri_pxa270_defconfig} | 594 +++++++---
arch/arm/configs/colibri_pxa300_defconfig | 1156 ++++++++++++++++++++
arch/arm/configs/pxa168_defconfig | 891 +++++++++++++++
arch/arm/configs/pxa910_defconfig | 891 +++++++++++++++
arch/arm/include/asm/cacheflush.h | 8 +
arch/arm/include/asm/proc-fns.h | 8 +
arch/arm/kernel/Makefile | 1 +
arch/arm/mach-mmp/Kconfig | 47 +
arch/arm/mach-mmp/Makefile | 15 +
arch/arm/mach-mmp/Makefile.boot | 1 +
arch/arm/mach-mmp/aspenite.c | 117 ++
arch/arm/mach-mmp/clock.c | 83 ++
arch/arm/mach-mmp/clock.h | 71 ++
arch/arm/mach-mmp/common.c | 37 +
arch/arm/mach-mmp/common.h | 13 +
arch/arm/mach-mmp/devices.c | 69 ++
arch/arm/mach-mmp/include/mach/addr-map.h | 34 +
arch/arm/mach-mmp/include/mach/clkdev.h | 7 +
arch/arm/mach-mmp/include/mach/cputype.h | 30 +
arch/arm/mach-mmp/include/mach/debug-macro.S | 23 +
arch/arm/mach-mmp/include/mach/devices.h | 37 +
arch/arm/mach-mmp/include/mach/dma.h | 13 +
arch/arm/mach-mmp/include/mach/entry-macro.S | 25 +
arch/arm/mach-mmp/include/mach/gpio.h | 36 +
arch/arm/mach-mmp/include/mach/hardware.h | 4 +
arch/arm/mach-mmp/include/mach/io.h | 21 +
arch/arm/mach-mmp/include/mach/irqs.h | 119 ++
arch/arm/mach-mmp/include/mach/memory.h | 14 +
arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 258 +++++
arch/arm/mach-mmp/include/mach/mfp-pxa910.h | 157 +++
arch/arm/mach-mmp/include/mach/mfp.h | 37 +
arch/arm/mach-mmp/include/mach/pxa168.h | 23 +
arch/arm/mach-mmp/include/mach/pxa910.h | 23 +
arch/arm/mach-mmp/include/mach/regs-apbc.h | 78 ++
arch/arm/mach-mmp/include/mach/regs-apmu.h | 36 +
arch/arm/mach-mmp/include/mach/regs-icu.h | 31 +
arch/arm/mach-mmp/include/mach/regs-timers.h | 44 +
arch/arm/mach-mmp/include/mach/system.h | 21 +
arch/arm/mach-mmp/include/mach/timex.h | 9 +
arch/arm/mach-mmp/include/mach/uncompress.h | 41 +
arch/arm/mach-mmp/include/mach/vmalloc.h | 5 +
arch/arm/mach-mmp/irq.c | 55 +
arch/arm/mach-mmp/pxa168.c | 111 ++
arch/arm/mach-mmp/pxa910.c | 158 +++
arch/arm/mach-mmp/tavorevb.c | 109 ++
arch/arm/mach-mmp/time.c | 199 ++++
arch/arm/mach-mmp/ttc_dkb.c | 47 +
arch/arm/mach-pxa/Kconfig | 12 +-
arch/arm/mach-pxa/Makefile | 8 +-
arch/arm/mach-pxa/{colibri.c => colibri-pxa270.c} | 50 +-
arch/arm/mach-pxa/colibri-pxa300.c | 190 ++++
arch/arm/mach-pxa/colibri-pxa320.c | 187 ++++
arch/arm/mach-pxa/colibri-pxa3xx.c | 121 ++
arch/arm/mach-pxa/include/mach/colibri.h | 32 +-
arch/arm/mach-pxa/include/mach/dma.h | 83 +--
arch/arm/mach-pxa/include/mach/gpio.h | 32 +-
arch/arm/mach-pxa/include/mach/mfp-pxa25x.h | 1 -
arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 1 -
arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h | 2 +-
arch/arm/mach-pxa/include/mach/mfp-pxa300.h | 1 -
arch/arm/mach-pxa/include/mach/mfp-pxa320.h | 1 -
arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h | 130 +--
arch/arm/mach-pxa/include/mach/mfp-pxa930.h | 1 -
arch/arm/mach-pxa/mfp-pxa3xx.c | 189 +----
arch/arm/mach-pxa/pxa300.c | 10 +-
arch/arm/mach-pxa/pxa320.c | 6 +-
arch/arm/mach-pxa/pxa930.c | 6 +-
arch/arm/mm/Kconfig | 15 +-
arch/arm/mm/Makefile | 1 +
arch/arm/mm/proc-mohawk.S | 416 +++++++
arch/arm/plat-pxa/Kconfig | 3 +
arch/arm/plat-pxa/Makefile | 7 +
arch/arm/{mach-pxa => plat-pxa}/dma.c | 6 +-
arch/arm/{mach-pxa => plat-pxa}/gpio.c | 30 +-
arch/arm/plat-pxa/include/plat/dma.h | 85 ++
arch/arm/plat-pxa/include/plat/gpio.h | 62 ++
arch/arm/plat-pxa/include/plat/mfp.h | 399 +++++++
arch/arm/plat-pxa/mfp.c | 278 +++++
drivers/net/smc91x.h | 1 +
drivers/serial/Kconfig | 2 +-
84 files changed, 7562 insertions(+), 670 deletions(-)
rename arch/arm/configs/{colibri_defconfig => colibri_pxa270_defconfig} (76%)
create mode 100644 arch/arm/configs/colibri_pxa300_defconfig
create mode 100644 arch/arm/configs/pxa168_defconfig
create mode 100644 arch/arm/configs/pxa910_defconfig
create mode 100644 arch/arm/mach-mmp/Kconfig
create mode 100644 arch/arm/mach-mmp/Makefile
create mode 100644 arch/arm/mach-mmp/Makefile.boot
create mode 100644 arch/arm/mach-mmp/aspenite.c
create mode 100644 arch/arm/mach-mmp/clock.c
create mode 100644 arch/arm/mach-mmp/clock.h
create mode 100644 arch/arm/mach-mmp/common.c
create mode 100644 arch/arm/mach-mmp/common.h
create mode 100644 arch/arm/mach-mmp/devices.c
create mode 100644 arch/arm/mach-mmp/include/mach/addr-map.h
create mode 100644 arch/arm/mach-mmp/include/mach/clkdev.h
create mode 100644 arch/arm/mach-mmp/include/mach/cputype.h
create mode 100644 arch/arm/mach-mmp/include/mach/debug-macro.S
create mode 100644 arch/arm/mach-mmp/include/mach/devices.h
create mode 100644 arch/arm/mach-mmp/include/mach/dma.h
create mode 100644 arch/arm/mach-mmp/include/mach/entry-macro.S
create mode 100644 arch/arm/mach-mmp/include/mach/gpio.h
create mode 100644 arch/arm/mach-mmp/include/mach/hardware.h
create mode 100644 arch/arm/mach-mmp/include/mach/io.h
create mode 100644 arch/arm/mach-mmp/include/mach/irqs.h
create mode 100644 arch/arm/mach-mmp/include/mach/memory.h
create mode 100644 arch/arm/mach-mmp/include/mach/mfp-pxa168.h
create mode 100644 arch/arm/mach-mmp/include/mach/mfp-pxa910.h
create mode 100644 arch/arm/mach-mmp/include/mach/mfp.h
create mode 100644 arch/arm/mach-mmp/include/mach/pxa168.h
create mode 100644 arch/arm/mach-mmp/include/mach/pxa910.h
create mode 100644 arch/arm/mach-mmp/include/mach/regs-apbc.h
create mode 100644 arch/arm/mach-mmp/include/mach/regs-apmu.h
create mode 100644 arch/arm/mach-mmp/include/mach/regs-icu.h
create mode 100644 arch/arm/mach-mmp/include/mach/regs-timers.h
create mode 100644 arch/arm/mach-mmp/include/mach/system.h
create mode 100644 arch/arm/mach-mmp/include/mach/timex.h
create mode 100644 arch/arm/mach-mmp/include/mach/uncompress.h
create mode 100644 arch/arm/mach-mmp/include/mach/vmalloc.h
create mode 100644 arch/arm/mach-mmp/irq.c
create mode 100644 arch/arm/mach-mmp/pxa168.c
create mode 100644 arch/arm/mach-mmp/pxa910.c
create mode 100644 arch/arm/mach-mmp/tavorevb.c
create mode 100644 arch/arm/mach-mmp/time.c
create mode 100644 arch/arm/mach-mmp/ttc_dkb.c
rename arch/arm/mach-pxa/{colibri.c => colibri-pxa270.c} (68%)
create mode 100644 arch/arm/mach-pxa/colibri-pxa300.c
create mode 100644 arch/arm/mach-pxa/colibri-pxa320.c
create mode 100644 arch/arm/mach-pxa/colibri-pxa3xx.c
create mode 100644 arch/arm/mm/proc-mohawk.S
create mode 100644 arch/arm/plat-pxa/Kconfig
create mode 100644 arch/arm/plat-pxa/Makefile
rename arch/arm/{mach-pxa => plat-pxa}/dma.c (97%)
rename arch/arm/{mach-pxa => plat-pxa}/gpio.c (89%)
create mode 100644 arch/arm/plat-pxa/include/plat/dma.h
create mode 100644 arch/arm/plat-pxa/include/plat/gpio.h
create mode 100644 arch/arm/plat-pxa/include/plat/mfp.h
create mode 100644 arch/arm/plat-pxa/mfp.c
-------------------------------------------------------------------
List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
[Linux ARM (vger)] [Linux ARM MSM] [Linux Omap] [Linux Arm] [Fedora ARM] [eCos] [Linux Fastboot] [Gcc Help] [Git] [DCCP] [IETF Announce] [Security] [PDAs] [Linux] [Linux Book List] [Linux MIPS] [Yosemite Campsites] [Photos]
|
|