arm:davinci:mcasp: Move McASP related defines to common place
authorVaibhav Hiremath <hvaibhav@ti.com>
Sat, 26 Nov 2011 19:43:37 +0000 (01:13 +0530)
committerVaibhav Hiremath <hvaibhav@ti.com>
Mon, 23 Jan 2012 19:14:24 +0000 (00:44 +0530)
Davinci McASP IP & its Driver is shared by few OMAP platforms. Moving the
McASP ddefines to a common place, helps to share the same header file
across platforms

This patch moves asp.h from
arch/arm/mach-davinci/include/mach/asp.h -> arch/arm/include/asm/hardware/asp.h

Header define check is also updated to reflect hardware name rather than
platform

Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
12 files changed:
arch/arm/include/asm/hardware/asp.h [moved from arch/arm/mach-davinci/include/mach/asp.h with 92% similarity]
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm365.c
arch/arm/mach-davinci/include/mach/da8xx.h
arch/arm/mach-davinci/include/mach/dm355.h
arch/arm/mach-davinci/include/mach/dm365.h
arch/arm/mach-davinci/include/mach/dm644x.h
arch/arm/mach-davinci/include/mach/dm646x.h
sound/soc/davinci/davinci-evm.c
sound/soc/davinci/davinci-i2s.c
sound/soc/davinci/davinci-mcasp.h
sound/soc/davinci/davinci-pcm.h

similarity index 92%
rename from arch/arm/mach-davinci/include/mach/asp.h
rename to arch/arm/include/asm/hardware/asp.h
index 9aa240909a2cf4f9dac7bc1afc560712d9020ba2..5edeef9a98ca0c0dccbb75068feb7f3b42f8c32a 100644 (file)
@@ -1,8 +1,8 @@
 /*
- * <mach/asp.h> - DaVinci Audio Serial Port support
+ * <asm/hardware/asp.h> - DaVinci Audio Serial Port support
  */
-#ifndef __ASM_ARCH_DAVINCI_ASP_H
-#define __ASM_ARCH_DAVINCI_ASP_H
+#ifndef __ASM_HARDWARE_MCASP_H
+#define __ASM_HARDWARE_MCASP_H
 
 #include <mach/irqs.h>
 #include <mach/edma.h>
@@ -134,4 +134,9 @@ enum dm365_clk_input_pin {
 #define DAVINCI_MCASP_IIS_MODE 0
 #define DAVINCI_MCASP_DIT_MODE 1
 
-#endif /* __ASM_ARCH_DAVINCI_ASP_H */
+#if (defined(CONFIG_SOC_OMAPAM33XX) && (defined(CONFIG_SND_AM33XX_SOC) \
+                               || (defined(CONFIG_SND_AM33XX_SOC_MODULE))))
+#define davinci_gen_pool omap_gen_pool
+#endif
+
+#endif /* __ASM_HARDWARE_MCASP_H */
index d901e5f1818994d367f0668dc2eb977b8d30960f..07427f02237d6b3f7c322a8d1d9645a471d62459 100644 (file)
@@ -27,7 +27,7 @@
 #include <mach/time.h>
 #include <mach/serial.h>
 #include <mach/common.h>
-#include <mach/asp.h>
+#include <asm/hardware/asp.h>
 #include <mach/spi.h>
 #include <mach/gpio-davinci.h>
 
index d5d14f554347a376c1189dc74f4417ed6a6e112f..ed9753d6c85aeb52d68625c3fb6774259ee0eae0 100644 (file)
@@ -30,7 +30,7 @@
 #include <mach/time.h>
 #include <mach/serial.h>
 #include <mach/common.h>
-#include <mach/asp.h>
+#include <asm/hardware/asp.h>
 #include <mach/keyscan.h>
 #include <mach/spi.h>
 #include <mach/gpio-davinci.h>
index eaca7d8b9d68fb61c75f5da8dd7d6e787da8ef8c..2b2240ece8293d14f729eaa33cf193fd8b4a0907 100644 (file)
@@ -20,7 +20,7 @@
 #include <mach/serial.h>
 #include <mach/edma.h>
 #include <mach/i2c.h>
-#include <mach/asp.h>
+#include <asm/hardware/asp.h>
 #include <mach/mmc.h>
 #include <mach/usb.h>
 #include <mach/pm.h>
index 36dff4a0ce3f93ce9e0982713085b2c7285bcc02..a5829ea80918549efc99010657c6d339ab6d3ce2 100644 (file)
@@ -12,7 +12,7 @@
 #define __ASM_ARCH_DM355_H
 
 #include <mach/hardware.h>
-#include <mach/asp.h>
+#include <asm/hardware/asp.h>
 #include <media/davinci/vpfe_capture.h>
 
 #define DM355_ASYNC_EMIF_CONTROL_BASE  0x01E10000
index 2563bf4e93a10e1cc655f0cff4ca7b04f188a5b7..92d8db2375f1058880e6804e9b2ab70e5be24c7e 100644 (file)
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/davinci_emac.h>
 #include <mach/hardware.h>
-#include <mach/asp.h>
+#include <asm/hardware/asp.h>
 #include <mach/keyscan.h>
 #include <media/davinci/vpfe_capture.h>
 
index 5a1b26d4e68b41936ac16ee574d34d7be8342e6c..dd1bfa39e5932f5390d01f72f63b712311f8bef0 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <linux/davinci_emac.h>
 #include <mach/hardware.h>
-#include <mach/asp.h>
+#include <asm/hardware/asp.h>
 #include <media/davinci/vpfe_capture.h>
 
 #define DM644X_EMAC_BASE               (0x01C80000)
index 2a00fe5ac253dc7a3f810cbeb4d58553bb51ad21..8294bc68bc82fee139cf0965a196920272542a0b 100644 (file)
@@ -12,7 +12,7 @@
 #define __ASM_ARCH_DM646X_H
 
 #include <mach/hardware.h>
-#include <mach/asp.h>
+#include <asm/hardware/asp.h>
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
 #include <linux/davinci_emac.h>
index f78c3f0f280c23e12065a1c9ad226dc981e944c3..91bddb35678434007f741b4526ed3f0f5b5decd5 100644 (file)
@@ -22,7 +22,7 @@
 #include <asm/dma.h>
 #include <asm/mach-types.h>
 
-#include <mach/asp.h>
+#include <asm/hardware/asp.h>
 #include <mach/edma.h>
 #include <mach/mux.h>
 
index 300e12118c0093722f1e2b5f527b8627cdbab116..81a3e16b6951fa129e57bf8a4567a63223ad9ccb 100644 (file)
@@ -23,7 +23,7 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <mach/asp.h>
+#include <asm/hardware/asp.h>
 
 #include "davinci-pcm.h"
 #include "davinci-i2s.h"
index 4681acc636061300efe053f56e214fc0eff1b98b..0a818239a47eb0826bf4e844d7c2b70d7855b386 100644 (file)
@@ -19,7 +19,7 @@
 #define DAVINCI_MCASP_H
 
 #include <linux/io.h>
-#include <mach/asp.h>
+#include <asm/hardware/asp.h>
 #include "davinci-pcm.h"
 
 #define DAVINCI_MCASP_RATES    SNDRV_PCM_RATE_8000_96000
index c0d6c9be4b4d605b12bdf6145a8fde5319cd2bf6..2c3eadd31b92a728ee494bd54ffb90d5e7aabf19 100644 (file)
@@ -13,7 +13,7 @@
 #define _DAVINCI_PCM_H
 
 #include <mach/edma.h>
-#include <mach/asp.h>
+#include <asm/hardware/asp.h>
 
 
 struct davinci_pcm_dma_params {