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: 1489321 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id B9B343FE65 for ; Fri, 21 Sep 2012 05:14:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753310Ab2IUFO0 (ORCPT ); Fri, 21 Sep 2012 01:14:26 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:59837 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752819Ab2IUFOY (ORCPT ); Fri, 21 Sep 2012 01:14:24 -0400 Received: by qcro28 with SMTP id o28so2325431qcr.19 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=chXp4qp4aAlS5v6M9tDUYD+Ec/ySH0JVj0uwlWf7+RJ0GQRVL+vuxD5V4kaNM6sPs4 LXEUB8f63JJRoOJip6biTcGpS3DRhp0ZbXsw4gnKMWtXkb5Js79lqdMATJMwCCrKR4iC fM1CBwDeeJ1sqsU26loT3BYDiU5xRo9iBHer7FNAQC+8XPg1m267Gx2PGQXhsN/B0wA1 SSY2VDmgyT4BH4nVmpGMmAdS5VQmj+hnq8f+QXd1H2BQWpNANRJji+8eWhvc6lwuZ06M 80afU9xZQJPRIBFmNHg4hQRI7yGPpMwCZRBoIoRPUfi5WE1JQqyQRkoj9vOn+nc/7Pnk g7kQ== 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 Cc: Ido Yariv 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: ALoCoQlB2wGW4QIhII2FqQ+y1qspbJ8AKUVa2agbWxH7lpCIX06hhSMueHzqhuMQv0KXd+HXXEn6 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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))