From: Kishon Vijay Abraham I <kishon@ti.com>
To: linux-omap@vger.kernel.org, alsa-devel@alsa-project.org
Cc: lrg@slimlogic.co.uk, broonie@opensource.wolfsonmicro.com,
paul@pwsan.com, charu@ti.com, shubhrajyoti@ti.com,
b-cousson@ti.com, khilman@deeprootsystems.com, p-basak2@ti.com,
Kishon Vijay Abraham I <kishon@ti.com>
Subject: [PATCH v2 13/13] OMAP: hwmod: Removal of macros for data that is obtained from hwmod database
Date: Mon, 31 Jan 2011 20:20:37 +0530 [thread overview]
Message-ID: <1296485437-12806-14-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1296485437-12806-1-git-send-email-kishon@ti.com>
Information like base address and DMA channel nubers should no longer
be obtained using macros. These information should be obtained from
hwmod database. Hence the macros that define the base address are removed.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Charulatha V <charu@ti.com>
---
arch/arm/mach-omap1/mcbsp.c | 64 +++++++++++++++---------------
arch/arm/plat-omap/include/plat/mcbsp.h | 50 +-----------------------
2 files changed, 33 insertions(+), 81 deletions(-)
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index 2b89ebd..d90f649 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -83,14 +83,14 @@ struct resource omap7xx_mcbsp_res[][6] = {
{
{
.name = "mpu",
- .start = OMAP7XX_MCBSP1_BASE,
- .end = OMAP7XX_MCBSP1_BASE + SZ_256,
+ .start = 0xfffb1000,
+ .end = 0xfffb10ff,
.flags = IORESOURCE_MEM,
},
{
.name = "dma",
- .start = OMAP7XX_MCBSP1_BASE,
- .end = OMAP7XX_MCBSP1_BASE + SZ_256,
+ .start = 0xfffb1000,
+ .end = 0xfffb10ff,
.flags = IORESOURCE_MEM,
},
{
@@ -117,14 +117,14 @@ struct resource omap7xx_mcbsp_res[][6] = {
{
{
.name = "mpu",
- .start = OMAP7XX_MCBSP2_BASE,
- .end = OMAP7XX_MCBSP2_BASE + SZ_256,
+ .start = 0xfffb1800,
+ .end = 0xfffb18ff,
.flags = IORESOURCE_MEM,
},
{
.name = "dma",
- .start = OMAP7XX_MCBSP2_BASE,
- .end = OMAP7XX_MCBSP2_BASE + SZ_256,
+ .start = 0xfffb1800,
+ .end = 0xfffb18ff,
.flags = IORESOURCE_MEM,
},
{
@@ -172,14 +172,14 @@ struct resource omap15xx_mcbsp_res[][6] = {
{
{
.name = "mpu",
- .start = OMAP1510_MCBSP1_BASE,
- .end = OMAP1510_MCBSP1_BASE + SZ_256,
+ .start = 0xe1011800,
+ .end = 0xe10118ff,
.flags = IORESOURCE_MEM,
},
{
.name = "dma",
- .start = OMAP1510_MCBSP1_BASE,
- .end = OMAP1510_MCBSP1_BASE + SZ_256,
+ .start = 0xe1011800,
+ .end = 0xe10118ff,
.flags = IORESOURCE_MEM,
},
{
@@ -206,14 +206,14 @@ struct resource omap15xx_mcbsp_res[][6] = {
{
{
.name = "mpu",
- .start = OMAP1510_MCBSP2_BASE,
- .end = OMAP1510_MCBSP2_BASE + SZ_256,
+ .start = 0xfffb1000,
+ .end = 0xfffb10ff,
.flags = IORESOURCE_MEM,
},
{
.name = "dma",
- .start = OMAP1510_MCBSP2_BASE,
- .end = OMAP1510_MCBSP2_BASE + SZ_256,
+ .start = 0xfffb1000,
+ .end = 0xfffb10ff,
.flags = IORESOURCE_MEM,
},
{
@@ -240,14 +240,14 @@ struct resource omap15xx_mcbsp_res[][6] = {
{
{
.name = "mpu",
- .start = OMAP1510_MCBSP3_BASE,
- .end = OMAP1510_MCBSP3_BASE + SZ_256,
+ .start = 0xe1017000,
+ .end = 0xe10170ff,
.flags = IORESOURCE_MEM,
},
{
.name = "dma",
- .start = OMAP1510_MCBSP3_BASE,
- .end = OMAP1510_MCBSP3_BASE + SZ_256,
+ .start = 0xe1017000,
+ .end = 0xe10170ff,
.flags = IORESOURCE_MEM,
},
{
@@ -298,14 +298,14 @@ struct resource omap16xx_mcbsp_res[][6] = {
{
{
.name = "mpu",
- .start = OMAP1610_MCBSP1_BASE,
- .end = OMAP1610_MCBSP1_BASE + SZ_256,
+ .start = 0xe1011800,
+ .end = 0xe10118ff,
.flags = IORESOURCE_MEM,
},
{
.name = "dma",
- .start = OMAP1610_MCBSP1_BASE,
- .end = OMAP1610_MCBSP1_BASE + SZ_256,
+ .start = 0xe1011800,
+ .end = 0xe10118ff,
.flags = IORESOURCE_MEM,
},
{
@@ -332,14 +332,14 @@ struct resource omap16xx_mcbsp_res[][6] = {
{
{
.name = "mpu",
- .start = OMAP1610_MCBSP2_BASE,
- .end = OMAP1610_MCBSP2_BASE + SZ_256,
+ .start = 0xfffb1000,
+ .end = 0xfffb10ff,
.flags = IORESOURCE_MEM,
},
{
.name = "dma",
- .start = OMAP1610_MCBSP2_BASE,
- .end = OMAP1610_MCBSP2_BASE + SZ_256,
+ .start = 0xfffb1000,
+ .end = 0xfffb10ff,
.flags = IORESOURCE_MEM,
},
{
@@ -366,14 +366,14 @@ struct resource omap16xx_mcbsp_res[][6] = {
{
{
.name = "mpu",
- .start = OMAP1610_MCBSP3_BASE,
- .end = OMAP1610_MCBSP3_BASE + SZ_256,
+ .start = 0xe1017000,
+ .end = 0xe10170ff,
.flags = IORESOURCE_MEM,
},
{
.name = "dma",
- .start = OMAP1610_MCBSP3_BASE,
- .end = OMAP1610_MCBSP3_BASE + SZ_256,
+ .start = 0xe1017000,
+ .end = 0xe10170ff,
.flags = IORESOURCE_MEM,
},
{
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index 54058a3..2c827ef 100644
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -41,41 +41,7 @@ static struct platform_device omap_mcbsp##port_nr = { \
#define MCBSP_CONFIG_TYPE3 0x3
#define MCBSP_CONFIG_TYPE4 0x4
-#define OMAP7XX_MCBSP1_BASE 0xfffb1000
-#define OMAP7XX_MCBSP2_BASE 0xfffb1800
-
-#define OMAP1510_MCBSP1_BASE 0xe1011800
-#define OMAP1510_MCBSP2_BASE 0xfffb1000
-#define OMAP1510_MCBSP3_BASE 0xe1017000
-
-#define OMAP1610_MCBSP1_BASE 0xe1011800
-#define OMAP1610_MCBSP2_BASE 0xfffb1000
-#define OMAP1610_MCBSP3_BASE 0xe1017000
-
-#define OMAP24XX_MCBSP1_BASE 0x48074000
-#define OMAP24XX_MCBSP2_BASE 0x48076000
-#define OMAP2430_MCBSP3_BASE 0x4808c000
-#define OMAP2430_MCBSP4_BASE 0x4808e000
-#define OMAP2430_MCBSP5_BASE 0x48096000
-
-#define OMAP34XX_MCBSP1_BASE 0x48074000
-#define OMAP34XX_MCBSP2_BASE 0x49022000
-#define OMAP34XX_MCBSP2_ST_BASE 0x49028000
-#define OMAP34XX_MCBSP3_BASE 0x49024000
-#define OMAP34XX_MCBSP3_ST_BASE 0x4902A000
-#define OMAP34XX_MCBSP3_BASE 0x49024000
-#define OMAP34XX_MCBSP4_BASE 0x49026000
-#define OMAP34XX_MCBSP5_BASE 0x48096000
-
-#define OMAP44XX_MCBSP1_BASE 0x40122000
-#define OMAP44XX_MCBSP1_DMA_BASE 0x49022000
-#define OMAP44XX_MCBSP2_BASE 0x40124000
-#define OMAP44XX_MCBSP2_DMA_BASE 0x49024000
-#define OMAP44XX_MCBSP3_BASE 0x40126000
-#define OMAP44XX_MCBSP3_DMA_BASE 0x49026000
-#define OMAP44XX_MCBSP4_BASE 0x48096000
-
-#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
+#ifdef CONFIG_ARCH_OMAP1
#define OMAP_MCBSP_REG_DRR2 0x00
#define OMAP_MCBSP_REG_DRR1 0x02
@@ -115,13 +81,6 @@ static struct platform_device omap_mcbsp##port_nr = { \
#define OMAP_MCBSP_REG_XCCR 0x00
#define OMAP_MCBSP_REG_RCCR 0x00
-#define AUDIO_MCBSP_DATAWRITE (OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1)
-#define AUDIO_MCBSP_DATAREAD (OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1)
-
-#define AUDIO_MCBSP OMAP_MCBSP1
-#define AUDIO_DMA_TX OMAP_DMA_MCBSP1_TX
-#define AUDIO_DMA_RX OMAP_DMA_MCBSP1_RX
-
#else
#define OMAP_MCBSP_REG_DRR2 0x00
@@ -177,13 +136,6 @@ static struct platform_device omap_mcbsp##port_nr = { \
#define OMAP_ST_REG_SFIRCR 0x28
#define OMAP_ST_REG_SSELCR 0x2C
-#define AUDIO_MCBSP_DATAWRITE (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DXR1)
-#define AUDIO_MCBSP_DATAREAD (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1)
-
-#define AUDIO_MCBSP OMAP_MCBSP2
-#define AUDIO_DMA_TX OMAP24XX_DMA_MCBSP2_TX
-#define AUDIO_DMA_RX OMAP24XX_DMA_MCBSP2_RX
-
#endif
/************************** McBSP SPCR1 bit definitions ***********************/
--
1.7.0.4
next prev parent reply other threads:[~2011-01-31 14:50 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-31 14:50 [PATCH v2 00/13] OMAP: McBSP: hwmod adaptation and runtime conversion Kishon Vijay Abraham I
2011-01-31 14:50 ` [PATCH v2 01/13] OMAP: hwmod: Add member 'name' to omap_hwmod_addr_space struct Kishon Vijay Abraham I
2011-02-04 19:45 ` Kevin Hilman
2011-02-04 20:21 ` Cousson, Benoit
2011-02-04 22:16 ` Kevin Hilman
2011-02-07 6:02 ` ABRAHAM, KISHON VIJAY
2011-02-09 21:14 ` Paul Walmsley
2011-01-31 14:50 ` [PATCH v2 02/13] OMAP: McBSP: Convert McBSP to platform device model Kishon Vijay Abraham I
2011-02-01 12:33 ` Peter Ujfalusi
2011-01-31 14:50 ` [PATCH v2 03/13] OMAP2420: hwmod data: Add McBSP Kishon Vijay Abraham I
2011-01-31 14:50 ` [PATCH v2 04/13] OMAP2430: " Kishon Vijay Abraham I
2011-02-01 12:39 ` Peter Ujfalusi
2011-01-31 14:50 ` [PATCH v2 05/13] OMAP3: " Kishon Vijay Abraham I
2011-01-31 14:50 ` [PATCH v2 06/13] OMAP4: " Kishon Vijay Abraham I
2011-02-14 14:45 ` Cousson, Benoit
2011-01-31 14:50 ` [PATCH v2 07/13] OMAP3: hwmod: add dev_attr for McBSP sidetone Kishon Vijay Abraham I
2011-01-31 14:50 ` [PATCH v2 08/13] OMAP2+: McBSP: hwmod adaptation for McBSP Kishon Vijay Abraham I
2011-02-01 12:22 ` Peter Ujfalusi
2011-02-01 17:44 ` [alsa-devel] " Jarkko Nikula
2011-02-02 6:23 ` ABRAHAM, KISHON VIJAY
2011-02-17 23:41 ` Tony Lindgren
2011-02-18 8:08 ` Jarkko Nikula
2011-02-18 8:20 ` ABRAHAM, KISHON VIJAY
2011-01-31 14:50 ` [PATCH v2 09/13] OMAP: McBSP: use omap_device APIs to modify SYSCONFIG Kishon Vijay Abraham I
2011-02-01 12:19 ` Peter Ujfalusi
2011-02-01 13:47 ` ABRAHAM, KISHON VIJAY
2011-01-31 14:50 ` [PATCH v2 10/13] OMAP: McBSP: Add pm runtime support Kishon Vijay Abraham I
2011-01-31 14:50 ` [PATCH v2 11/13] OMAP: McBSP: APIs to pass DMA params from McBSP driver to client drivers Kishon Vijay Abraham I
2011-01-31 14:50 ` [PATCH v2 12/13] ASoC: McBSP: get hw params from McBSP driver Kishon Vijay Abraham I
2011-01-31 17:16 ` Mark Brown
2011-01-31 14:50 ` Kishon Vijay Abraham I [this message]
2011-02-01 18:07 ` [PATCH v2 13/13] OMAP: hwmod: Removal of macros for data that is obtained from hwmod database Jarkko Nikula
2011-02-02 6:15 ` ABRAHAM, KISHON VIJAY
2011-02-01 17:53 ` [PATCH v2 00/13] OMAP: McBSP: hwmod adaptation and runtime conversion Jarkko Nikula
2011-02-01 17:58 ` [alsa-devel] " Liam Girdwood
2011-02-01 19:44 ` Peter Ujfalusi
2011-02-01 21:27 ` Mark Brown
2011-02-09 18:22 ` Tony Lindgren
2011-02-04 19:47 ` Kevin Hilman
2011-02-04 21:42 ` Kevin Hilman
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=1296485437-12806-14-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=b-cousson@ti.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=charu@ti.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@slimlogic.co.uk \
--cc=p-basak2@ti.com \
--cc=paul@pwsan.com \
--cc=shubhrajyoti@ti.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;
as well as URLs for NNTP newsgroup(s).