Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21400a72 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: Move private struct definition to source file 



Since it is a private struct strictly used by the davinci-mcasp driver it
can be moved from header file to the source file.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 02e08d9b

sound/soc/davinci/davinci-mcasp.c

+30 −0
Original line number Diff line number Diff line
@@ -37,6 +37,36 @@ 


#define DAVINCI_MCASP_NUM_SERIALIZER	16



struct davinci_audio_dev {

	struct davinci_pcm_dma_params dma_params[2];

	void __iomem *base;

	struct device *dev;



	/* McASP specific data */

	int	tdm_slots;

	u8	op_mode;

	u8	num_serializer;

	u8	*serial_dir;

	u8	version;

	u16	bclk_lrclk_ratio;



	/* McASP FIFO related */

	u8	txnumevt;

	u8	rxnumevt;



#ifdef CONFIG_PM_SLEEP

	struct {

		u32	txfmtctl;

		u32	rxfmtctl;

		u32	txfmt;

		u32	rxfmt;

		u32	aclkxctl;

		u32	aclkrctl;

		u32	pdir;

	} context;

#endif

};



static inline void mcasp_set_bits(void __iomem *reg, u32 val)

{

	__raw_writel(__raw_readl(reg) | val, reg);

sound/soc/davinci/davinci-mcasp.h

+0 −35
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ 
#ifndef DAVINCI_MCASP_H

#define DAVINCI_MCASP_H



#include <linux/io.h>

#include <linux/platform_data/davinci_asp.h>



#include "davinci-pcm.h"



/*

 * McASP register definitions

 */
@@ -290,34 +285,4 @@ 
#define NUMEVT_MASK	(0xFF << 8)

#define NUMDMA_MASK	(0xFF)



struct davinci_audio_dev {

	struct davinci_pcm_dma_params dma_params[2];

	void __iomem *base;

	struct device *dev;



	/* McASP specific data */

	int	tdm_slots;

	u8	op_mode;

	u8	num_serializer;

	u8	*serial_dir;

	u8	version;

	u16	bclk_lrclk_ratio;



	/* McASP FIFO related */

	u8	txnumevt;

	u8	rxnumevt;



#ifdef CONFIG_PM_SLEEP

	struct {

		u32	txfmtctl;

		u32	rxfmtctl;

		u32	txfmt;

		u32	rxfmt;

		u32	aclkxctl;

		u32	aclkrctl;

		u32	pdir;

	} context;

#endif

};



#endif	/* DAVINCI_MCASP_H */