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

Commit 8b1906f1 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Tony Lindgren
Browse files

OMAP3: hwmod: add dev_attr for McBSP sidetone 



Since the sidetone block is tightly coupled to the mcbsp, sidetone information
is directly added to mcbsp2 & 3 hwmod dev_attr.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent cb7e9ded

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -1852,6 +1852,10 @@ static struct omap_hwmod_ocp_if *omap3xxx_mcbsp2_slaves[] = { 
	&omap3xxx_l4_per__mcbsp2,

	&omap3xxx_l4_per__mcbsp2,

};

};





static struct omap_mcbsp_dev_attr omap34xx_mcbsp2_dev_attr = {

	.sidetone	= "mcbsp2_sidetone",

};



static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {

static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {

	.name		= "mcbsp2",

	.name		= "mcbsp2",

	.class		= &omap3xxx_mcbsp_hwmod_class,

	.class		= &omap3xxx_mcbsp_hwmod_class,
@@ -1871,6 +1875,7 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = { 
	},

	},

	.slaves		= omap3xxx_mcbsp2_slaves,

	.slaves		= omap3xxx_mcbsp2_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap3xxx_mcbsp2_slaves),

	.slaves_cnt	= ARRAY_SIZE(omap3xxx_mcbsp2_slaves),

	.dev_attr	= &omap34xx_mcbsp2_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

};

};
@@ -1910,6 +1915,10 @@ static struct omap_hwmod_ocp_if *omap3xxx_mcbsp3_slaves[] = { 
	&omap3xxx_l4_per__mcbsp3,

	&omap3xxx_l4_per__mcbsp3,

};

};





static struct omap_mcbsp_dev_attr omap34xx_mcbsp3_dev_attr = {

	.sidetone       = "mcbsp3_sidetone",

};



static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {

static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {

	.name		= "mcbsp3",

	.name		= "mcbsp3",

	.class		= &omap3xxx_mcbsp_hwmod_class,

	.class		= &omap3xxx_mcbsp_hwmod_class,
@@ -1929,6 +1938,7 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = { 
	},

	},

	.slaves		= omap3xxx_mcbsp3_slaves,

	.slaves		= omap3xxx_mcbsp3_slaves,

	.slaves_cnt	= ARRAY_SIZE(omap3xxx_mcbsp3_slaves),

	.slaves_cnt	= ARRAY_SIZE(omap3xxx_mcbsp3_slaves),

	.dev_attr	= &omap34xx_mcbsp3_dev_attr,

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

	.omap_chip	= OMAP_CHIP_INIT(CHIP_IS_OMAP3430),

};

};

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -475,6 +475,15 @@ struct omap_mcbsp { 
#endif

#endif

	void *reg_cache;

	void *reg_cache;

};

};



/**

 * omap_mcbsp_dev_attr - OMAP McBSP device attributes for omap_hwmod

 * @sidetone: name of the sidetone device

 */

struct omap_mcbsp_dev_attr {

	const char *sidetone;

};



extern struct omap_mcbsp **mcbsp_ptr;

extern struct omap_mcbsp **mcbsp_ptr;

extern int omap_mcbsp_count, omap_mcbsp_cache_size;

extern int omap_mcbsp_count, omap_mcbsp_cache_size;