iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Russell King 2010-01-10 17:33:56 +00:00
commit e55d1936f2
5 changed files with 3019 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1898
arch/arm/configs/raumfeld_defconfig Normal file
View File

File diff suppressed because it is too large Load Diff

2
arch/arm/mach-mmp/ttc_dkb.c
View File

@ -24,8 +24,6 @@
#include "common.h" #include "common.h"
#define ARRAY_AND_SIZE(x) (x), ARRAY_SIZE(x)
static unsigned long ttc_dkb_pin_config[] __initdata = { static unsigned long ttc_dkb_pin_config[] __initdata = {
/* UART2 */ /* UART2 */
GPIO47_UART2_RXD, GPIO47_UART2_RXD,

18
arch/arm/mach-pxa/Kconfig
View File

@ -415,6 +415,24 @@ config MACH_TREO680
Say Y here if you intend to run this kernel on Palm Treo 680 Say Y here if you intend to run this kernel on Palm Treo 680
smartphone. smartphone.
config MACH_RAUMFELD_RC
bool "Raumfeld Controller"
select PXA3xx
select CPU_PXA300
select HAVE_PWM
config MACH_RAUMFELD_CONNECTOR
bool "Raumfeld Connector"
select PXA3xx
select CPU_PXA300
select PXA_SSP
config MACH_RAUMFELD_SPEAKER
bool "Raumfeld Speaker"
select PXA3xx
select CPU_PXA300
select PXA_SSP
config PXA_SHARPSL config PXA_SHARPSL
bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models" bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"
select SHARP_SCOOP select SHARP_SCOOP

3
arch/arm/mach-pxa/Makefile
View File

@ -89,6 +89,9 @@ obj-$(CONFIG_MACH_E740) += e740.o
obj-$(CONFIG_MACH_E750) += e750.o obj-$(CONFIG_MACH_E750) += e750.o
obj-$(CONFIG_MACH_E400) += e400.o obj-$(CONFIG_MACH_E400) += e400.o
obj-$(CONFIG_MACH_E800) += e800.o obj-$(CONFIG_MACH_E800) += e800.o
obj-$(CONFIG_MACH_RAUMFELD_RC) += raumfeld.o
obj-$(CONFIG_MACH_RAUMFELD_CONNECTOR) += raumfeld.o
obj-$(CONFIG_MACH_RAUMFELD_SPEAKER) += raumfeld.o
# Support for blinky lights # Support for blinky lights
led-y := leds.o led-y := leds.o

1100
arch/arm/mach-pxa/raumfeld.c Normal file
View File

File diff suppressed because it is too large Load Diff