[linux-yocto] [PATCH 07/87] usb/host/ehci-ci13612: stop accessing the secondary register space

[Paul Butler]

From: Fredrik Markstr <fredrik.markstrom at gmail.com>

Don't make the second register area mandatory, since we don't have it
in our on boards dts yet.

Signed-off-by: Fredrik Markstr <fredrik.markstrom at gmail.com>
---
 drivers/usb/host/ehci-ci13612.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/host/ehci-ci13612.c b/drivers/usb/host/ehci-ci13612.c
index 7215c79..5d3a6bc 100644
--- a/drivers/usb/host/ehci-ci13612.c
+++ b/drivers/usb/host/ehci-ci13612.c
@@ -187,17 +187,19 @@ static int ci13612_ehci_probe(struct platform_device *pdev)
 		goto fail_put_hcd;
 	}
 
+	/* FIXME: This reported error since we don't have a second register
+         *  area defined in our dtb. Should we add it or stay backwards compatible ?
+         */
 	gpreg_base = of_iomap(np, 1);
 	if (!gpreg_base) {
-		dev_err(&pdev->dev, "of_iomap error\n");
-		retval = -ENOMEM;
-		goto fail_unmap;
+		dev_warn(&pdev->dev, "of_iomap error can't map region 1\n");
 	}
+	else {
+		/* Setup GPREG for USB to enable the 6-bit address line */
+		writel(0x0, gpreg_base + 0x8);
 
-	/* Setup GPREG for USB to enable the 6-bit address line */
-	writel(0x0, gpreg_base + 0x8);
-
-	iounmap(gpreg_base);
+		iounmap(gpreg_base);
+	}
 
 	retval = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (retval == 0) {
@@ -205,7 +207,6 @@ static int ci13612_ehci_probe(struct platform_device *pdev)
 		return retval;
 	}
 
-fail_unmap:
 	iounmap(hcd->regs);
 fail_put_hcd:
 	usb_put_hcd(hcd);
-- 
1.8.3