From patchwork Fri Sep 21 05:14:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Yariv X-Patchwork-Id: 1489381 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 08D2B3FE65 for ; Fri, 21 Sep 2012 05:16:28 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEvZN-0001eV-SX; Fri, 21 Sep 2012 05:14:29 +0000 Received: from mail-qc0-f177.google.com ([209.85.216.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TEvZK-0001dY-JJ for linux-arm-kernel@lists.infradead.org; Fri, 21 Sep 2012 05:14:27 +0000 Received: by qcsu28 with SMTP id u28so2494578qcs.36 for ; Thu, 20 Sep 2012 22:14:24 -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:x-gm-message-state; bh=BYUQslRAoo09BkegvSLFCl5zqSsX9OLp5HQWnJNG4dk=; b=M7M8laX/QvMZLYrDdRRFcVc2AfV5gRX0YxVzMbSQeEOjz1rL7LxYNX6DJ6slICX/en gNvBsKFTwyj1Ec54iA/0syeuac6malg76LuyZfR526Z/fuUsfRDSppJczvKRw9ZiP42P 6PaCmG6aWoe7aMwRObPM2DwV6oZUs9LqB5LRp1LG/1QHnHFsV2TsWimQc4MCAkr6PyMH I9eHM77+2sveEF1JzYRB82gzvHyjYNFMGZiVmWvs1A5qvcgVhMxyW9UTR9cOVTTJN7JH wY7R6ZoKp4lnMMbU+fQmgy9R9keAcdY15Chi+FWutkFxRDn7CrnxOy4wZKHTfWaFeKBt S1Kg== Received: by 10.229.114.215 with SMTP id f23mr2229401qcq.93.1348204463898; Thu, 20 Sep 2012 22:14:23 -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 b5sm7134328qao.13.2012.09.20.22.14.22 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 22:14:23 -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 1/3] [media] omap3isp: Fix compilation error in ispreg.h Date: Fri, 21 Sep 2012 01:14:06 -0400 Message-Id: <1348204448-30855-1-git-send-email-ido@wizery.com> X-Mailer: git-send-email 1.7.11.4 X-Gm-Message-State: ALoCoQkUr853eEVfT9iIoDaIVVgSGAjqBXc5MTUgcDmIRpzLeVLTd9sooQfNb6Fei0FB3M+9o09f 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.177 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 --- 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))