From: Steve Longerbeam <slongerbeam@gmail.com>
To: p.zabel@pengutronix.de, plagnioj@jcrosoft.com, tomi.valkeinen@ti.com
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
linux-fbdev@vger.kernel.org,
Steve Longerbeam <steve_longerbeam@mentor.com>
Subject: [PATCH v3 03/12] gpu: ipu-v3: Add ipu_get_num()
Date: Sun, 31 Jul 2016 12:42:18 -0700 [thread overview]
Message-ID: <1469994147-17549-4-git-send-email-steve_longerbeam@mentor.com> (raw)
In-Reply-To: <1469994147-17549-1-git-send-email-steve_longerbeam@mentor.com>
Adds of-alias id to ipu_soc and retrieve with ipu_get_num().
Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
---
v3: no changes
v2: no changes
---
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 99dcacf..d697cd5 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;
@@ -1209,6 +1215,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;
@@ -1237,6 +1244,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 bfb1e8a..fd47f8f 100644
--- a/drivers/gpu/ipu-v3/ipu-prv.h
+++ b/drivers/gpu/ipu-v3/ipu-prv.h
@@ -152,6 +152,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 8c4312d..ef54634 100644
--- a/include/video/imx-ipu-v3.h
+++ b/include/video/imx-ipu-v3.h
@@ -138,6 +138,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);
--
1.9.1
next prev parent reply other threads:[~2016-07-31 19:43 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-31 19:42 [PATCH v3 00/12] IPUv3 prep for i.MX5/6 v4l2 staging drivers, v3 Steve Longerbeam
2016-07-31 19:42 ` [PATCH v3 01/12] gpu: ipu-cpmem: Add ipu_cpmem_set_uv_offset() Steve Longerbeam
2016-08-01 9:13 ` Philipp Zabel
2016-08-01 20:15 ` Steve Longerbeam
2016-07-31 19:42 ` [PATCH v3 02/12] gpu: ipu-cpmem: Add ipu_cpmem_get_burstsize() Steve Longerbeam
2016-07-31 19:42 ` Steve Longerbeam [this message]
2016-07-31 19:42 ` [PATCH v3 04/12] gpu: ipu-v3: Add VDI input IDMAC channels Steve Longerbeam
2016-07-31 19:42 ` [PATCH v3 05/12] gpu: ipu-v3: set correct full sensor frame for PAL/NTSC Steve Longerbeam
2016-07-31 19:42 ` [PATCH v3 06/12] gpu: ipu-v3: Fix CSI data format for 16-bit media bus formats Steve Longerbeam
2016-07-31 19:42 ` [PATCH v3 07/12] gpu: ipu-v3: Fix IRT usage Steve Longerbeam
2016-07-31 19:42 ` [PATCH v3 08/12] gpu: ipu-v3: rename CSI client device Steve Longerbeam
2016-07-31 19:42 ` [PATCH v3 09/12] gpu: ipu-v3: Add Video Deinterlacer unit Steve Longerbeam
2016-08-01 9:13 ` Philipp Zabel
2016-08-01 21:02 ` Steve Longerbeam
2016-07-31 19:42 ` [PATCH v3 10/12] gpu: ipu-v3: Add FSU channel linking support Steve Longerbeam
2016-08-01 9:13 ` Philipp Zabel
2016-08-01 20:35 ` Steve Longerbeam
2016-07-31 19:42 ` [PATCH v3 11/12] gpu: ipu-ic: Add complete image conversion support with tiling Steve Longerbeam
2016-07-31 19:42 ` [PATCH v3 12/12] gpu: ipu-ic: allow multiple handles to ic Steve Longerbeam
2016-07-31 19:55 ` [PATCH v3 00/12] IPUv3 prep for i.MX5/6 v4l2 staging drivers, v3 Steve Longerbeam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469994147-17549-4-git-send-email-steve_longerbeam@mentor.com \
--to=slongerbeam@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=plagnioj@jcrosoft.com \
--cc=steve_longerbeam@mentor.com \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome