From patchwork Wed Nov 14 08:20:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: archit taneja X-Patchwork-Id: 1739811 Return-Path: X-Original-To: patchwork-linux-fbdev@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 5378B3FCF7 for ; Wed, 14 Nov 2012 08:20:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932714Ab2KNIUs (ORCPT ); Wed, 14 Nov 2012 03:20:48 -0500 Received: from devils.ext.ti.com ([198.47.26.153]:38011 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932187Ab2KNIUs (ORCPT ); Wed, 14 Nov 2012 03:20:48 -0500 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id qAE8Kl6S028604; Wed, 14 Nov 2012 02:20:47 -0600 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id qAE8KlKn017653; Wed, 14 Nov 2012 02:20:47 -0600 Received: from dlelxv23.itg.ti.com (172.17.1.198) by dfle73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.1.323.3; Wed, 14 Nov 2012 02:20:47 -0600 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id qAE8KlxY005367; Wed, 14 Nov 2012 02:20:47 -0600 Received: from localhost (a0393947pc.apr.dhcp.ti.com [172.24.137.91]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id qAE8Kjw27620; Wed, 14 Nov 2012 02:20:45 -0600 (CST) From: Archit Taneja To: CC: , , Archit Taneja Subject: [PATCH 2/2] OMAPDSS: Add a dispc_features struct for OMAP5 Date: Wed, 14 Nov 2012 13:50:16 +0530 Message-ID: <1352881216-7490-3-git-send-email-archit@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352881216-7490-1-git-send-email-archit@ti.com> References: <1352881216-7490-1-git-send-email-archit@ti.com> MIME-Version: 1.0 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Add a dispc_features struct for OMAP5. Previously, OMAP5 used the same struct as OMAP4. The new struct for OMAP5 contains the updated register field offset and maximum limit for overlay manager width and height. Signed-off-by: Archit Taneja --- drivers/video/omap2/dss/dispc.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 29e6aa1..c681460 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -4131,6 +4131,23 @@ static const struct dispc_features omap44xx_dispc_feats __initconst = { .gfx_fifo_workaround = true, }; +static const struct dispc_features omap54xx_dispc_feats __initconst = { + .sw_start = 7, + .fp_start = 19, + .bp_start = 31, + .sw_max = 256, + .vp_max = 4095, + .hp_max = 4096, + .mgr_width_start = 11, + .mgr_height_start = 27, + .mgr_width_max = 4096, + .mgr_height_max = 4096, + .calc_scaling = dispc_ovl_calc_scaling_44xx, + .calc_core_clk = calc_core_clk_44xx, + .num_fifos = 5, + .gfx_fifo_workaround = true, +}; + static int __init dispc_init_features(struct platform_device *pdev) { const struct dispc_features *src; @@ -4164,7 +4181,7 @@ static int __init dispc_init_features(struct platform_device *pdev) break; case OMAPDSS_VER_OMAP5: - src = &omap44xx_dispc_feats; + src = &omap54xx_dispc_feats; break; default: