From patchwork Wed Jul 6 23:06:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9217319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 05E24608A6 for ; Wed, 6 Jul 2016 23:07:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB06F28527 for ; Wed, 6 Jul 2016 23:07:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E012B2852A; Wed, 6 Jul 2016 23:07:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC94F28527 for ; Wed, 6 Jul 2016 23:07:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932489AbcGFXH3 (ORCPT ); Wed, 6 Jul 2016 19:07:29 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34219 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932432AbcGFXH0 (ORCPT ); Wed, 6 Jul 2016 19:07:26 -0400 Received: by mail-pf0-f193.google.com with SMTP id 66so101518pfy.1 for ; Wed, 06 Jul 2016 16:07:26 -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=6POHquoI9CiSwlTGd4ju0VSq4M7yNnECfaMDRfAoBkQ=; b=taTRVFqZM8uuykOnDKmypNlH3JpJtrKCEN9LeMO2zqKmhQRhKucHl2UzCmmvTd+awb pRR9R77sZ7/n9YjPwJAHY4PSfIkOgbZh/qXMR2wvAsudyHxRCr4SJKpQCaUpbnfHXRRG Uyp84Ka0Ea5frXQOpFEkp/6uD15lGiu6QRvPjTTBGq0UEWZz2fMdN7na27k7vKnQZ0fC BirqW5lROZi3BMkNkp4wBJ0fMvVQ5C34po8o6uE5dsAWyboWARpetxp5SUOR3EcvAcTF 5zNwVxOLXVa47kNUGRvSBDB7HRPsptmi7o+p+f88+46OX+p3b2WVBiaoVIZDLoaNPNjR 01Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6POHquoI9CiSwlTGd4ju0VSq4M7yNnECfaMDRfAoBkQ=; b=SwunrvN94f7FyKLUgThYy+jyaIC4MN5IZpLUnojo6kgAYpjDBpT0VygCEZzKLduRBD gPyvRlTCRgHiUsznUsr0wcMFsGfTkAC4jNZegnDbj3iyiFELWRzwm41VYRxFHiCmliWP sTLIYB2bE0nLqhMrcIxP2/vjOsYsFlXvmXoRiEHEliYfNlr5lgfrwnXI3UHQiBTuNqWX hB9ffXvG5kFC/rkx3387zKl+2Nq0/WN2Z4PNdORYF0xDfL30xs+KyLMHDcbdphAc0P3V MlU1fpzxDd13qKVmqSp1QE6qcywBC5yCvlHl0Q34NUkYmJW8vJOYMzQJfa6BzGYHC0+O TeHA== X-Gm-Message-State: ALyK8tKexO7qqzZZst82VvWvazIoLumDua8tcdRT2s2ZtI1H3vWDItUtTMS+v3N1stqT+A== X-Received: by 10.98.72.80 with SMTP id v77mr46353626pfa.133.1467846445605; Wed, 06 Jul 2016 16:07:25 -0700 (PDT) Received: from mothership.sklembedded.com (c-73-241-2-21.hsd1.ca.comcast.net. [73.241.2.21]) by smtp.googlemail.com with ESMTPSA id c189sm6724125pfg.19.2016.07.06.16.07.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jul 2016 16:07:25 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: linux-media@vger.kernel.org Cc: Steve Longerbeam Subject: [PATCH 04/28] gpu: ipu-v3: Add ipu_get_num() Date: Wed, 6 Jul 2016 16:06:34 -0700 Message-Id: <1467846418-12913-5-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467846418-12913-1-git-send-email-steve_longerbeam@mentor.com> References: <1465944574-15745-1-git-send-email-steve_longerbeam@mentor.com> <1467846418-12913-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-Virus-Scanned: ClamAV using ClamSMTP Adds of-alias id to ipu_soc and retrieve with ipu_get_num(). Signed-off-by: Steve Longerbeam --- drivers/gpu/ipu-v3/ipu-common.c | 8 ++++++++ drivers/gpu/ipu-v3/ipu-prv.h | 1 + include/video/imx-ipu-v3.h | 1 + 3 files changed, 10 insertions(+) diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c index 30dc115..49af121 100644 --- a/drivers/gpu/ipu-v3/ipu-common.c +++ b/drivers/gpu/ipu-v3/ipu-common.c @@ -45,6 +45,12 @@ static inline void ipu_cm_write(struct ipu_soc *ipu, u32 value, unsigned offset) writel(value, ipu->cm_reg + offset); } +int ipu_get_num(struct ipu_soc *ipu) +{ + return ipu->id; +} +EXPORT_SYMBOL_GPL(ipu_get_num); + void ipu_srm_dp_sync_update(struct ipu_soc *ipu) { u32 val; @@ -1220,6 +1226,7 @@ static int ipu_probe(struct platform_device *pdev) { const struct of_device_id *of_id = of_match_device(imx_ipu_dt_ids, &pdev->dev); + struct device_node *np = pdev->dev.of_node; struct ipu_soc *ipu; struct resource *res; unsigned long ipu_base; @@ -1248,6 +1255,7 @@ static int ipu_probe(struct platform_device *pdev) ipu->channel[i].ipu = ipu; ipu->devtype = devtype; ipu->ipu_type = devtype->type; + ipu->id = of_alias_get_id(np, "ipu"); spin_lock_init(&ipu->lock); mutex_init(&ipu->channel_lock); diff --git a/drivers/gpu/ipu-v3/ipu-prv.h b/drivers/gpu/ipu-v3/ipu-prv.h index 845f64c..02057d8 100644 --- a/drivers/gpu/ipu-v3/ipu-prv.h +++ b/drivers/gpu/ipu-v3/ipu-prv.h @@ -153,6 +153,7 @@ struct ipu_soc { void __iomem *cm_reg; void __iomem *idmac_reg; + int id; int usecount; struct clk *clk; diff --git a/include/video/imx-ipu-v3.h b/include/video/imx-ipu-v3.h index 60540ead..b174f8a 100644 --- a/include/video/imx-ipu-v3.h +++ b/include/video/imx-ipu-v3.h @@ -148,6 +148,7 @@ int ipu_idmac_channel_irq(struct ipu_soc *ipu, struct ipuv3_channel *channel, /* * IPU Common functions */ +int ipu_get_num(struct ipu_soc *ipu); void ipu_set_csi_src_mux(struct ipu_soc *ipu, int csi_id, bool mipi_csi2); void ipu_set_ic_src_mux(struct ipu_soc *ipu, int csi_id, bool vdi); void ipu_dump(struct ipu_soc *ipu);