mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 14:27:48 +00:00
Koen Kooi
100 lines
3.9 KiB
Diff
100 lines
3.9 KiB
Diff
From 0fe8d5d2b4d1e48bf2ef9b5803636dc68c91b5f2 Mon Sep 17 00:00:00 2001
|
|
From: Tuukka Toivonen <tuukka.o.toivonen@nokia.com>
|
|
Date: Tue, 2 Feb 2010 16:17:33 +0200
|
|
Subject: [PATCH 39/43] ARM: OMAP3: Update Camera ISP definitions for OMAP3630
|
|
|
|
Add new/changed base address definitions and resources for
|
|
OMAP3630 ISP.
|
|
|
|
The OMAP3430 CSI2PHY block is same as the OMAP3630 CSIPHY2
|
|
block. But the later name is chosen as it gives more symmetry
|
|
to the names.
|
|
|
|
Signed-off-by: Tuukka Toivonen <tuukka.o.toivonen@nokia.com>
|
|
Signed-off-by: Vimarsh Zutshi <vimarsh.zutshi@nokia.com>
|
|
Acked-by: Tony Lindgren <tony@atomide.com>
|
|
---
|
|
arch/arm/mach-omap2/devices.c | 28 ++++++++++++++++++++++++----
|
|
arch/arm/plat-omap/include/plat/omap34xx.h | 16 ++++++++++++----
|
|
2 files changed, 36 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
|
|
index 381f4eb..40c64b9 100644
|
|
--- a/arch/arm/mach-omap2/devices.c
|
|
+++ b/arch/arm/mach-omap2/devices.c
|
|
@@ -109,13 +109,33 @@ static struct resource omap3isp_resources[] = {
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
- .start = OMAP3430_ISP_CSI2A_BASE,
|
|
- .end = OMAP3430_ISP_CSI2A_END,
|
|
+ .start = OMAP3430_ISP_CSI2A_REGS1_BASE,
|
|
+ .end = OMAP3430_ISP_CSI2A_REGS1_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
- .start = OMAP3430_ISP_CSI2PHY_BASE,
|
|
- .end = OMAP3430_ISP_CSI2PHY_END,
|
|
+ .start = OMAP3430_ISP_CSIPHY2_BASE,
|
|
+ .end = OMAP3430_ISP_CSIPHY2_END,
|
|
+ .flags = IORESOURCE_MEM,
|
|
+ },
|
|
+ {
|
|
+ .start = OMAP3630_ISP_CSI2A_REGS2_BASE,
|
|
+ .end = OMAP3630_ISP_CSI2A_REGS2_END,
|
|
+ .flags = IORESOURCE_MEM,
|
|
+ },
|
|
+ {
|
|
+ .start = OMAP3630_ISP_CSI2C_REGS1_BASE,
|
|
+ .end = OMAP3630_ISP_CSI2C_REGS1_END,
|
|
+ .flags = IORESOURCE_MEM,
|
|
+ },
|
|
+ {
|
|
+ .start = OMAP3630_ISP_CSIPHY1_BASE,
|
|
+ .end = OMAP3630_ISP_CSIPHY1_END,
|
|
+ .flags = IORESOURCE_MEM,
|
|
+ },
|
|
+ {
|
|
+ .start = OMAP3630_ISP_CSI2C_REGS2_BASE,
|
|
+ .end = OMAP3630_ISP_CSI2C_REGS2_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
diff --git a/arch/arm/plat-omap/include/plat/omap34xx.h b/arch/arm/plat-omap/include/plat/omap34xx.h
|
|
index 98fc8b4..b9e8588 100644
|
|
--- a/arch/arm/plat-omap/include/plat/omap34xx.h
|
|
+++ b/arch/arm/plat-omap/include/plat/omap34xx.h
|
|
@@ -56,8 +56,12 @@
|
|
#define OMAP3430_ISP_RESZ_BASE (OMAP3430_ISP_BASE + 0x1000)
|
|
#define OMAP3430_ISP_SBL_BASE (OMAP3430_ISP_BASE + 0x1200)
|
|
#define OMAP3430_ISP_MMU_BASE (OMAP3430_ISP_BASE + 0x1400)
|
|
-#define OMAP3430_ISP_CSI2A_BASE (OMAP3430_ISP_BASE + 0x1800)
|
|
-#define OMAP3430_ISP_CSI2PHY_BASE (OMAP3430_ISP_BASE + 0x1970)
|
|
+#define OMAP3430_ISP_CSI2A_REGS1_BASE (OMAP3430_ISP_BASE + 0x1800)
|
|
+#define OMAP3430_ISP_CSIPHY2_BASE (OMAP3430_ISP_BASE + 0x1970)
|
|
+#define OMAP3630_ISP_CSI2A_REGS2_BASE (OMAP3430_ISP_BASE + 0x19C0)
|
|
+#define OMAP3630_ISP_CSI2C_REGS1_BASE (OMAP3430_ISP_BASE + 0x1C00)
|
|
+#define OMAP3630_ISP_CSIPHY1_BASE (OMAP3430_ISP_BASE + 0x1D70)
|
|
+#define OMAP3630_ISP_CSI2C_REGS2_BASE (OMAP3430_ISP_BASE + 0x1DC0)
|
|
|
|
#define OMAP3430_ISP_END (OMAP3430_ISP_BASE + 0x06F)
|
|
#define OMAP3430_ISP_CBUFF_END (OMAP3430_ISP_CBUFF_BASE + 0x077)
|
|
@@ -69,8 +73,12 @@
|
|
#define OMAP3430_ISP_RESZ_END (OMAP3430_ISP_RESZ_BASE + 0x0AB)
|
|
#define OMAP3430_ISP_SBL_END (OMAP3430_ISP_SBL_BASE + 0x0FB)
|
|
#define OMAP3430_ISP_MMU_END (OMAP3430_ISP_MMU_BASE + 0x06F)
|
|
-#define OMAP3430_ISP_CSI2A_END (OMAP3430_ISP_CSI2A_BASE + 0x16F)
|
|
-#define OMAP3430_ISP_CSI2PHY_END (OMAP3430_ISP_CSI2PHY_BASE + 0x007)
|
|
+#define OMAP3430_ISP_CSI2A_REGS1_END (OMAP3430_ISP_CSI2A_REGS1_BASE + 0x16F)
|
|
+#define OMAP3430_ISP_CSIPHY2_END (OMAP3430_ISP_CSIPHY2_BASE + 0x00B)
|
|
+#define OMAP3630_ISP_CSI2A_REGS2_END (OMAP3630_ISP_CSI2A_REGS2_BASE + 0x3F)
|
|
+#define OMAP3630_ISP_CSI2C_REGS1_END (OMAP3630_ISP_CSI2C_REGS1_BASE + 0x16F)
|
|
+#define OMAP3630_ISP_CSIPHY1_END (OMAP3630_ISP_CSIPHY1_BASE + 0x00B)
|
|
+#define OMAP3630_ISP_CSI2C_REGS2_END (OMAP3630_ISP_CSI2C_REGS2_BASE + 0x3F)
|
|
|
|
#define OMAP34XX_HSUSB_OTG_BASE (L4_34XX_BASE + 0xAB000)
|
|
#define OMAP34XX_USBTLL_BASE (L4_34XX_BASE + 0x62000)
|
|
--
|
|
1.6.6.1
|
|
|