From: Kishon Vijay Abraham I <kishon@ti.com>
To: linux-omap@vger.kernel.org
Cc: paul@pwsan.com, khilman@deeprootsystems.com, p-basak2@ti.com,
b-cousson@ti.com, kishon@ti.com
Subject: [PATCH v1 07/10] OMAP3: hwmod: add dev_attr for McBSP sidetone
Date: Tue, 21 Dec 2010 13:10:27 +0530 [thread overview]
Message-ID: <1292917231-13800-7-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1292917231-13800-1-git-send-email-kishon@ti.com>
Add device attribute for OMAP3 McBSP sidetone hwmod data
Discussions related to this change can be found in the following url:
https://patchwork.kernel.org/patch/233221/
Also add a revision member inorder to facilitate the driver to
differentiate between different cpu's.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 12 ++++++++++++
arch/arm/plat-omap/include/plat/mcbsp.h | 11 +++++++++++
2 files changed, 23 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 c9aa2c7..fed722f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -20,6 +20,7 @@
#include <plat/serial.h>
#include <plat/l4_3xxx.h>
#include <plat/i2c.h>
+#include <plat/mcbsp.h>
#include <plat/omap34xx.h>
#include "omap_hwmod_common_data.h"
@@ -763,6 +764,7 @@ static struct omap_hwmod_class_sysconfig omap3xxx_mcbsp_sysc = {
static struct omap_hwmod_class omap3xxx_mcbsp_hwmod_class = {
.name = "mcbsp",
.sysc = &omap3xxx_mcbsp_sysc,
+ .rev = OMAP_MCBSP_CPU_3,
};
/* mcbsp1 */
@@ -897,6 +899,10 @@ static struct omap_hwmod_ocp_if *omap3xxx_mcbsp2_slaves[] = {
&omap3xxx_l4_per__mcbsp2_dma,
};
+static struct omap_mcbsp_dev_attr omap34xx_mcbsp2_dev_attr = {
+ .sidetone = "mcbsp2_sidetone",
+};
+
static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {
.name = "mcbsp2",
.class = &omap3xxx_mcbsp_hwmod_class,
@@ -916,6 +922,7 @@ static struct omap_hwmod omap3xxx_mcbsp2_hwmod = {
},
.slaves = omap3xxx_mcbsp2_slaves,
.slaves_cnt = ARRAY_SIZE(omap3xxx_mcbsp2_slaves),
+ .dev_attr = &omap34xx_mcbsp2_dev_attr,
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
};
@@ -974,6 +981,10 @@ static struct omap_hwmod_ocp_if *omap3xxx_mcbsp3_slaves[] = {
&omap3xxx_l4_per__mcbsp3_dma,
};
+static struct omap_mcbsp_dev_attr omap34xx_mcbsp3_dev_attr = {
+ .sidetone = "mcbsp3_sidetone",
+};
+
static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {
.name = "mcbsp3",
.class = &omap3xxx_mcbsp_hwmod_class,
@@ -993,6 +1004,7 @@ static struct omap_hwmod omap3xxx_mcbsp3_hwmod = {
},
.slaves = omap3xxx_mcbsp3_slaves,
.slaves_cnt = ARRAY_SIZE(omap3xxx_mcbsp3_slaves),
+ .dev_attr = &omap34xx_mcbsp3_dev_attr,
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP3430),
};
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index e9bde6e..d8275f7 100644
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -37,6 +37,8 @@ static struct platform_device omap_mcbsp##port_nr = { \
.id = OMAP_MCBSP##port_nr, \
}
+#define OMAP_MCBSP_CPU_3 0x3
+
#define OMAP7XX_MCBSP1_BASE 0xfffb1000
#define OMAP7XX_MCBSP2_BASE 0xfffb1800
@@ -485,6 +487,15 @@ struct omap_mcbsp {
#endif
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 int omap_mcbsp_count, omap_mcbsp_cache_size;
--
1.7.0.4
next prev parent reply other threads:[~2010-12-21 7:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-21 7:40 [PATCH v1 01/10] OMAP: hwmod: Add member 'name' to omap_hwmod_addr_space struct Kishon Vijay Abraham I
2010-12-21 7:40 ` [PATCH v1 02/10] OMAP: McBSP: Convert McBSP to platform device model Kishon Vijay Abraham I
2010-12-23 9:29 ` Varadarajan, Charulatha
2010-12-21 7:40 ` [PATCH v1 03/10] OMAP2420: hwmod data: Add McBSP Kishon Vijay Abraham I
2010-12-21 7:40 ` [PATCH v1 04/10] OMAP2430: " Kishon Vijay Abraham I
2010-12-21 7:40 ` [PATCH v1 05/10] OMAP3: " Kishon Vijay Abraham I
2010-12-21 7:40 ` [PATCH v1 06/10] OMAP4: " Kishon Vijay Abraham I
2010-12-21 7:40 ` Kishon Vijay Abraham I [this message]
2010-12-21 7:40 ` [PATCH v1 08/10] OMAP2+: McBSP: hwmod adaptation for McBSP Kishon Vijay Abraham I
2010-12-21 7:40 ` [PATCH v1 09/10] OMAP: McBSP: use omap_device APIs to modify SYSCONFIG Kishon Vijay Abraham I
2011-01-04 7:35 ` Peter Ujfalusi
2011-01-04 9:34 ` ABRAHAM, KISHON VIJAY
[not found] ` <AANLkTinW4uEW1qOjBfXiwayi1mr=iygohxX5mtr9KwBo@mail.gmail.com>
2011-01-04 9:46 ` Peter Ujfalusi
2010-12-21 7:40 ` [PATCH v1 10/10] OMAP: McBSP: Add pm runtime support Kishon Vijay Abraham I
2010-12-21 7:40 ` [PATCH v1 00/10] OMAP: McBSP: hwmod adaptation and runtime conversion Kishon Vijay Abraham I
2010-12-22 15:42 ` Jarkko Nikula
2010-12-23 9:21 ` Varadarajan, Charulatha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1292917231-13800-7-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=b-cousson@ti.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-omap@vger.kernel.org \
--cc=p-basak2@ti.com \
--cc=paul@pwsan.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox