aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/omap3isp/ispreg.h
diff options
context:
space:
mode:
authorIdo Yariv <ido@wizery.com>2012-10-01 18:46:27 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-07 10:14:13 -0300
commit8a18382c3196978164f0f6290aac98f2f6f43c00 (patch)
treeec91493ca1d6c56fa7617950a410c12542f07260 /drivers/media/platform/omap3isp/ispreg.h
parentb45681a60ed52b3716f3faf79f81e55b81bc7335 (diff)
[media] omap3isp: Fix compilation error in ispreg.h
Commit c49f34bc ("ARM: OMAP2+ Move SoC specific headers to be local to mach-omap2") moved omap34xx.h to mach-omap2. This broke omap3isp, as it includes omap34xx.h. Instead of moving omap34xx to platform_data, simply add the two definitions the driver needs and remove the include altogether. Signed-off-by: Ido Yariv <ido@wizery.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/omap3isp/ispreg.h')
-rw-r--r--drivers/media/platform/omap3isp/ispreg.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/omap3isp/ispreg.h b/drivers/media/platform/omap3isp/ispreg.h
index 084ea77d65a7..e2c57f334c5d 100644
--- a/drivers/media/platform/omap3isp/ispreg.h
+++ b/drivers/media/platform/omap3isp/ispreg.h
@@ -27,13 +27,13 @@
#ifndef OMAP3_ISP_REG_H
#define OMAP3_ISP_REG_H
-#include <plat/omap34xx.h>
-
-
#define CM_CAM_MCLK_HZ 172800000 /* Hz */
/* ISP Submodules offset */
+#define L4_34XX_BASE 0x48000000
+#define OMAP3430_ISP_BASE (L4_34XX_BASE + 0xBC000)
+
#define OMAP3ISP_REG_BASE OMAP3430_ISP_BASE
#define OMAP3ISP_REG(offset) (OMAP3ISP_REG_BASE + (offset))

Privacy Policy