gpu: ipu-v3: Add ipu_get_num()

Adds of-alias id to ipu_soc and retrieve with ipu_get_num().

Signed-off-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Steve Longerbeam 2016-07-19 18:11:02 -07:00 committed by Philipp Zabel
parent 03085911d7
commit 572a7615ae
3 changed files with 10 additions and 0 deletions

View File

@ -45,6 +45,12 @@ static inline void ipu_cm_write(struct ipu_soc *ipu, u32 value, unsigned offset)
writel(value, ipu->cm_reg + 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) void ipu_srm_dp_sync_update(struct ipu_soc *ipu)
{ {
u32 val; u32 val;
@ -1209,6 +1215,7 @@ static int ipu_probe(struct platform_device *pdev)
{ {
const struct of_device_id *of_id = const struct of_device_id *of_id =
of_match_device(imx_ipu_dt_ids, &pdev->dev); of_match_device(imx_ipu_dt_ids, &pdev->dev);
struct device_node *np = pdev->dev.of_node;
struct ipu_soc *ipu; struct ipu_soc *ipu;
struct resource *res; struct resource *res;
unsigned long ipu_base; unsigned long ipu_base;
@ -1237,6 +1244,7 @@ static int ipu_probe(struct platform_device *pdev)
ipu->channel[i].ipu = ipu; ipu->channel[i].ipu = ipu;
ipu->devtype = devtype; ipu->devtype = devtype;
ipu->ipu_type = devtype->type; ipu->ipu_type = devtype->type;
ipu->id = of_alias_get_id(np, "ipu");
spin_lock_init(&ipu->lock); spin_lock_init(&ipu->lock);
mutex_init(&ipu->channel_lock); mutex_init(&ipu->channel_lock);

View File

@ -152,6 +152,7 @@ struct ipu_soc {
void __iomem *cm_reg; void __iomem *cm_reg;
void __iomem *idmac_reg; void __iomem *idmac_reg;
int id;
int usecount; int usecount;
struct clk *clk; struct clk *clk;

View File

@ -138,6 +138,7 @@ int ipu_idmac_channel_irq(struct ipu_soc *ipu, struct ipuv3_channel *channel,
/* /*
* IPU Common functions * 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_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_set_ic_src_mux(struct ipu_soc *ipu, int csi_id, bool vdi);
void ipu_dump(struct ipu_soc *ipu); void ipu_dump(struct ipu_soc *ipu);