From: ido@wizery.com (Ido Yariv)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] [media] omap3isp: Fix compilation error in ispreg.h
Date: Fri, 21 Sep 2012 01:14:06 -0400 [thread overview]
Message-ID: <1348204448-30855-1-git-send-email-ido@wizery.com> (raw)
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>
---
drivers/media/platform/omap3isp/ispreg.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/omap3isp/ispreg.h b/drivers/media/platform/omap3isp/ispreg.h
index 084ea77..e2c57f3 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))
--
1.7.11.4
next reply other threads:[~2012-09-21 5:14 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-21 5:14 Ido Yariv [this message]
2012-09-21 5:14 ` [PATCH 2/3] iommu/omap: Merge iommu2.h into iommu.h Ido Yariv
2012-09-27 19:53 ` Tony Lindgren
2012-09-27 19:55 ` Tony Lindgren
2012-09-30 17:04 ` Ido Yariv
2012-10-01 22:46 ` [PATCH v2 1/5] [media] omap3isp: Fix compilation error in ispreg.h Ido Yariv
2012-10-01 22:46 ` [PATCH v2 2/5] iommu/omap: Merge iommu2.h into iommu.h Ido Yariv
2012-10-02 16:40 ` Tony Lindgren
2012-10-01 22:46 ` [PATCH v2 3/5] iommu/omap: Make some definitions local Ido Yariv
2012-10-01 22:46 ` [PATCH v2 4/5] arm: omap: Move iommu/iovmm headers to platform_data Ido Yariv
2012-10-01 22:46 ` [PATCH v2 5/5] arm: omap: Move iopgtable header to drivers/iommu/ Ido Yariv
2012-10-02 16:31 ` [PATCH v2 1/5] [media] omap3isp: Fix compilation error in ispreg.h Tony Lindgren
2012-10-07 13:17 ` Mauro Carvalho Chehab
2012-10-08 21:30 ` Tony Lindgren
2012-10-12 1:07 ` Laurent Pinchart
2012-09-21 5:14 ` [PATCH 3/3] arm: omap: Move iommu/iovmm headers to platform_data Ido Yariv
2012-09-27 19:22 ` Mauro Carvalho Chehab
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=1348204448-30855-1-git-send-email-ido@wizery.com \
--to=ido@wizery.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).