diff options
Diffstat (limited to 'extras/recipes-kernel/linux/linux-omap/media/0039-ARM-OMAP3-Update-Camera-ISP-definitions-for-OMAP3630.patch')
| -rw-r--r-- | extras/recipes-kernel/linux/linux-omap/media/0039-ARM-OMAP3-Update-Camera-ISP-definitions-for-OMAP3630.patch | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/extras/recipes-kernel/linux/linux-omap/media/0039-ARM-OMAP3-Update-Camera-ISP-definitions-for-OMAP3630.patch b/extras/recipes-kernel/linux/linux-omap/media/0039-ARM-OMAP3-Update-Camera-ISP-definitions-for-OMAP3630.patch new file mode 100644 index 00000000..73f40d79 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap/media/0039-ARM-OMAP3-Update-Camera-ISP-definitions-for-OMAP3630.patch | |||
| @@ -0,0 +1,99 @@ | |||
| 1 | From 0fe8d5d2b4d1e48bf2ef9b5803636dc68c91b5f2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Tuukka Toivonen <tuukka.o.toivonen@nokia.com> | ||
| 3 | Date: Tue, 2 Feb 2010 16:17:33 +0200 | ||
| 4 | Subject: [PATCH 39/43] ARM: OMAP3: Update Camera ISP definitions for OMAP3630 | ||
| 5 | |||
| 6 | Add new/changed base address definitions and resources for | ||
| 7 | OMAP3630 ISP. | ||
| 8 | |||
| 9 | The OMAP3430 CSI2PHY block is same as the OMAP3630 CSIPHY2 | ||
| 10 | block. But the later name is chosen as it gives more symmetry | ||
| 11 | to the names. | ||
| 12 | |||
| 13 | Signed-off-by: Tuukka Toivonen <tuukka.o.toivonen@nokia.com> | ||
| 14 | Signed-off-by: Vimarsh Zutshi <vimarsh.zutshi@nokia.com> | ||
| 15 | Acked-by: Tony Lindgren <tony@atomide.com> | ||
| 16 | --- | ||
| 17 | arch/arm/mach-omap2/devices.c | 28 ++++++++++++++++++++++++---- | ||
| 18 | arch/arm/plat-omap/include/plat/omap34xx.h | 16 ++++++++++++---- | ||
| 19 | 2 files changed, 36 insertions(+), 8 deletions(-) | ||
| 20 | |||
| 21 | diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c | ||
| 22 | index 381f4eb..40c64b9 100644 | ||
| 23 | --- a/arch/arm/mach-omap2/devices.c | ||
| 24 | +++ b/arch/arm/mach-omap2/devices.c | ||
| 25 | @@ -109,13 +109,33 @@ static struct resource omap3isp_resources[] = { | ||
| 26 | .flags = IORESOURCE_MEM, | ||
| 27 | }, | ||
| 28 | { | ||
| 29 | - .start = OMAP3430_ISP_CSI2A_BASE, | ||
| 30 | - .end = OMAP3430_ISP_CSI2A_END, | ||
| 31 | + .start = OMAP3430_ISP_CSI2A_REGS1_BASE, | ||
| 32 | + .end = OMAP3430_ISP_CSI2A_REGS1_END, | ||
| 33 | .flags = IORESOURCE_MEM, | ||
| 34 | }, | ||
| 35 | { | ||
| 36 | - .start = OMAP3430_ISP_CSI2PHY_BASE, | ||
| 37 | - .end = OMAP3430_ISP_CSI2PHY_END, | ||
| 38 | + .start = OMAP3430_ISP_CSIPHY2_BASE, | ||
| 39 | + .end = OMAP3430_ISP_CSIPHY2_END, | ||
| 40 | + .flags = IORESOURCE_MEM, | ||
| 41 | + }, | ||
| 42 | + { | ||
| 43 | + .start = OMAP3630_ISP_CSI2A_REGS2_BASE, | ||
| 44 | + .end = OMAP3630_ISP_CSI2A_REGS2_END, | ||
| 45 | + .flags = IORESOURCE_MEM, | ||
| 46 | + }, | ||
| 47 | + { | ||
| 48 | + .start = OMAP3630_ISP_CSI2C_REGS1_BASE, | ||
| 49 | + .end = OMAP3630_ISP_CSI2C_REGS1_END, | ||
| 50 | + .flags = IORESOURCE_MEM, | ||
| 51 | + }, | ||
| 52 | + { | ||
| 53 | + .start = OMAP3630_ISP_CSIPHY1_BASE, | ||
| 54 | + .end = OMAP3630_ISP_CSIPHY1_END, | ||
| 55 | + .flags = IORESOURCE_MEM, | ||
| 56 | + }, | ||
| 57 | + { | ||
| 58 | + .start = OMAP3630_ISP_CSI2C_REGS2_BASE, | ||
| 59 | + .end = OMAP3630_ISP_CSI2C_REGS2_END, | ||
| 60 | .flags = IORESOURCE_MEM, | ||
| 61 | }, | ||
| 62 | { | ||
| 63 | diff --git a/arch/arm/plat-omap/include/plat/omap34xx.h b/arch/arm/plat-omap/include/plat/omap34xx.h | ||
| 64 | index 98fc8b4..b9e8588 100644 | ||
| 65 | --- a/arch/arm/plat-omap/include/plat/omap34xx.h | ||
| 66 | +++ b/arch/arm/plat-omap/include/plat/omap34xx.h | ||
| 67 | @@ -56,8 +56,12 @@ | ||
| 68 | #define OMAP3430_ISP_RESZ_BASE (OMAP3430_ISP_BASE + 0x1000) | ||
| 69 | #define OMAP3430_ISP_SBL_BASE (OMAP3430_ISP_BASE + 0x1200) | ||
| 70 | #define OMAP3430_ISP_MMU_BASE (OMAP3430_ISP_BASE + 0x1400) | ||
| 71 | -#define OMAP3430_ISP_CSI2A_BASE (OMAP3430_ISP_BASE + 0x1800) | ||
| 72 | -#define OMAP3430_ISP_CSI2PHY_BASE (OMAP3430_ISP_BASE + 0x1970) | ||
| 73 | +#define OMAP3430_ISP_CSI2A_REGS1_BASE (OMAP3430_ISP_BASE + 0x1800) | ||
| 74 | +#define OMAP3430_ISP_CSIPHY2_BASE (OMAP3430_ISP_BASE + 0x1970) | ||
| 75 | +#define OMAP3630_ISP_CSI2A_REGS2_BASE (OMAP3430_ISP_BASE + 0x19C0) | ||
| 76 | +#define OMAP3630_ISP_CSI2C_REGS1_BASE (OMAP3430_ISP_BASE + 0x1C00) | ||
| 77 | +#define OMAP3630_ISP_CSIPHY1_BASE (OMAP3430_ISP_BASE + 0x1D70) | ||
| 78 | +#define OMAP3630_ISP_CSI2C_REGS2_BASE (OMAP3430_ISP_BASE + 0x1DC0) | ||
| 79 | |||
| 80 | #define OMAP3430_ISP_END (OMAP3430_ISP_BASE + 0x06F) | ||
| 81 | #define OMAP3430_ISP_CBUFF_END (OMAP3430_ISP_CBUFF_BASE + 0x077) | ||
| 82 | @@ -69,8 +73,12 @@ | ||
| 83 | #define OMAP3430_ISP_RESZ_END (OMAP3430_ISP_RESZ_BASE + 0x0AB) | ||
| 84 | #define OMAP3430_ISP_SBL_END (OMAP3430_ISP_SBL_BASE + 0x0FB) | ||
| 85 | #define OMAP3430_ISP_MMU_END (OMAP3430_ISP_MMU_BASE + 0x06F) | ||
| 86 | -#define OMAP3430_ISP_CSI2A_END (OMAP3430_ISP_CSI2A_BASE + 0x16F) | ||
| 87 | -#define OMAP3430_ISP_CSI2PHY_END (OMAP3430_ISP_CSI2PHY_BASE + 0x007) | ||
| 88 | +#define OMAP3430_ISP_CSI2A_REGS1_END (OMAP3430_ISP_CSI2A_REGS1_BASE + 0x16F) | ||
| 89 | +#define OMAP3430_ISP_CSIPHY2_END (OMAP3430_ISP_CSIPHY2_BASE + 0x00B) | ||
| 90 | +#define OMAP3630_ISP_CSI2A_REGS2_END (OMAP3630_ISP_CSI2A_REGS2_BASE + 0x3F) | ||
| 91 | +#define OMAP3630_ISP_CSI2C_REGS1_END (OMAP3630_ISP_CSI2C_REGS1_BASE + 0x16F) | ||
| 92 | +#define OMAP3630_ISP_CSIPHY1_END (OMAP3630_ISP_CSIPHY1_BASE + 0x00B) | ||
| 93 | +#define OMAP3630_ISP_CSI2C_REGS2_END (OMAP3630_ISP_CSI2C_REGS2_BASE + 0x3F) | ||
| 94 | |||
| 95 | #define OMAP34XX_HSUSB_OTG_BASE (L4_34XX_BASE + 0xAB000) | ||
| 96 | #define OMAP34XX_USBTLL_BASE (L4_34XX_BASE + 0x62000) | ||
| 97 | -- | ||
| 98 | 1.6.6.1 | ||
| 99 | |||