From f95126c0fab7522f468eea1d6a4bedb855df9e33 Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Tue, 16 Mar 2010 17:12:37 +0800
Subject: [PATCH] --- yaml --- r: 191860 b: refs/heads/master c:
 54c39b420f017c546fb130a05c14bdb0a7910f98 h: refs/heads/master v: v3

---
 [refs]                                                       | 2 +-
 trunk/arch/arm/mach-pxa/Kconfig                              | 5 -----
 trunk/arch/arm/mach-pxa/Makefile                             | 1 -
 trunk/arch/arm/mach-pxa/poodle.c                             | 2 +-
 trunk/arch/arm/plat-pxa/Kconfig                              | 5 +++++
 trunk/arch/arm/plat-pxa/Makefile                             | 1 +
 .../{mach-pxa/include/mach => plat-pxa/include/plat}/ssp.h   | 0
 trunk/arch/arm/{mach-pxa => plat-pxa}/ssp.c                  | 2 +-
 trunk/drivers/spi/pxa2xx_spi.c                               | 2 +-
 trunk/sound/soc/pxa/pxa-ssp.c                                | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)
 rename trunk/arch/arm/{mach-pxa/include/mach => plat-pxa/include/plat}/ssp.h (100%)
 rename trunk/arch/arm/{mach-pxa => plat-pxa}/ssp.c (99%)

diff --git a/[refs] b/[refs]
index 75ca6b599a60..33ce38253644 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be1194cca55961b4dd98ea17fb24f0ffc6fa2213
+refs/heads/master: 54c39b420f017c546fb130a05c14bdb0a7910f98
diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig
index 8f7eb12776a9..6dd450a7dea6 100644
--- a/trunk/arch/arm/mach-pxa/Kconfig
+++ b/trunk/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/trunk/arch/arm/mach-pxa/Makefile b/trunk/arch/arm/mach-pxa/Makefile
index a83aff386fba..cf57fb2f73d8 100644
--- a/trunk/arch/arm/mach-pxa/Makefile
+++ b/trunk/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/trunk/arch/arm/mach-pxa/poodle.c b/trunk/arch/arm/mach-pxa/poodle.c
index 48b10c783a28..dcb178807046 100644
--- a/trunk/arch/arm/mach-pxa/poodle.c
+++ b/trunk/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/trunk/arch/arm/plat-pxa/Kconfig b/trunk/arch/arm/plat-pxa/Kconfig
index b158e98038ed..da53395a17c6 100644
--- a/trunk/arch/arm/plat-pxa/Kconfig
+++ b/trunk/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/trunk/arch/arm/plat-pxa/Makefile b/trunk/arch/arm/plat-pxa/Makefile
index 0264bfb0ca4f..4aacdd12c9cc 100644
--- a/trunk/arch/arm/plat-pxa/Makefile
+++ b/trunk/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/trunk/arch/arm/mach-pxa/include/mach/ssp.h b/trunk/arch/arm/plat-pxa/include/plat/ssp.h
similarity index 100%
rename from trunk/arch/arm/mach-pxa/include/mach/ssp.h
rename to trunk/arch/arm/plat-pxa/include/plat/ssp.h
diff --git a/trunk/arch/arm/mach-pxa/ssp.c b/trunk/arch/arm/plat-pxa/ssp.c
similarity index 99%
rename from trunk/arch/arm/mach-pxa/ssp.c
rename to trunk/arch/arm/plat-pxa/ssp.c
index a9b2d3eb8f32..5fe230178f0a 100644
--- a/trunk/arch/arm/mach-pxa/ssp.c
+++ b/trunk/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/trunk/drivers/spi/pxa2xx_spi.c b/trunk/drivers/spi/pxa2xx_spi.c
index 959e78bb2f04..50d6b780bc67 100644
--- a/trunk/drivers/spi/pxa2xx_spi.c
+++ b/trunk/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/trunk/sound/soc/pxa/pxa-ssp.c b/trunk/sound/soc/pxa/pxa-ssp.c
index 2e27962220ad..6271a100f355 100644
--- a/trunk/sound/soc/pxa/pxa-ssp.c
+++ b/trunk/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"