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

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>

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 8f7eb12776a94f494aeadc94af7f739dd82f484c..6dd450a7dea6c8990ff3fdf97ea548de0a8c4dc5 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -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

diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index a83aff386fba83c347f57db76831250678b59130..cf57fb2f73d82406c7300619ee2cbd7e51299559 100644 (file)
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -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

diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 48b10c783a2848a2586a2c586c166f60e36d1820..dcb17880704657a34b5081d0b54706be0b2a38de 100644 (file)
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -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>

diff --git a/arch/arm/plat-pxa/Kconfig b/arch/arm/plat-pxa/Kconfig
index b158e98038edc2da3f45ffd86d923359abb8d361..da53395a17c6e84b2e5c7912bdbfb05b4d519eba 100644 (file)
--- a/arch/arm/plat-pxa/Kconfig
+++ b/arch/arm/plat-pxa/Kconfig
@@ -1,3 +1,8 @@
 if PLAT_PXA
 
+config PXA_SSP
+       tristate
+       help
+         Enable support for PXA2xx SSP ports
+
 endif

diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile
index 0264bfb0ca4f24254d59bc9cf5ff5e1a0f9bbdae..4aacdd12c9ccb276d3c4b1809317ee7f104bf0ea 100644 (file)
--- a/arch/arm/plat-pxa/Makefile
+++ b/arch/arm/plat-pxa/Makefile
@@ -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

diff --git a/arch/arm/mach-pxa/include/mach/ssp.h b/arch/arm/plat-pxa/include/plat/ssp.h
similarity index 100%
rename from arch/arm/mach-pxa/include/mach/ssp.h
rename to arch/arm/plat-pxa/include/plat/ssp.h

diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/plat-pxa/ssp.c
similarity index 99%
rename from arch/arm/mach-pxa/ssp.c
rename to arch/arm/plat-pxa/ssp.c
index a9b2d3eb8f32369367ab696c1ebb480097d71d41..5fe230178f0a2354f0dad26a8021d68b3aab52b3 100644 (file)
--- a/arch/arm/mach-pxa/ssp.c
+++ b/arch/arm/plat-pxa/ssp.c
@@ -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);

diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 959e78bb2f042aa3560ed870aa645ce3f5837381..50d6b780bc6754d3df74cd0c0632ca1737e835aa 100644 (file)
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -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");

diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index 2e27962220ad3f2468b940db7f8f4c6911761538..6271a100f355d76dedceb15b1fab4a274b1a0f4b 100644 (file)
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -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"