leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ARM] pxa: move ssp into common plat-pxa

Browse Source 
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Haojian Zhuang 2010-03-16 17:12:37 +08:00 committed by Eric Miao
parent be1194cca5
commit 54c39b420f
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -648,11 +648,6 @@ config PXA_SHARP_Cxx00
help
Enable common support for Sharp Cxx00 models
config PXA_SSP
tristate
help
Enable support for PXA2xx SSP ports
config TOSA_BT
tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
depends on MACH_TOSA

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

@ -14,7 +14,6 @@ obj-$(CONFIG_PXA3xx) += cpufreq-pxa3xx.o
endif
# Generic drivers that other drivers may depend upon
obj-$(CONFIG_PXA_SSP) += ssp.o
# SoC-specific code
obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa2xx.o pxa25x.o

2
arch/arm/mach-pxa/poodle.c
View File

@ -40,12 +40,12 @@
#include <mach/pxa25x.h>
#include <mach/mmc.h>
#include <mach/udc.h>
#include <plat/i2c.h>
#include <mach/irda.h>
#include <mach/poodle.h>
#include <mach/pxafb.h>
#include <mach/sharpsl.h>
#include <mach/pxa2xx_spi.h>
#include <plat/i2c.h>
#include <asm/hardware/scoop.h>
#include <asm/hardware/locomo.h>

5
arch/arm/plat-pxa/Kconfig
View File

@ -1,3 +1,8 @@
if PLAT_PXA
config PXA_SSP
tristate
help
Enable support for PXA2xx SSP ports
endif

1
arch/arm/plat-pxa/Makefile
View File

@ -9,3 +9,4 @@ obj-$(CONFIG_PXA3xx) += mfp.o
obj-$(CONFIG_ARCH_MMP) += mfp.o
obj-$(CONFIG_HAVE_PWM) += pwm.o
obj-$(CONFIG_PXA_SSP) += ssp.o

0
arch/arm/mach-pxa/include/mach/ssp.h → arch/arm/plat-pxa/include/plat/ssp.h
View File

2
arch/arm/mach-pxa/ssp.c → arch/arm/plat-pxa/ssp.c
View File

@ -32,7 +32,7 @@
#include <asm/irq.h>
#include <mach/hardware.h>
#include <mach/ssp.h>
#include <plat/ssp.h>
static DEFINE_MUTEX(ssp_lock);
static LIST_HEAD(ssp_list);

2
drivers/spi/pxa2xx_spi.c
View File

@ -36,7 +36,7 @@
#include <asm/delay.h>
#include <mach/dma.h>
#include <mach/ssp.h>
#include <plat/ssp.h>
#include <mach/pxa2xx_spi.h>
MODULE_AUTHOR("Stephen Street");

2
sound/soc/pxa/pxa-ssp.c
View File

@ -33,7 +33,7 @@
#include <mach/hardware.h>
#include <mach/dma.h>
#include <mach/audio.h>
#include <mach/ssp.h>
#include <plat/ssp.h>
#include "pxa2xx-pcm.h"
#include "pxa-ssp.h"