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

Commit fd1ee391 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Tony Lindgren
Browse files

omap: mcbsp: Remove port number enums 



These McBSP port number enums are used only in two places in the McBSP code
so we may remove then and just use numeric values like rest of the code does.

Signed-off-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 9df0fcc4

arch/arm/mach-omap1/mcbsp.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static void omap1_mcbsp_request(unsigned int id) 
	 * On 1510, 1610 and 1710, McBSP1 and McBSP3

	 * are DSP public peripherals.

	 */

	if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {

	if (id == 0 || id == 2) {

		if (dsp_use++ == 0) {

			api_clk = clk_get(NULL, "api_ck");

			dsp_clk = clk_get(NULL, "dsp_ck");
@@ -59,7 +59,7 @@ static void omap1_mcbsp_request(unsigned int id) 


static void omap1_mcbsp_free(unsigned int id)

{

	if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {

	if (id == 0 || id == 2) {

		if (--dsp_use == 0) {

			if (!IS_ERR(api_clk)) {

				clk_disable(api_clk);

arch/arm/plat-omap/include/plat/mcbsp.h

+1 −9
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#define OMAP_MCBSP_PLATFORM_DEVICE(port_nr)		\

static struct platform_device omap_mcbsp##port_nr = {	\

	.name	= "omap-mcbsp-dai",			\

	.id	= OMAP_MCBSP##port_nr,			\

	.id	= port_nr - 1,			\

}



#define MCBSP_CONFIG_TYPE2	0x2
@@ -331,14 +331,6 @@ struct omap_mcbsp_reg_cfg { 
	u16 rccr;

};



typedef enum {

	OMAP_MCBSP1 = 0,

	OMAP_MCBSP2,

	OMAP_MCBSP3,

	OMAP_MCBSP4,

	OMAP_MCBSP5

} omap_mcbsp_id;



typedef enum {

	OMAP_MCBSP_WORD_8 = 0,

	OMAP_MCBSP_WORD_12,