Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337285
b: refs/heads/master
c: fd563db
h: refs/heads/master
i:
  337283: b56edc2
v: v3
  • Loading branch information
Fabio Estevam authored and Greg Kroah-Hartman committed Oct 25, 2012
1 parent 2662818 commit 1c3e65b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 369130ab9233207d7036ee4578d92a867b150c9c
refs/heads/master: fd563dbb4f59acabdc9baa8b4e66a21ce82df8e3
24 changes: 12 additions & 12 deletions trunk/drivers/staging/imx-drm/ipu-v3/ipu-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@ static int __devinit ipu_probe(struct platform_device *pdev)
irq_err = platform_get_irq(pdev, 1);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

dev_info(&pdev->dev, "irq_sync: %d irq_err: %d\n",
dev_dbg(&pdev->dev, "irq_sync: %d irq_err: %d\n",
irq_sync, irq_err);

if (!res || irq_sync < 0 || irq_err < 0)
Expand All @@ -1026,27 +1026,27 @@ static int __devinit ipu_probe(struct platform_device *pdev)
spin_lock_init(&ipu->lock);
mutex_init(&ipu->channel_lock);

dev_info(&pdev->dev, "cm_reg: 0x%08lx\n",
dev_dbg(&pdev->dev, "cm_reg: 0x%08lx\n",
ipu_base + devtype->cm_ofs);
dev_info(&pdev->dev, "idmac: 0x%08lx\n",
dev_dbg(&pdev->dev, "idmac: 0x%08lx\n",
ipu_base + devtype->cm_ofs + IPU_CM_IDMAC_REG_OFS);
dev_info(&pdev->dev, "cpmem: 0x%08lx\n",
dev_dbg(&pdev->dev, "cpmem: 0x%08lx\n",
ipu_base + devtype->cpmem_ofs);
dev_info(&pdev->dev, "disp0: 0x%08lx\n",
dev_dbg(&pdev->dev, "disp0: 0x%08lx\n",
ipu_base + devtype->disp0_ofs);
dev_info(&pdev->dev, "disp1: 0x%08lx\n",
dev_dbg(&pdev->dev, "disp1: 0x%08lx\n",
ipu_base + devtype->disp1_ofs);
dev_info(&pdev->dev, "srm: 0x%08lx\n",
dev_dbg(&pdev->dev, "srm: 0x%08lx\n",
ipu_base + devtype->srm_ofs);
dev_info(&pdev->dev, "tpm: 0x%08lx\n",
dev_dbg(&pdev->dev, "tpm: 0x%08lx\n",
ipu_base + devtype->tpm_ofs);
dev_info(&pdev->dev, "dc: 0x%08lx\n",
dev_dbg(&pdev->dev, "dc: 0x%08lx\n",
ipu_base + devtype->cm_ofs + IPU_CM_DC_REG_OFS);
dev_info(&pdev->dev, "ic: 0x%08lx\n",
dev_dbg(&pdev->dev, "ic: 0x%08lx\n",
ipu_base + devtype->cm_ofs + IPU_CM_IC_REG_OFS);
dev_info(&pdev->dev, "dmfc: 0x%08lx\n",
dev_dbg(&pdev->dev, "dmfc: 0x%08lx\n",
ipu_base + devtype->cm_ofs + IPU_CM_DMFC_REG_OFS);
dev_info(&pdev->dev, "vdi: 0x%08lx\n",
dev_dbg(&pdev->dev, "vdi: 0x%08lx\n",
ipu_base + devtype->vdi_ofs);

ipu->cm_reg = devm_ioremap(&pdev->dev,
Expand Down

0 comments on commit 1c3e65b

Please sign in to comment.