diff options
author | Kishon Vijay Abraham I <kishon@ti.com> | 2011-02-24 04:46:50 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-02-24 16:02:13 -0500 |
commit | cb7e9ded3240d717d1d24812d33b3ef2c98c084e (patch) | |
tree | d0712c16098649b059882954b9fa7e93fbdb45a8 /arch/arm/plat-omap | |
parent | dc48e5fc782f8d447aae2e82ba7453ddcf32c617 (diff) |
OMAP4: hwmod: Naming of address space
Added a name to address space belonging to SDMA and MPU facilitating
the driver to get the address space info by name. Added a revision
member inorder to facilitate the driver to differentiate between
mcbsp in different omap.
Also added a platform_get_irq in probe to get irq number by index since
from OMAP4, there will be a single irq line.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/include/plat/mcbsp.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h index f084b6acfbf2..afcbb7bb0165 100644 --- a/arch/arm/plat-omap/include/plat/mcbsp.h +++ b/arch/arm/plat-omap/include/plat/mcbsp.h | |||
@@ -39,6 +39,7 @@ static struct platform_device omap_mcbsp##port_nr = { \ | |||
39 | 39 | ||
40 | #define MCBSP_CONFIG_TYPE2 0x2 | 40 | #define MCBSP_CONFIG_TYPE2 0x2 |
41 | #define MCBSP_CONFIG_TYPE3 0x3 | 41 | #define MCBSP_CONFIG_TYPE3 0x3 |
42 | #define MCBSP_CONFIG_TYPE4 0x4 | ||
42 | 43 | ||
43 | #define OMAP7XX_MCBSP1_BASE 0xfffb1000 | 44 | #define OMAP7XX_MCBSP1_BASE 0xfffb1000 |
44 | #define OMAP7XX_MCBSP2_BASE 0xfffb1800 | 45 | #define OMAP7XX_MCBSP2_BASE 0xfffb1800 |
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 5f25ae5f9c1d..62bd073b0f8f 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c | |||
@@ -1812,6 +1812,10 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev) | |||
1812 | mcbsp->tx_irq = platform_get_irq_byname(pdev, "tx"); | 1812 | mcbsp->tx_irq = platform_get_irq_byname(pdev, "tx"); |
1813 | mcbsp->rx_irq = platform_get_irq_byname(pdev, "rx"); | 1813 | mcbsp->rx_irq = platform_get_irq_byname(pdev, "rx"); |
1814 | 1814 | ||
1815 | /* From OMAP4 there will be a single irq line */ | ||
1816 | if (mcbsp->tx_irq == -ENXIO) | ||
1817 | mcbsp->tx_irq = platform_get_irq(pdev, 0); | ||
1818 | |||
1815 | res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx"); | 1819 | res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx"); |
1816 | if (!res) { | 1820 | if (!res) { |
1817 | dev_err(&pdev->dev, "%s:mcbsp%d has invalid rx DMA channel\n", | 1821 | dev_err(&pdev->dev, "%s:mcbsp%d has invalid rx DMA channel\n", |