Commit 896f66b7 authored by Hebbar, Gururaja's avatar Hebbar, Gururaja Committed by Mark Brown
Browse files

ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific 



Davinci McASP header & driver are shared by few OMAP platforms (like
TI81xx, AM335x). Splitting asp header into Davinci platform specific
header and Audio specific header helps to share them across platforms.

Audio specific defines is moved to to common
<linux/platform_data/davinci_asp.h> so that the header can be
accessed by all related platforms.

While here, correct the header usage (remove multiple header
re-definitions and unused headers) and remove platform names from
structures comments and enum. Also some some coding style errors.

Signed-off-by: default avatarHebbar, Gururaja <gururaja.hebbar@ti.com>
Acked-by: default avatarVaibhav Bedia <vaibhav.bedia@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent bdd73278

arch/arm/mach-davinci/asp.h

0 → 100644
+49 −0
Original line number Original line Diff line number Diff line 
/*

 * TI DaVinci Audio definitions

 */

#ifndef __ASM_ARCH_DAVINCI_ASP_H

#define __ASM_ARCH_DAVINCI_ASP_H



/* Bases of dm644x and dm355 register banks */

#define DAVINCI_ASP0_BASE	0x01E02000

#define DAVINCI_ASP1_BASE	0x01E04000



/* Bases of dm365 register banks */

#define DAVINCI_DM365_ASP0_BASE	0x01D02000



/* Bases of dm646x register banks */

#define DAVINCI_DM646X_MCASP0_REG_BASE		0x01D01000

#define DAVINCI_DM646X_MCASP1_REG_BASE		0x01D01800



/* Bases of da850/da830 McASP0  register banks */

#define DAVINCI_DA8XX_MCASP0_REG_BASE	0x01D00000



/* Bases of da830 McASP1 register banks */

#define DAVINCI_DA830_MCASP1_REG_BASE	0x01D04000



/* EDMA channels of dm644x and dm355 */

#define DAVINCI_DMA_ASP0_TX	2

#define DAVINCI_DMA_ASP0_RX	3

#define DAVINCI_DMA_ASP1_TX	8

#define DAVINCI_DMA_ASP1_RX	9



/* EDMA channels of dm646x */

#define DAVINCI_DM646X_DMA_MCASP0_AXEVT0	6

#define DAVINCI_DM646X_DMA_MCASP0_AREVT0	9

#define DAVINCI_DM646X_DMA_MCASP1_AXEVT1	12



/* EDMA channels of da850/da830 McASP0 */

#define DAVINCI_DA8XX_DMA_MCASP0_AREVT	0

#define DAVINCI_DA8XX_DMA_MCASP0_AXEVT	1



/* EDMA channels of da830 McASP1 */

#define DAVINCI_DA830_DMA_MCASP1_AREVT	2

#define DAVINCI_DA830_DMA_MCASP1_AXEVT	3



/* Interrupts */

#define DAVINCI_ASP0_RX_INT	IRQ_MBRINT

#define DAVINCI_ASP0_TX_INT	IRQ_MBXINT

#define DAVINCI_ASP1_RX_INT	IRQ_MBRINT

#define DAVINCI_ASP1_TX_INT	IRQ_MBXINT



#endif /* __ASM_ARCH_DAVINCI_ASP_H */

arch/arm/mach-davinci/davinci.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -22,10 +22,11 @@ 
#include <linux/davinci_emac.h>

#include <linux/davinci_emac.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi.h>

#include <linux/platform_data/davinci_asp.h>





#include <mach/asp.h>

#include <mach/keyscan.h>

#include <mach/keyscan.h>

#include <mach/hardware.h>

#include <mach/hardware.h>

#include <mach/edma.h>





#include <media/davinci/vpfe_capture.h>

#include <media/davinci/vpfe_capture.h>

#include <media/davinci/vpif_types.h>

#include <media/davinci/vpif_types.h>

arch/arm/mach-davinci/devices-da8xx.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <mach/cpuidle.h>

#include <mach/cpuidle.h>





#include "clock.h"

#include "clock.h"

#include "asp.h"





#define DA8XX_TPCC_BASE			0x01c00000

#define DA8XX_TPCC_BASE			0x01c00000

#define DA8XX_TPTC0_BASE		0x01c08000

#define DA8XX_TPTC0_BASE		0x01c08000

arch/arm/mach-davinci/dm355.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,13 +26,13 @@ 
#include <mach/time.h>

#include <mach/time.h>

#include <mach/serial.h>

#include <mach/serial.h>

#include <mach/common.h>

#include <mach/common.h>

#include <mach/asp.h>

#include <mach/spi.h>

#include <mach/spi.h>

#include <mach/gpio-davinci.h>

#include <mach/gpio-davinci.h>





#include "davinci.h"

#include "davinci.h"

#include "clock.h"

#include "clock.h"

#include "mux.h"

#include "mux.h"

#include "asp.h"





#define DM355_UART2_BASE	(IO_PHYS + 0x206000)

#define DM355_UART2_BASE	(IO_PHYS + 0x206000)

arch/arm/mach-davinci/dm365.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <mach/time.h>

#include <mach/time.h>

#include <mach/serial.h>

#include <mach/serial.h>

#include <mach/common.h>

#include <mach/common.h>

#include <mach/asp.h>

#include <mach/keyscan.h>

#include <mach/keyscan.h>

#include <mach/spi.h>

#include <mach/spi.h>

#include <mach/gpio-davinci.h>

#include <mach/gpio-davinci.h>
@@ -37,6 +36,7 @@ 
#include "davinci.h"

#include "davinci.h"

#include "clock.h"

#include "clock.h"

#include "mux.h"

#include "mux.h"

#include "asp.h"





#define DM365_REF_FREQ		24000000	/* 24 MHz on the DM365 EVM */

#define DM365_REF_FREQ		24000000	/* 24 MHz on the DM365 EVM */

CRA Git | Maintained and supported by SUSTech CRA and CCSE