Commit 0210dc4e authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Liam Girdwood
Browse files

ARM: OMAP: mcbsp: Convert core driver to proper platform driver 



Convert the plat-omap/mcbsp.c driver to be proper platform driver.
Remove the omap_mcbsp_init function call which was called from
mach-omap1/2/mcbsp.c to register the platform driver for the just
created platform device in the same function.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarGrazvydas Ignotas <notasas@gmail.com>
Tested-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: default avatarLiam Girdwood <lrg@ti.com>
parent 0324e02a

arch/arm/mach-omap1/mcbsp.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static int __init omap1_mcbsp_init(void) 
					omap16xx_mcbsp_pdata,

					OMAP16XX_MCBSP_COUNT);



	return omap_mcbsp_init();

	return 0;

}



arch_initcall(omap1_mcbsp_init);

arch/arm/mach-omap2/mcbsp.c

+1 −1
Original line number Diff line number Diff line
@@ -193,6 +193,6 @@ static int __init omap2_mcbsp_init(void) 
	if (!mcbsp_ptr)

		return -ENOMEM;



	return omap_mcbsp_init();

	return 0;

}

arch_initcall(omap2_mcbsp_init);

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

+0 −1
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ struct omap_mcbsp_dev_attr { 
extern struct omap_mcbsp **mcbsp_ptr;

extern int omap_mcbsp_count;



int omap_mcbsp_init(void);

void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config);

void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold);

void omap_mcbsp_set_rx_threshold(unsigned int id, u16 threshold);

arch/arm/plat-omap/mcbsp.c

+6 −5
Original line number Diff line number Diff line
@@ -1354,8 +1354,9 @@ static struct platform_driver omap_mcbsp_driver = { 
	},

};



int __init omap_mcbsp_init(void)

{

	/* Register the McBSP driver */

	return platform_driver_register(&omap_mcbsp_driver);

}
 
module_platform_driver(omap_mcbsp_driver);



MODULE_AUTHOR("Samuel Ortiz <samuel.ortiz@nokia.com>");

MODULE_DESCRIPTION("OMAP McBSP core driver");

MODULE_LICENSE("GPL");

MODULE_ALIAS("platform:omap-mcbsp");

CRA Git | Maintained and supported by SUSTech CRA and CCSE