From patchwork Sat Jun 7 21:56:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 4316451 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 710049F170 for ; Sat, 7 Jun 2014 21:59:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 96FA920225 for ; Sat, 7 Jun 2014 21:59:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BBD6F20222 for ; Sat, 7 Jun 2014 21:59:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753320AbaFGV7Y (ORCPT ); Sat, 7 Jun 2014 17:59:24 -0400 Received: from mail-pb0-f51.google.com ([209.85.160.51]:40271 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753311AbaFGV5E (ORCPT ); Sat, 7 Jun 2014 17:57:04 -0400 Received: by mail-pb0-f51.google.com with SMTP id ma3so3933241pbc.10 for ; Sat, 07 Jun 2014 14:57:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1S6kGkpMlJjuRggG8jAqdRkpPlOlG9b2IhUAmKMmVLI=; b=s6nVS6wOrDe0cuJY+Vij6DlFvt8iLVMSC03K3P5rJB936uwx2/uZNbtmw2KNoZbWMU cgzY4O7a1uK5dq9QyvSP3L2zfnZklZIqapT7fECrftM3GkelO+cfM+bUhLY8XDXmf0ie bEcGgTYvKLvOq4s09dqdBG309U0cokx57kslP7OasVfudZ0wNP/2tbaoWB+9jvYsk5yv b58qvhcpvFdSU3gc7gPPufIazfn8BYupj2RbszSDXmf/dqhBBSwS58sR32WsIsY8XrOa EzJkqBvH31ybIp8Gz63u9gI4XSpeNNJwwHlKgokl9JNps4zQDaj9MHHugPUl+I9vBHrY 7wSQ== X-Received: by 10.69.20.10 with SMTP id gy10mr2504028pbd.162.1402178223848; Sat, 07 Jun 2014 14:57:03 -0700 (PDT) Received: from slongerb-fremont-linux.mgc.mentorg.com (c-98-248-118-71.hsd1.ca.comcast.net. [98.248.118.71]) by mx.google.com with ESMTPSA id fx5sm52769595pbb.62.2014.06.07.14.57.02 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 07 Jun 2014 14:57:03 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: linux-media@vger.kernel.org Cc: Steve Longerbeam , Jiada Wang Subject: [PATCH 04/43] imx-drm: ipu-v3: Add solo/dual-lite IPU device type Date: Sat, 7 Jun 2014 14:56:06 -0700 Message-Id: <1402178205-22697-5-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1402178205-22697-1-git-send-email-steve_longerbeam@mentor.com> References: <1402178205-22697-1-git-send-email-steve_longerbeam@mentor.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Jiada Wang --- drivers/staging/imx-drm/ipu-v3/ipu-common.c | 18 ++++++++++++++++++ include/linux/platform_data/imx-ipu-v3.h | 1 + 2 files changed, 19 insertions(+) diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c b/drivers/staging/imx-drm/ipu-v3/ipu-common.c index f8e8c56..2d95a7c 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c @@ -829,10 +829,28 @@ static struct ipu_devtype ipu_type_imx6q = { .type = IPUV3H, }; +static struct ipu_devtype ipu_type_imx6dl = { + .name = "IPUv3HDL", + .cm_ofs = 0x00200000, + .cpmem_ofs = 0x00300000, + .srm_ofs = 0x00340000, + .tpm_ofs = 0x00360000, + .csi0_ofs = 0x00230000, + .csi1_ofs = 0x00238000, + .disp0_ofs = 0x00240000, + .disp1_ofs = 0x00248000, + .smfc_ofs = 0x00250000, + .ic_ofs = 0x00220000, + .vdi_ofs = 0x00268000, + .dc_tmpl_ofs = 0x00380000, + .type = IPUV3HDL, +}; + static const struct of_device_id imx_ipu_dt_ids[] = { { .compatible = "fsl,imx51-ipu", .data = &ipu_type_imx51, }, { .compatible = "fsl,imx53-ipu", .data = &ipu_type_imx53, }, { .compatible = "fsl,imx6q-ipu", .data = &ipu_type_imx6q, }, + { .compatible = "fsl,imx6dl-ipu", .data = &ipu_type_imx6dl, }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, imx_ipu_dt_ids); diff --git a/include/linux/platform_data/imx-ipu-v3.h b/include/linux/platform_data/imx-ipu-v3.h index ca91dd9..8050277 100644 --- a/include/linux/platform_data/imx-ipu-v3.h +++ b/include/linux/platform_data/imx-ipu-v3.h @@ -23,6 +23,7 @@ enum ipuv3_type { IPUV3EX, IPUV3M, IPUV3H, + IPUV3HDL, }; #define IPU_PIX_FMT_GBR24 v4l2_fourcc('G', 'B', 'R', '3')