From patchwork Fri Nov 12 21:18:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aguirre Rodriguez, Sergio Alberto" X-Patchwork-Id: 320912 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oACLITjA012920 for ; Fri, 12 Nov 2010 21:18:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757249Ab0KLVST (ORCPT ); Fri, 12 Nov 2010 16:18:19 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:52896 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932397Ab0KLVSJ (ORCPT ); Fri, 12 Nov 2010 16:18:09 -0500 Received: from dlep34.itg.ti.com ([157.170.170.115]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id oACLI7MR032371 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 12 Nov 2010 15:18:07 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id oACLI63Y019143; Fri, 12 Nov 2010 15:18:06 -0600 (CST) Received: from localhost (dtx0091359-ubuntu-1.am.dhcp.ti.com [128.247.79.64]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id oACLI6f18013; Fri, 12 Nov 2010 15:18:06 -0600 (CST) From: Sergio Aguirre To: Laurent Pinchart Cc: linux-media@vger.kernel.org, Sergio Aguirre Subject: [omap3isp RFC][PATCH 07/10] omap3isp: Remove CSIA/B register abstraction Date: Fri, 12 Nov 2010 15:18:10 -0600 Message-Id: <1289596693-27660-8-git-send-email-saaguirre@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1289596693-27660-1-git-send-email-saaguirre@ti.com> References: <1289596693-27660-1-git-send-email-saaguirre@ti.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 12 Nov 2010 21:18:38 +0000 (UTC) diff --git a/drivers/media/video/isp/isp.c b/drivers/media/video/isp/isp.c index f266e7c..de9352b 100644 --- a/drivers/media/video/isp/isp.c +++ b/drivers/media/video/isp/isp.c @@ -264,12 +264,12 @@ static void isp_power_settings(struct isp_device *isp, int idle) (ISPCSI1_MIDLEMODE_SMARTSTANDBY << ISPCSI1_MIDLEMODE_SHIFT), OMAP3_ISP_IOMEM_CSI2A_REGS1, - ISP_CSIA_SYSCONFIG); + ISPCSI2_SYSCONFIG); isp_reg_writel(isp, ISPCSI1_AUTOIDLE | (ISPCSI1_MIDLEMODE_SMARTSTANDBY << ISPCSI1_MIDLEMODE_SHIFT), OMAP3_ISP_IOMEM_CCP2, - ISP_CSIB_SYSCONFIG); + ISPCCP2_SYSCONFIG); } isp_reg_writel(isp, ISPCTRL_SBL_AUTOIDLE, OMAP3_ISP_IOMEM_MAIN, ISP_CTRL); @@ -284,13 +284,13 @@ static void isp_power_settings(struct isp_device *isp, int idle) (ISPCSI1_MIDLEMODE_FORCESTANDBY << ISPCSI1_MIDLEMODE_SHIFT), OMAP3_ISP_IOMEM_CSI2A_REGS1, - ISP_CSIA_SYSCONFIG); + ISPCSI2_SYSCONFIG); isp_reg_writel(isp, ISPCSI1_AUTOIDLE | (ISPCSI1_MIDLEMODE_FORCESTANDBY << ISPCSI1_MIDLEMODE_SHIFT), OMAP3_ISP_IOMEM_CCP2, - ISP_CSIB_SYSCONFIG); + ISPCCP2_SYSCONFIG); } isp_reg_writel(isp, ISPCTRL_SBL_AUTOIDLE, OMAP3_ISP_IOMEM_MAIN, diff --git a/drivers/media/video/isp/ispccp2.c b/drivers/media/video/isp/ispccp2.c index 45506a7..fa23394 100644 --- a/drivers/media/video/isp/ispccp2.c +++ b/drivers/media/video/isp/ispccp2.c @@ -421,7 +421,7 @@ static void ispccp2_mem_configure(struct isp_ccp2_device *ccp2, isp_reg_writel(isp, (ISPCSI1_MIDLEMODE_SMARTSTANDBY << ISPCSI1_MIDLEMODE_SHIFT), - OMAP3_ISP_IOMEM_CCP2, ISP_CSIB_SYSCONFIG); + OMAP3_ISP_IOMEM_CCP2, ISPCCP2_SYSCONFIG); /* Hsize, Skip */ isp_reg_writel(isp, ISPCCP2_LCM_HSIZE_SKIP_MIN | diff --git a/drivers/media/video/isp/ispreg.h b/drivers/media/video/isp/ispreg.h index c080980..d885541 100644 --- a/drivers/media/video/isp/ispreg.h +++ b/drivers/media/video/isp/ispreg.h @@ -236,9 +236,6 @@ #define ISPCCP2_LCM_DST_ADDR (0x1E8) #define ISPCCP2_LCM_DST_OFST (0x1EC) -#define ISP_CSIB_SYSCONFIG ISPCCP2_SYSCONFIG -#define ISP_CSIA_SYSCONFIG ISPCSI2_SYSCONFIG - /* CCDC module register offset */ #define ISPCCDC_PID (0x000)