From patchwork Fri Nov 19 23:23:48 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: 4979 Return-path: Envelope-to: mchehab@gaivota Delivery-date: Fri, 19 Nov 2010 23:34:08 -0200 Received: from mchehab by gaivota with local (Exim 4.72) (envelope-from ) id 1PJcLA-0003jN-7H for mchehab@gaivota; Fri, 19 Nov 2010 23:34:08 -0200 Received: from casper.infradead.org [85.118.1.10] by gaivota with IMAP (fetchmail-6.3.17) for (single-drop); Fri, 19 Nov 2010 23:34:08 -0200 (BRST) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1PJaJb-00032l-I6; Fri, 19 Nov 2010 23:24:24 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757217Ab0KSXYB (ORCPT + 1 other); Fri, 19 Nov 2010 18:24:01 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:40954 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754300Ab0KSXYA (ORCPT ); Fri, 19 Nov 2010 18:24:00 -0500 Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id oAJNNwv7031717 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 19 Nov 2010 17:23:58 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id oAJNNvTA016948; Fri, 19 Nov 2010 17:23:57 -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 oAJNNvf11884; Fri, 19 Nov 2010 17:23:57 -0600 (CST) From: Sergio Aguirre To: Laurent Pinchart Cc: linux-media@vger.kernel.org, Sergio Aguirre Subject: [omap3isp RFC][PATCH 1/4] omap3isp: Abstract isp subdevs clock control Date: Fri, 19 Nov 2010 17:23:48 -0600 Message-Id: <1290209031-12817-2-git-send-email-saaguirre@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1290209031-12817-1-git-send-email-saaguirre@ti.com> References: <1290209031-12817-1-git-send-email-saaguirre@ti.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: Mauro Carvalho Chehab Submodules shouldn't be aware of global register bit structure, specially if the submodules are shared in the future with other TI architectures (Davinci, future OMAPs, etc) Signed-off-by: Sergio Aguirre --- drivers/media/video/isp/isp.c | 54 ++++++++++++++++++++++++++++++++++ drivers/media/video/isp/isp.h | 12 +++++++ drivers/media/video/isp/ispccdc.c | 6 +-- drivers/media/video/isp/isppreview.c | 6 +-- drivers/media/video/isp/ispresizer.c | 6 +-- 5 files changed, 72 insertions(+), 12 deletions(-) diff --git a/drivers/media/video/isp/isp.c b/drivers/media/video/isp/isp.c index 30bdc48..2e5030f 100644 --- a/drivers/media/video/isp/isp.c +++ b/drivers/media/video/isp/isp.c @@ -991,6 +991,60 @@ void isp_sbl_disable(struct isp_device *isp, enum isp_sbl_resource res) * Clock management */ +void isp_subclk_enable(struct isp_device *isp, enum isp_subclk_resource res) +{ + u32 clk = 0; + + isp->subclk_resources |= res; + + if (isp->subclk_resources & OMAP3_ISP_SUBCLK_H3A) + clk |= ISPCTRL_H3A_CLK_EN; + + if (isp->subclk_resources & OMAP3_ISP_SUBCLK_HIST) + clk |= ISPCTRL_HIST_CLK_EN; + + if (isp->subclk_resources & OMAP3_ISP_SUBCLK_RESIZER) + clk |= ISPCTRL_RSZ_CLK_EN; + + /* NOTE: For CCDC & Preview submodules, we need to affect internal + * RAM aswell. + */ + if (isp->subclk_resources & OMAP3_ISP_SUBCLK_CCDC) + clk |= ISPCTRL_CCDC_CLK_EN | ISPCTRL_CCDC_RAM_EN; + + if (isp->subclk_resources & OMAP3_ISP_SUBCLK_PREVIEW) + clk |= ISPCTRL_PREV_CLK_EN | ISPCTRL_PREV_RAM_EN; + + isp_reg_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_CTRL, clk); +} + +void isp_subclk_disable(struct isp_device *isp, enum isp_subclk_resource res) +{ + u32 clk = 0; + + isp->subclk_resources &= ~res; + + if (!(isp->subclk_resources & OMAP3_ISP_SUBCLK_H3A)) + clk |= ISPCTRL_H3A_CLK_EN; + + if (!(isp->subclk_resources & OMAP3_ISP_SUBCLK_HIST)) + clk |= ISPCTRL_HIST_CLK_EN; + + if (!(isp->subclk_resources & OMAP3_ISP_SUBCLK_RESIZER)) + clk |= ISPCTRL_RSZ_CLK_EN; + + /* NOTE: For CCDC & Preview submodules, we need to affect internal + * RAM aswell. + */ + if (!(isp->subclk_resources & OMAP3_ISP_SUBCLK_CCDC)) + clk |= ISPCTRL_CCDC_CLK_EN | ISPCTRL_CCDC_RAM_EN; + + if (!(isp->subclk_resources & OMAP3_ISP_SUBCLK_PREVIEW)) + clk |= ISPCTRL_PREV_CLK_EN | ISPCTRL_PREV_RAM_EN; + + isp_reg_clr(isp, OMAP3_ISP_IOMEM_MAIN, ISP_CTRL, clk); +} + /* * isp_enable_clocks - Enable ISP clocks * @isp: OMAP3 ISP device diff --git a/drivers/media/video/isp/isp.h b/drivers/media/video/isp/isp.h index b8f63e2..1260e9f 100644 --- a/drivers/media/video/isp/isp.h +++ b/drivers/media/video/isp/isp.h @@ -85,6 +85,14 @@ enum isp_sbl_resource { OMAP3_ISP_SBL_RESIZER_WRITE = 0x200, }; +enum isp_subclk_resource { + OMAP3_ISP_SUBCLK_CCDC = 0x1, + OMAP3_ISP_SUBCLK_H3A = 0x2, + OMAP3_ISP_SUBCLK_HIST = 0x4, + OMAP3_ISP_SUBCLK_PREVIEW = 0x8, + OMAP3_ISP_SUBCLK_RESIZER = 0x10, +}; + enum isp_interface_type { ISP_INTERFACE_PARALLEL, ISP_INTERFACE_CSI2A_PHY2, @@ -262,6 +270,7 @@ struct isp_device { struct isp_csiphy isp_csiphy2; unsigned int sbl_resources; + unsigned int subclk_resources; struct iommu *iommu; }; @@ -294,6 +303,9 @@ void isp_print_status(struct isp_device *isp); void isp_sbl_enable(struct isp_device *isp, enum isp_sbl_resource res); void isp_sbl_disable(struct isp_device *isp, enum isp_sbl_resource res); +void isp_subclk_enable(struct isp_device *isp, enum isp_subclk_resource res); +void isp_subclk_disable(struct isp_device *isp, enum isp_subclk_resource res); + int omap3isp_register_entities(struct platform_device *pdev, struct v4l2_device *v4l2_dev); void omap3isp_unregister_entities(struct platform_device *pdev); diff --git a/drivers/media/video/isp/ispccdc.c b/drivers/media/video/isp/ispccdc.c index c3d1d7a..4244edf 100644 --- a/drivers/media/video/isp/ispccdc.c +++ b/drivers/media/video/isp/ispccdc.c @@ -1687,8 +1687,7 @@ static int ccdc_set_stream(struct v4l2_subdev *sd, int enable) if (enable == ISP_PIPELINE_STREAM_STOPPED) return 0; - isp_reg_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_CTRL, - ISPCTRL_CCDC_RAM_EN | ISPCTRL_CCDC_CLK_EN); + isp_subclk_enable(isp, OMAP3_ISP_SUBCLK_CCDC); isp_reg_set(isp, OMAP3_ISP_IOMEM_CCDC, ISPCCDC_CFG, ISPCCDC_CFG_VDLC); @@ -1725,8 +1724,7 @@ static int ccdc_set_stream(struct v4l2_subdev *sd, int enable) ret = ispccdc_disable(ccdc); if (ccdc->output & CCDC_OUTPUT_MEMORY) isp_sbl_disable(isp, OMAP3_ISP_SBL_CCDC_WRITE); - isp_reg_clr(isp, OMAP3_ISP_IOMEM_MAIN, ISP_CTRL, - ISPCTRL_CCDC_CLK_EN | ISPCTRL_CCDC_RAM_EN); + isp_subclk_disable(isp, OMAP3_ISP_SUBCLK_CCDC); ccdc->underrun = 0; break; } diff --git a/drivers/media/video/isp/isppreview.c b/drivers/media/video/isp/isppreview.c index 74e4f6a..3e55123 100644 --- a/drivers/media/video/isp/isppreview.c +++ b/drivers/media/video/isp/isppreview.c @@ -1648,8 +1648,7 @@ static int preview_set_stream(struct v4l2_subdev *sd, int enable) if (enable == ISP_PIPELINE_STREAM_STOPPED) return 0; - isp_reg_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_CTRL, - ISPCTRL_PREV_RAM_EN | ISPCTRL_PREV_CLK_EN); + isp_subclk_enable(isp, OMAP3_ISP_SUBCLK_PREVIEW); preview_configure(prev); isppreview_print_status(prev); } @@ -1677,8 +1676,7 @@ static int preview_set_stream(struct v4l2_subdev *sd, int enable) case ISP_PIPELINE_STREAM_STOPPED: isp_sbl_disable(isp, OMAP3_ISP_SBL_PREVIEW_READ); isp_sbl_disable(isp, OMAP3_ISP_SBL_PREVIEW_WRITE); - isp_reg_clr(isp, OMAP3_ISP_IOMEM_MAIN, ISP_CTRL, - ISPCTRL_PREV_CLK_EN | ISPCTRL_PREV_RAM_EN); + isp_subclk_disable(isp, OMAP3_ISP_SUBCLK_PREVIEW); prev->underrun = 0; break; } diff --git a/drivers/media/video/isp/ispresizer.c b/drivers/media/video/isp/ispresizer.c index 95c5895..bd33f21 100644 --- a/drivers/media/video/isp/ispresizer.c +++ b/drivers/media/video/isp/ispresizer.c @@ -1120,8 +1120,7 @@ static int resizer_set_stream(struct v4l2_subdev *sd, int enable) if (enable != ISP_PIPELINE_STREAM_STOPPED && res->state == ISP_PIPELINE_STREAM_STOPPED) { - isp_reg_set(isp, OMAP3_ISP_IOMEM_MAIN, ISP_CTRL, - ISPCTRL_RSZ_CLK_EN); + isp_subclk_enable(isp, OMAP3_ISP_SUBCLK_RESIZER); resizer_configure(res); ispresizer_print_status(res); } @@ -1146,8 +1145,7 @@ static int resizer_set_stream(struct v4l2_subdev *sd, int enable) case ISP_PIPELINE_STREAM_STOPPED: isp_sbl_disable(isp, OMAP3_ISP_SBL_RESIZER_READ | OMAP3_ISP_SBL_RESIZER_WRITE); - isp_reg_clr(isp, OMAP3_ISP_IOMEM_MAIN, ISP_CTRL, - ISPCTRL_RSZ_CLK_EN); + isp_subclk_disable(isp, OMAP3_ISP_SUBCLK_RESIZER); res->underrun = 0; break; }