aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorKishon Vijay Abraham I <kishon@ti.com>2011-02-24 04:46:51 -0500
committerTony Lindgren <tony@atomide.com>2011-02-24 16:02:33 -0500
commit8b1906f12a60d377b11d8a3dd256ce0a0ef6c614 (patch)
tree8d7d2c44dcfec87fb1c096570f54ddd94a3126a5 /arch/arm
parentcb7e9ded3240d717d1d24812d33b3ef2c98c084e (diff)
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: Kishon Vijay Abraham I <kishon@ti.com> Signed-off-by: Benoit Cousson <b-cousson@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_3xxx_data.c10
-rw-r--r--arch/arm/plat-omap/include/plat/mcbsp.h9
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index e1d89c0607e4..25226bf063e1 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -1852,6 +1852,10 @@ static struct omap_hwmod_ocp_if *omap3xxx_mcbsp2_slaves[] = {
1852 &omap3xxx_l4_per__mcbsp2, 1852 &omap3xxx_l4_per__mcbsp2,
1853}; 1853};
1854 1854
1855static struct omap_mcbsp_dev_attr omap34xx_mcbsp2_dev_attr = {
1856 .sidetone = "mcbsp2_sidetone",
1857};
1858
1855static struct omap_hwmod omap3xxx_mcbsp2_hwmod = { 1859static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {
1856 .name = "mcbsp2", 1860 .name = "mcbsp2",
1857 .class = &omap3xxx_mcbsp_hwmod_class, 1861 .class = &omap3xxx_mcbsp_hwmod_class,
@@ -1871,6 +1875,7 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {
1871 }, 1875 },
1872 .slaves = omap3xxx_mcbsp2_slaves, 1876 .slaves = omap3xxx_mcbsp2_slaves,
1873 .slaves_cnt = ARRAY_SIZE(omap3xxx_mcbsp2_slaves), 1877 .slaves_cnt = ARRAY_SIZE(omap3xxx_mcbsp2_slaves),
1878 .dev_attr = &omap34xx_mcbsp2_dev_attr,
1874 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), 1879 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
1875}; 1880};
1876 1881
@@ -1910,6 +1915,10 @@ static struct omap_hwmod_ocp_if *omap3xxx_mcbsp3_slaves[] = {
1910 &omap3xxx_l4_per__mcbsp3, 1915 &omap3xxx_l4_per__mcbsp3,
1911}; 1916};
1912 1917
1918static struct omap_mcbsp_dev_attr omap34xx_mcbsp3_dev_attr = {
1919 .sidetone = "mcbsp3_sidetone",
1920};
1921
1913static struct omap_hwmod omap3xxx_mcbsp3_hwmod = { 1922static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {
1914 .name = "mcbsp3", 1923 .name = "mcbsp3",
1915 .class = &omap3xxx_mcbsp_hwmod_class, 1924 .class = &omap3xxx_mcbsp_hwmod_class,
@@ -1929,6 +1938,7 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {
1929 }, 1938 },
1930 .slaves = omap3xxx_mcbsp3_slaves, 1939 .slaves = omap3xxx_mcbsp3_slaves,
1931 .slaves_cnt = ARRAY_SIZE(omap3xxx_mcbsp3_slaves), 1940 .slaves_cnt = ARRAY_SIZE(omap3xxx_mcbsp3_slaves),
1941 .dev_attr = &omap34xx_mcbsp3_dev_attr,
1932 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430), 1942 .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
1933}; 1943};
1934 1944
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index afcbb7bb0165..1fe06372c9ce 100644
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -475,6 +475,15 @@ struct omap_mcbsp {
475#endif 475#endif
476 void *reg_cache; 476 void *reg_cache;
477}; 477};
478
479/**
480 * omap_mcbsp_dev_attr - OMAP McBSP device attributes for omap_hwmod
481 * @sidetone: name of the sidetone device
482 */
483struct omap_mcbsp_dev_attr {
484 const char *sidetone;
485};
486
478extern struct omap_mcbsp **mcbsp_ptr; 487extern struct omap_mcbsp **mcbsp_ptr;
479extern int omap_mcbsp_count, omap_mcbsp_cache_size; 488extern int omap_mcbsp_count, omap_mcbsp_cache_size;
480 489