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: 1532831 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2EED0DFE80 for ; Mon, 1 Oct 2012 22:46:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753180Ab2JAWqw (ORCPT ); Mon, 1 Oct 2012 18:46:52 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:37452 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751434Ab2JAWqv (ORCPT ); Mon, 1 Oct 2012 18:46:51 -0400 Received: by qchd3 with SMTP id d3so4134460qch.19 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=aegW8wc0cbc+ZeCqvvQGA3Q0m/oPhljnjuqopYfLqQUVDgCekTVms4R90JSJXHL2WG 9x71MDHuhZKjW/ieb49X46/nQqyY0rt/CM/UV8yIWoGau9Kjnnx3jXkYEv5gyfmeGp+4 w1ovX3byvKir18xKKXvzaYx6+wdZM6Ys0DMS/zD1AJgFIHhi39qp8AqazNNnvDTl2ZhD YIvZEkTeakqXaqi0cahWIPhaBHN+KQ0aGLrJA3DlKKOCgmPjrDDkUb/GdMqc1t4nV2OS szOlpRpV4kiSAU2QiV5Zbv3olKyY7K/lC7WKZD+UYEirzY8CugWL5K9IEmA8XWFNxTO8 /3gw== 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 Cc: Ido Yariv 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: ALoCoQlVeD40camMKMrXts4fw5/mBxOwh6Bmx0gCvnQGaf/oqlOYI25QvThVDvt4c9fVg3ZTt595 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 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))