From patchwork Mon Oct 1 22:46:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Yariv X-Patchwork-Id: 1532931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id B8E7BDFFCF for ; Mon, 1 Oct 2012 22:49:51 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TIolR-00077R-TX; Mon, 01 Oct 2012 22:47:02 +0000 Received: from mail-qa0-f49.google.com ([209.85.216.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TIolJ-00076m-Hs for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2012 22:46:54 +0000 Received: by qaea17 with SMTP id a17so74797qae.15 for ; Mon, 01 Oct 2012 15:46:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=BYUQslRAoo09BkegvSLFCl5zqSsX9OLp5HQWnJNG4dk=; b=UhULXRuLakKcftZA31MN9NCihUtQuGS4CqSBsFzpp6D+7XouOj6sRDyQCH8ArvYvNU je0kkN0Ngtk1e4AplhFs2teO6de02A3KVjMtNWzNW22kypSk6M87+zMSLi+3bOH3LNa2 uOzI8a3+OHep/Dsft/X+Tw+9IvUM21Jq74LVvhItVExlYIO7vx9l444PjDXxuz8hMmS5 0ro+Jtzi0FU1vz3p25fs8ay6afp5m5WnwOlplO6MXFOwOMMIzEBgiVChd5T33pZLgAhp RwyAfZxAKGnQkNty/vTWHB6CgARqvys/1sh6Of1Un4XP+S6A7SqW60J9A654s6mEulGk rSIg== Received: by 10.224.180.83 with SMTP id bt19mr39917979qab.82.1349131610207; Mon, 01 Oct 2012 15:46:50 -0700 (PDT) Received: from localhost.localdomain (c-76-24-20-17.hsd1.ma.comcast.net. [76.24.20.17]) by mx.google.com with ESMTPS id f12sm599020qey.5.2012.10.01.15.46.48 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 15:46:49 -0700 (PDT) From: Ido Yariv To: Tony Lindgren , Russell King , Mauro Carvalho Chehab , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 1/5] [media] omap3isp: Fix compilation error in ispreg.h Date: Mon, 1 Oct 2012 18:46:27 -0400 Message-Id: <1349131591-10804-1-git-send-email-ido@wizery.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <20120927195526.GP4840@atomide.com> References: <20120927195526.GP4840@atomide.com> X-Gm-Message-State: ALoCoQnLnerhnO2drTBrMFmADRY/364i9CK/+wgC6u/JZdlCNusNngcRustJZzMdUMnhnuoaFUVz X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.216.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Ido Yariv X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 Acked-by: Tony Lindgren Acked-by: Mauro Carvalho Chehab --- 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 - - #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))