Commit bb304b71 authored Apr 27, 2015 by Ivan T. Ivanov Committed by Greg Kroah-Hartman Apr 28, 2015

Revert "usb: host: ehci-msm: Use devm_ioremap_resource instead of devm_ioremap"



This reverts commit 70843f62 ("usb: host: ehci-msm: Use
devm_ioremap_resource instead of devm_ioremap") and commit
e507bf57 ("host: ehci-msm: remove duplicate check on resource"),
because msm_otg and this driver are using same address space to
access AHB mode and USB command registers.

Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Vivek Gautam <gautam.vivek@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent a5a356ce

drivers/usb/host/ehci-msm.c

+10 −3

Original line number	Diff line number	Diff line
		@@ -88,13 +88,20 @@ static int ehci_msm_probe(struct platform_device *pdev)
		}

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		hcd->regs = devm_ioremap_resource(&pdev->dev, res);
		if (IS_ERR(hcd->regs)) {
		ret = PTR_ERR(hcd->regs);
		if (!res) {
		dev_err(&pdev->dev, "Unable to get memory resource\n");
		ret = -ENODEV;
		goto put_hcd;
		}

		hcd->rsrc_start = res->start;
		hcd->rsrc_len = resource_size(res);
		hcd->regs = devm_ioremap(&pdev->dev, hcd->rsrc_start, hcd->rsrc_len);
		if (!hcd->regs) {
		dev_err(&pdev->dev, "ioremap failed\n");
		ret = -ENOMEM;
		goto put_hcd;
		}

		/*
		* OTG driver takes care of PHY initialization, clock management,