From patchwork Sat Jun 7 21:56:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 4316121 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5ECFCBEEAA for ; Sat, 7 Jun 2014 21:57:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 86B1B2025A for ; Sat, 7 Jun 2014 21:57:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A01132024C for ; Sat, 7 Jun 2014 21:57:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753359AbaFGV51 (ORCPT ); Sat, 7 Jun 2014 17:57:27 -0400 Received: from mail-pb0-f48.google.com ([209.85.160.48]:49107 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753357AbaFGV5Z (ORCPT ); Sat, 7 Jun 2014 17:57:25 -0400 Received: by mail-pb0-f48.google.com with SMTP id rr13so3891471pbb.7 for ; Sat, 07 Jun 2014 14:57:25 -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=/Ry1gh+hlGowgZ0hW+BNDa91ZxkbpleeOrKUi8HPiR4=; b=OuPBpVUjoKzAK7s6gu/auuue+sS98F3M4dfWorerengHuZhspadnaoTo6qqFEKR0/b moasrhnuOBeZLlXUkXvg8InIu+uqOpKQFUyd7g01B+2dM10aVQ1njIzOiteUUOtYeS1I /Z99VSRzNvSOFEfpR1ByrTqAThOj4ffa3HHbKiLRAQ2pxC1xK6NboWQa1o71nP6VfUFC jwoKuYkbq9r8WUo151DrN3Gaf442haHUStrICvHcG0Wq7+arAxuRpTpyfB/cYXlVsFYb tFj+npydo4Tix1c+fG+lMzOclmqs55xRF6+WUcXjVcyPf/vMuJCB6WMmWm0zpfhNG2EN C10A== X-Received: by 10.68.164.4 with SMTP id ym4mr15346058pbb.53.1402178245412; Sat, 07 Jun 2014 14:57:25 -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.24 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 07 Jun 2014 14:57:24 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: linux-media@vger.kernel.org Cc: Steve Longerbeam Subject: [PATCH 24/43] imx-drm: ipu-cpmem: Add ipu_cpmem_set_axi_id() Date: Sat, 7 Jun 2014 14:56:26 -0700 Message-Id: <1402178205-22697-25-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 Adds ipu_cpmem_set_axi_id() to set which AXI bus master the channel will use to transfer data onto AXI bus. Signed-off-by: Steve Longerbeam --- drivers/staging/imx-drm/ipu-v3/ipu-cpmem.c | 7 +++++++ include/linux/platform_data/imx-ipu-v3.h | 1 + 2 files changed, 8 insertions(+) diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-cpmem.c b/drivers/staging/imx-drm/ipu-v3/ipu-cpmem.c index c7910cc..4d5a9fe 100644 --- a/drivers/staging/imx-drm/ipu-v3/ipu-cpmem.c +++ b/drivers/staging/imx-drm/ipu-v3/ipu-cpmem.c @@ -252,6 +252,13 @@ void ipu_cpmem_interlaced_scan(struct ipuv3_channel *ch, int stride) }; EXPORT_SYMBOL_GPL(ipu_cpmem_interlaced_scan); +void ipu_cpmem_set_axi_id(struct ipuv3_channel *ch, u32 id) +{ + id &= 0x3; + ipu_ch_param_write_field(ch, IPU_FIELD_ID, id); +} +EXPORT_SYMBOL_GPL(ipu_cpmem_set_axi_id); + void ipu_cpmem_set_burstsize(struct ipuv3_channel *ch, int burstsize) { ipu_ch_param_write_field(ch, IPU_FIELD_NPB, burstsize - 1); diff --git a/include/linux/platform_data/imx-ipu-v3.h b/include/linux/platform_data/imx-ipu-v3.h index beb2e4b..6486217 100644 --- a/include/linux/platform_data/imx-ipu-v3.h +++ b/include/linux/platform_data/imx-ipu-v3.h @@ -228,6 +228,7 @@ void ipu_cpmem_set_stride(struct ipuv3_channel *ch, int stride); void ipu_cpmem_set_high_priority(struct ipuv3_channel *ch); void ipu_cpmem_set_buffer(struct ipuv3_channel *ch, int bufnum, dma_addr_t buf); void ipu_cpmem_interlaced_scan(struct ipuv3_channel *ch, int stride); +void ipu_cpmem_set_axi_id(struct ipuv3_channel *ch, u32 id); void ipu_cpmem_set_burstsize(struct ipuv3_channel *ch, int burstsize); void ipu_cpmem_set_block_mode(struct ipuv3_channel *ch); int ipu_cpmem_set_format_rgb(struct ipuv3_channel *ch,